diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8680993055..89066ee92e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -23,7 +23,7 @@ These are just guidelines, not rules, use your best judgment and feel free to pr ### Code of Conduct -This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). +This project adheres to the Contributor Covenant [code of conduct](code_of_conduct.md). By participating, you are expected to uphold this code. ## How Can I Contribute? @@ -38,7 +38,7 @@ Any code submissions that do not meet our coding standards are likely to be reje * If it is something like a bugfix that Polaris would want (the codebase we use), you may want to consider coding it there as well. They may want any general gameplay bugfixes, and things that are obviously intended to work one way, but do not. They do not have any of our fluff species (vulp, akula, fenn, etc) so do not make PRs related to that, or any vore content to them. * Change whitespace as little as possible. Do not randomly add/remove whitespace. -* Map changes must be in tgm format. See the [Mapmerge2 Readme] for details. +* Map changes must be in tgm format. See the [Mapmerge2 Readme] for details, or use [StrongDMM] which can automatically save maps as tgm. ### Pull Requests @@ -60,4 +60,5 @@ Commits with a git authorship date prior to `1420675200 +0000` (2015/01/08 00:00 All commits whose authorship dates are not prior to `1420675200 +0000` are assumed to be licensed under AGPL v3, if you wish to license under GPL v3 please make this clear in the commit message and any added files. -[Mapmerge2 Readme]: ../tools/mapmerge2/readme.md +[Mapmerge2 Readme]: ../tools/mapmerge2/mapmerge tool readme.md +[StrongDMM]: ../tools/StrongDMM/README.md \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59319c4b8b..1760c46fae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt update || true - sudo apt install zlib1g-dev:i386 libssl-dev:i386 pkg-config:i386 + sudo apt install zlib1g-dev:i386 libssl-dev:i386 ldd librust_g.so - name: Unit Tests run: | diff --git a/_build_dependencies.sh b/_build_dependencies.sh index 3e1b40130b..8e582bab3d 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -6,6 +6,6 @@ export NODE_VERSION=12 # Byond Major export BYOND_MAJOR=514 # Byond Minor -export BYOND_MINOR=1557 +export BYOND_MINOR=1569 # Macro Count export MACRO_COUNT=4 \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/tvalve.dm b/code/ATMOSPHERICS/components/tvalve.dm index 12c3fbfa13..acbf9f6ba2 100644 --- a/code/ATMOSPHERICS/components/tvalve.dm +++ b/code/ATMOSPHERICS/components/tvalve.dm @@ -329,9 +329,6 @@ /obj/machinery/atmospherics/tvalve/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob) if (!W.is_wrench()) return ..() - if (istype(src, /obj/machinery/atmospherics/tvalve/digital)) - to_chat(user, "You cannot unwrench \the [src], it's too complicated.") - return 1 if(!can_unwrench()) to_chat(user, "You cannot unwrench \the [src], it too exerted due to internal pressure.") add_fingerprint(user) diff --git a/code/__defines/belly_modes_vr.dm b/code/__defines/belly_modes_vr.dm index c716615a7f..bf64819cd4 100644 --- a/code/__defines/belly_modes_vr.dm +++ b/code/__defines/belly_modes_vr.dm @@ -1,5 +1,6 @@ // Normal digestion modes #define DM_HOLD "Hold" +#define DM_HOLD_ABSORBED "Hold Absorbed" // Not a real bellymode, used for handling different idle messages for absorbed prey. #define DM_DIGEST "Digest" #define DM_ABSORB "Absorb" #define DM_UNABSORB "Unabsorb" @@ -10,10 +11,6 @@ #define DM_HEAL "Heal" #define DM_EGG "Encase In Egg" -//#define DM_ITEMWEAK "Digest (Item Friendly)" -//#define DM_STRIPDIGEST "Strip Digest (Items Only)" -//#define DM_DIGEST_NUMB "Digest (Numbing)" - //Addon mode flags #define DM_FLAG_NUMBING 0x1 #define DM_FLAG_STRIPPING 0x2 diff --git a/code/__defines/dcs/signals.dm b/code/__defines/dcs/signals.dm index df83ba66ec..ae3773be74 100644 --- a/code/__defines/dcs/signals.dm +++ b/code/__defines/dcs/signals.dm @@ -58,8 +58,8 @@ #define COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE "atom_init_success" ///from base of atom/attackby(): (/obj/item, /mob/living, params) #define COMSIG_PARENT_ATTACKBY "atom_attackby" -///Return this in response if you don't want afterattack to be called - #define COMPONENT_NO_AFTERATTACK (1<<0) +///Return this in response if you don't want later item attack procs to be called. + #define COMPONENT_CANCEL_ATTACK_CHAIN (1<<0) ///from base of atom/attack_hulk(): (/mob/living/carbon/human) #define COMSIG_ATOM_HULK_ATTACK "hulk_attack" ///from base of atom/animal_attack(): (/mob/user) @@ -94,6 +94,7 @@ #define COMSIG_ATOM_BUMPED "atom_bumped" ///from base of atom/ex_act(): (severity, target) #define COMSIG_ATOM_EX_ACT "atom_ex_act" + #define COMPONENT_IGNORE_EXPLOSION (1<<0) ///from base of atom/emp_act(): (severity) #define COMSIG_ATOM_EMP_ACT "atom_emp_act" ///from base of atom/fire_act(): (exposed_temperature, exposed_volume) @@ -225,7 +226,7 @@ // /atom/movable signals -///from base of atom/movable/Moved(): (/atom) +///from base of atom/movable/Move(): (atom/newloc, dir, movetime) #define COMSIG_MOVABLE_PRE_MOVE "movable_pre_move" #define COMPONENT_MOVABLE_BLOCK_PRE_MOVE (1<<0) ///from base of atom/movable/Moved(): (/atom, dir) @@ -778,3 +779,5 @@ #define COMSIG_CONFLICT_ELEMENT_CHECK "conflict_element_check" /// A conflict was found #define ELEMENT_CONFLICT_FOUND (1<<0) +//From reagents touch_x. +#define COMSIG_REAGENTS_TOUCH "reagent_touch" diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm index b512065f61..c1606e77f6 100644 --- a/code/__defines/gamemode.dm +++ b/code/__defines/gamemode.dm @@ -38,9 +38,11 @@ #define BE_LOYALIST 0x4000 #define BE_PAI 0x8000 //VOREStation Add -#define BE_LOSTDRONE 0x10000 -#define BE_MAINTPRED 0x20000 -#define BE_MORPH 0x40000 +#define BE_LOSTDRONE 0x10000 +#define BE_MAINTPRED 0x20000 +#define BE_MORPH 0x40000 +#define BE_CORGI 0x80000 +#define BE_CURSEDSWORD 0x100000 //VOREStation Add End var/list/be_special_flags = list( @@ -64,6 +66,8 @@ var/list/be_special_flags = list( "Lost Drone" = BE_LOSTDRONE, "Maint Pred" = BE_MAINTPRED, "Morph" = BE_MORPH, + "Corgi" = BE_CORGI, + "Cursed Sword" = BE_CURSEDSWORD, //VOREStation Add End ) diff --git a/code/__defines/is_helpers.dm b/code/__defines/is_helpers.dm index 3f56ebda7f..07c25a40ab 100644 --- a/code/__defines/is_helpers.dm +++ b/code/__defines/is_helpers.dm @@ -21,6 +21,8 @@ #define isstorage(A) istype(A, /obj/item/weapon/storage) +#define ismecha(A) istype(A, /obj/mecha) + //--------------- //#define isarea(D) istype(D, /area) //Built in @@ -60,3 +62,4 @@ #define ismineralturf(A) istype(A, /turf/simulated/mineral) #define istaurtail(A) istype(A, /datum/sprite_accessory/tail/taur) +#define islongtail(A) istype(A, /datum/sprite_accessory/tail/longtail) diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index f17b037e80..afeef6e0f2 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -66,7 +66,9 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called #define NETWORK_PRISON "Prison" #define NETWORK_SECURITY "Security" #define NETWORK_INTERROGATION "Interrogation" -#define NETWORK_TELECOM "Tcomms" +#define NETWORK_TELECOM "Telecomms" +#define NETWORK_EXPLORATION "Exploration" +#define NETWORK_XENOBIO "Xenobiology" #define NETWORK_THUNDER "Entertainment" //VOREStation Edit: broader definition #define NETWORK_COMMUNICATORS "Communicators" #define NETWORK_ALARM_ATMOS "Atmosphere Alarms" diff --git a/code/__defines/map.dm b/code/__defines/map.dm index 9bb1469212..760110b534 100644 --- a/code/__defines/map.dm +++ b/code/__defines/map.dm @@ -9,6 +9,7 @@ #define MAP_LEVEL_XENOARCH_EXEMPT 0x080 // Z-levels exempt from xenoarch digsite generation. #define MAP_LEVEL_PERSIST 0x100 // Z-levels where SSpersistence should persist between rounds #define MAP_LEVEL_MAPPABLE 0x200 // Z-levels where mapping units will work fully +#define MAP_LEVEL_BELOW_BLOCKED 0x400 // Z-levels in multiz with level below not meant to be 'normally' accessible // Misc map defines. #define SUBMAP_MAP_EDGE_PAD 8 // Automatically created submaps are forbidden from being this close to the main map's edge. //VOREStation Edit diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index ca8d02f19c..46cff510cb 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -47,6 +47,7 @@ #define AG_WEAKEN 0x10 // too weak to move, oof #define AG_BLURRY 0x20 // blurred vision! #define AG_SLEEPY 0x40 // fatigue/exhaustion +#define AG_CONFUSE 0x80 // disorientation - VOREStation addition // Species spawn flags #define SPECIES_IS_WHITELISTED 0x1 // Must be whitelisted to play. diff --git a/code/__defines/species_languages_vr.dm b/code/__defines/species_languages_vr.dm index 78054e6ba8..32457d9567 100644 --- a/code/__defines/species_languages_vr.dm +++ b/code/__defines/species_languages_vr.dm @@ -11,6 +11,7 @@ #define LANGUAGE_VESPINAE "Vespinae" #define LANGUAGE_SPACER "Spacer" #define LANGUAGE_CLOWNISH "Coulrian" +#define LANGUAGE_TAVAN "Tavan" #define LANGUAGE_CHIMPANZEE "Chimpanzee" #define LANGUAGE_NEAERA "Neaera" diff --git a/code/_global_vars/lists/misc.dm b/code/_global_vars/lists/misc.dm index ee320056be..a16573905e 100644 --- a/code/_global_vars/lists/misc.dm +++ b/code/_global_vars/lists/misc.dm @@ -7,6 +7,6 @@ GLOBAL_LIST_EMPTY(wire_color_directory) // This is an associative list with the // Reference list for disposal sort junctions. Filled up by sorting junction's New() GLOBAL_LIST_EMPTY(tagger_locations) -GLOBAL_LIST_INIT(char_directory_tags, list("Pred", "Prey", "Switch", "Non-Vore", "Unset")) +GLOBAL_LIST_INIT(char_directory_tags, list("Pred", "Pred-Pref", "Prey", "Prey-Pref", "Switch", "Non-Vore", "Unset")) GLOBAL_LIST_INIT(char_directory_erptags, list("Top", "Bottom", "Switch", "No ERP", "Unset")) GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes diff --git a/code/_helpers/game.dm b/code/_helpers/game.dm index ed4734f355..c9727a8a98 100644 --- a/code/_helpers/game.dm +++ b/code/_helpers/game.dm @@ -249,13 +249,13 @@ /mob/living/silicon/robot/can_hear_radio(var/list/hearturfs) var/turf/T = get_turf(src) var/obj/item/device/radio/borg/R = hearturfs[T] // this should be an assoc list of turf-to-radio - + // We heard it on our own radio? We use power for that. if(istype(R) && R.myborg == src) var/datum/robot_component/CO = get_component("radio") if(!CO || !is_component_functioning("radio") || !cell_use_power(CO.active_usage)) return FALSE // Sorry, couldn't hear - + return R // radio, true, false, what's the difference /mob/observer/dead/can_hear_radio(var/list/hearturfs) @@ -272,14 +272,17 @@ var/list/hear = dview(range,T,INVISIBILITY_MAXIMUM) var/list/hearturfs = list() - + // Openspace visibility handling // Below turfs we can see for(var/turf/simulated/open/O in hear) var/turf/U = GetBelow(O) while(istype(U)) hearturfs |= U - U = GetBelow(U) + if(isopenspace(U)) + U = GetBelow(U) + else + U = null // Above us var/above_range = range diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index 1a482e6d24..63c9c1a24e 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -42,6 +42,7 @@ var/global/list/facial_hair_styles_male_list = list() var/global/list/facial_hair_styles_female_list = list() var/global/list/skin_styles_female_list = list() //unused var/global/list/body_marking_styles_list = list() //stores /datum/sprite_accessory/marking indexed by name +var/global/list/body_marking_nopersist_list = list() // Body marking styles, minus non-genetic markings and augments var/global/list/ear_styles_list = list() // Stores /datum/sprite_accessory/ears indexed by type var/global/list/tail_styles_list = list() // Stores /datum/sprite_accessory/tail indexed by type var/global/list/wing_styles_list = list() // Stores /datum/sprite_accessory/wing indexed by type @@ -149,6 +150,8 @@ GLOBAL_LIST_EMPTY(mannequins) for(var/path in paths) var/datum/sprite_accessory/marking/M = new path() body_marking_styles_list[M.name] = M + if(!M.genetic) + body_marking_nopersist_list[M.name] = M //Surgery Steps - Initialize all /datum/surgery_step into a list paths = subtypesof(/datum/surgery_step) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 8f760c3cc9..455732fa7c 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -229,7 +229,8 @@ var/global/list/edible_trash = list(/obj/item/broken_device, /obj/item/weapon/storage/fancy/egg_box, /obj/item/weapon/storage/wallet, /obj/item/weapon/storage/vore_egg, - /obj/item/weapon/bikehorn/tinytether + /obj/item/weapon/bikehorn/tinytether, + /obj/item/capture_crystal ) var/global/list/contamination_flavors = list( diff --git a/code/_helpers/matrices.dm b/code/_helpers/matrices.dm index a5ef701c2d..88bec71bc2 100644 --- a/code/_helpers/matrices.dm +++ b/code/_helpers/matrices.dm @@ -6,6 +6,13 @@ /atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3) if(!segments) return + //VOREStation Addition Start + if(speed == 0) + loops = 0 + if(speed < 0) + speed = speed * -1 + clockwise = 0 + //VOREStation Addition End var/segment = 360/segments if(!clockwise) segment = -segment diff --git a/code/_helpers/sorts/comparators.dm b/code/_helpers/sorts/comparators.dm index c24267e678..2f1b69191c 100644 --- a/code/_helpers/sorts/comparators.dm +++ b/code/_helpers/sorts/comparators.dm @@ -95,3 +95,6 @@ ///Species have sort_hint they self-generate to hint themselves into groups. After that, alphabetical. /proc/cmp_species(datum/species/A, datum/species/B) return A.sort_hint == B.sort_hint ? sorttext("[B.name]","[A.name]") : A.sort_hint - B.sort_hint + +/proc/cmp_stored_item_name(datum/stored_item/A, datum/stored_item/B) + return sorttext(B.item_name, A.item_name) \ No newline at end of file diff --git a/code/_helpers/time.dm b/code/_helpers/time.dm index d1badd69fd..c50b5e2941 100644 --- a/code/_helpers/time.dm +++ b/code/_helpers/time.dm @@ -50,13 +50,17 @@ var/station_date = "" var/next_station_date_change = 1 DAY #define duration2stationtime(time) time2text(station_time_in_ds + time, "hh:mm") -#define worldtime2stationtime(time) time2text(GLOB.roundstart_hour HOURS + time, "hh:mm") +#define roundstart_delay_time (world.time - round_duration_in_ds) +#define world_time_in_ds(time) (GLOB.roundstart_hour HOURS + time - roundstart_delay_time) #define round_duration_in_ds (GLOB.round_start_time ? REALTIMEOFDAY - GLOB.round_start_time : 0) #define station_time_in_ds (GLOB.roundstart_hour HOURS + round_duration_in_ds) /proc/stationtime2text() return time2text(station_time_in_ds + GLOB.timezoneOffset, "hh:mm") +/proc/worldtime2stationtime(time) + return time2text(world_time_in_ds(time) + GLOB.timezoneOffset, "hh:mm") + /proc/stationdate2text() var/update_time = FALSE if(station_time_in_ds > next_station_date_change) diff --git a/code/_helpers/turfs.dm b/code/_helpers/turfs.dm index cc90829619..cdca430fb6 100644 --- a/code/_helpers/turfs.dm +++ b/code/_helpers/turfs.dm @@ -121,6 +121,7 @@ var/old_icon1 = T.icon var/old_decals = T.decals ? T.decals.Copy() : null + B.Destroy() X = B.ChangeTurf(T.type) X.set_dir(old_dir1) X.icon_state = old_icon_state1 diff --git a/code/_macros_vr.dm b/code/_macros_vr.dm index 2eecbe69ed..314689541e 100644 --- a/code/_macros_vr.dm +++ b/code/_macros_vr.dm @@ -1 +1,2 @@ #define isbelly(A) istype(A, /obj/belly) +#define iscapturecrystal(A) istype(A, /obj/item/capture_crystal) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index c4edacd933..6cb86b152f 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -191,6 +191,11 @@ The box in your backpack has an oxygen tank and gas mask in it." desc = "Your battery is about to die! Charge it ASAP!" icon_state = "c_starving" +/obj/screen/alert/warm + name = "Too Warm" + desc = "You're uncomfortably warm. Take off some clothes or tweak the thermostat a few degrees cooler." + icon_state = "mildhot" + /obj/screen/alert/hot name = "Too Hot" desc = "You're flaming hot! Get somewhere cooler and take off any insulating clothing like a fire suit." @@ -199,6 +204,11 @@ The box in your backpack has an oxygen tank and gas mask in it." /obj/screen/alert/hot/robot desc = "The air around you is too hot for a humanoid. Be careful to avoid exposing them to this enviroment." +/obj/screen/alert/chilly + name = "Too Chilly" + desc = "You're uncomfortably cold. Rug up or tweak the thermostat a few degrees higher." + icon_state = "mildcold" + /obj/screen/alert/cold name = "Too Cold" desc = "You're freezing cold! Get somewhere warmer and take off any insulating clothing like a space suit." diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 48accdb7fa..c55ec430e3 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -25,28 +25,48 @@ avoid code duplication. This includes items that may sometimes act as a standard return return -// Called at the start of resolve_attackby(), before the actual attack. -/obj/item/proc/pre_attack(atom/a, mob/user) - return +/** + * Called at the start of resolve_attackby(), before the actual attack. + * + * Arguments: + * * atom/A - The atom about to be hit + * * mob/living/user - The mob doing the htting + * * params - click params such as alt/shift etc + * + * See: [/obj/item/proc/melee_attack_chain] + */ + +/obj/item/proc/pre_attack(atom/A, mob/user, params) //do stuff before attackby! + if(SEND_SIGNAL(src, COMSIG_ITEM_PRE_ATTACK, A, user, params) & COMPONENT_CANCEL_ATTACK_CHAIN) + return TRUE + return FALSE //return TRUE to avoid calling attackby after this proc does stuff //I would prefer to rename this to attack(), but that would involve touching hundreds of files. /obj/item/proc/resolve_attackby(atom/A, mob/user, var/attack_modifier = 1, var/click_parameters) - pre_attack(A, user) add_fingerprint(user) + . = pre_attack(A, user, click_parameters) + if(.) // We're returning the value of pre_attack, important if it has a special return. + return return A.attackby(src, user, attack_modifier, click_parameters) // No comment /atom/proc/attackby(obj/item/W, mob/user, var/attack_modifier, var/click_parameters) - if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, click_parameters) & COMPONENT_NO_AFTERATTACK) + if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, W, user, click_parameters) & COMPONENT_CANCEL_ATTACK_CHAIN) return TRUE return FALSE /mob/living/attackby(obj/item/I, mob/user, var/attack_modifier, var/click_parameters) if(!ismob(user)) - return 0 + return FALSE + + if(SEND_SIGNAL(src, COMSIG_PARENT_ATTACKBY, I, user, click_parameters) & COMPONENT_CANCEL_ATTACK_CHAIN) + return FALSE + if(can_operate(src, user) && I.do_surgery(src,user)) - return 1 + return TRUE + if(attempt_vr(src,"vore_attackby",args)) return //VOREStation Add - The vore, of course. + return I.attack(src, user, user.zone_sel.selecting, attack_modifier) // Used to get how fast a mob should attack, and influences click delay. diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index 3bd1a0afb2..5351139540 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -26,7 +26,9 @@ A.attack_hand(src) /atom/proc/attack_hand(mob/user as mob) - return + if(SEND_SIGNAL(src, COMSIG_ATOM_ATTACK_HAND, user) & COMPONENT_CANCEL_ATTACK_CHAIN) + return TRUE + return FALSE /mob/living/carbon/human/RestrainedClickOn(var/atom/A) return diff --git a/code/controllers/subsystems/ai.dm b/code/controllers/subsystems/ai.dm index 4ed43a3481..41fb3a7e29 100644 --- a/code/controllers/subsystems/ai.dm +++ b/code/controllers/subsystems/ai.dm @@ -10,7 +10,7 @@ SUBSYSTEM_DEF(ai) var/list/currentrun = list() var/slept_mobs = 0 - var/list/process_z = list() + var/list/process_z = list() /datum/controller/subsystem/ai/stat_entry(msg_prefix) ..("P: [processing.len] | S: [slept_mobs]") @@ -32,10 +32,14 @@ SUBSYSTEM_DEF(ai) while(currentrun.len) var/datum/ai_holder/A = currentrun[currentrun.len] --currentrun.len - if(!A || QDELETED(A) || !A.holder?.loc || A.busy) // Doesn't exist or won't exist soon or not doing it this tick + if(!A || QDELETED(A) || A.busy) // Doesn't exist or won't exist soon or not doing it this tick continue - - if(process_z[get_z(A.holder)]) + + var/mob/living/L = A.holder //VOREStation Edit Start + if(!L?.loc) + continue + + if(process_z[get_z(L)] || !L.low_priority) //VOREStation Edit End A.handle_strategicals() else slept_mobs++ diff --git a/code/controllers/subsystems/mapping.dm b/code/controllers/subsystems/mapping.dm index 06bf16e255..832a84784d 100644 --- a/code/controllers/subsystems/mapping.dm +++ b/code/controllers/subsystems/mapping.dm @@ -76,7 +76,9 @@ SUBSYSTEM_DEF(mapping) // VOREStation Edit Start: Enable This /datum/controller/subsystem/mapping/proc/loadLateMaps() var/list/deffo_load = using_map.lateload_z_levels - var/list/maybe_load = using_map.lateload_single_pick + var/list/maybe_load = using_map.lateload_gateway + var/list/also_load = using_map.lateload_overmap + for(var/list/maplist in deffo_load) if(!islist(maplist)) @@ -110,6 +112,28 @@ SUBSYSTEM_DEF(mapping) error("Randompick Z level \"[map]\" is not a valid map!") else MT.load_new_z(centered = FALSE) + + if(LAZYLEN(also_load)) //Just copied from gateway picking, this is so we can have a kind of OM map version of the same concept. + var/picklist = pick(also_load) + + if(!picklist) //No lateload maps at all + return + + if(!islist(picklist)) //So you can have a 'chain' of z-levels that make up one away mission + error("Randompick Z level [picklist] is not a list! Must be in a list!") + return + + for(var/map in picklist) + if(islist(map)) + // TRIPLE NEST. In this situation we pick one at random from the choices in the list. + //This allows a sort of a1,a2,a3,b1,b2,b3,c1,c2,c3 setup where it picks one 'a', one 'b', one 'c' + map = pick(map) + var/datum/map_template/MT = map_templates[map] + if(!istype(MT)) + error("Randompick Z level \"[map]\" is not a valid map!") + else + MT.load_new_z(centered = FALSE) + /datum/controller/subsystem/mapping/proc/preloadShelterTemplates() for(var/datum/map_template/shelter/shelter_type as anything in subtypesof(/datum/map_template/shelter)) diff --git a/code/controllers/subsystems/persist_vr.dm b/code/controllers/subsystems/persist_vr.dm index a00d4f7a3d..c40a0b0e35 100644 --- a/code/controllers/subsystems/persist_vr.dm +++ b/code/controllers/subsystems/persist_vr.dm @@ -25,6 +25,7 @@ SUBSYSTEM_DEF(persist) return if(!resumed) src.currentrun = human_mob_list.Copy() + src.currentrun += silicon_mob_list.Copy() //cache for sanic speed (lists are references anyways) var/list/currentrun = src.currentrun @@ -41,9 +42,7 @@ SUBSYSTEM_DEF(persist) return continue - // Do not collect useless PTO var/department_earning = J.pto_type - clear_unused_pto(M) // Determine special PTO types and convert properly if(department_earning == PTO_CYBORG) @@ -103,12 +102,4 @@ SUBSYSTEM_DEF(persist) // They have a custom title, aren't crew, or someone deleted their record, so we need a fallback method. // Let's check the mind. if(M.mind && M.mind.assigned_role) - . = job_master.GetJob(M.mind.assigned_role) - -// This proc tries makes sure old Command PTO doesn't linger -/datum/controller/subsystem/persist/proc/clear_unused_pto(var/mob/M) - var/client/C = M.client - LAZYINITLIST(C.department_hours) - if(C.department_hours[DEPARTMENT_COMMAND]) - C.department_hours[DEPARTMENT_COMMAND] = null - C.department_hours.Remove(DEPARTMENT_COMMAND) + . = job_master.GetJob(M.mind.assigned_role) \ No newline at end of file diff --git a/code/controllers/subsystems/persistence.dm b/code/controllers/subsystems/persistence.dm index f238621b3e..e20c83e5a5 100644 --- a/code/controllers/subsystems/persistence.dm +++ b/code/controllers/subsystems/persistence.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(persistence) flags = SS_NO_FIRE var/list/tracking_values = list() var/list/persistence_datums = list() - + /// Places our subsystem can spawn paintings (helps with art spawning differently across maps) var/list/obj/structure/sign/painting/painting_frames = list() var/list/all_paintings = list() @@ -36,10 +36,6 @@ SUBSYSTEM_DEF(persistence) if(!A || (A.flags & AREA_FLAG_IS_NOT_PERSISTENT)) return -// if((!T.z in GLOB.using_map.station_levels) || !initialized) - if(!(T.z in using_map.station_levels)) - return - if(!(T.z in using_map.persist_levels)) return diff --git a/code/controllers/subsystems/supply.dm b/code/controllers/subsystems/supply.dm index 04908f3f31..af096c33a8 100644 --- a/code/controllers/subsystems/supply.dm +++ b/code/controllers/subsystems/supply.dm @@ -56,6 +56,8 @@ SUBSYSTEM_DEF(supply) return 1 if(istype(A,/obj/item/device/perfect_tele_beacon)) //VOREStation Addition: Translocator beacons return 1 //VOREStation Addition: Translocator beacons + if(istype(A,/obj/machinery/power/quantumpad)) // //VOREStation Add: Quantum pads + return 1 //VOREStation Add: Quantum pads for(var/atom/B in A.contents) if(.(B)) diff --git a/code/controllers/subsystems/throwing.dm b/code/controllers/subsystems/throwing.dm index 3b908ac393..6c3a799b28 100644 --- a/code/controllers/subsystems/throwing.dm +++ b/code/controllers/subsystems/throwing.dm @@ -67,7 +67,7 @@ SUBSYSTEM_DEF(throwing) src.speed = speed src.thrower = thrower src.callback = callback - if(!QDELETED(thrower)) + if(!QDELETED(thrower) && ismob(thrower)) src.target_zone = thrower.zone_sel ? thrower.zone_sel.selecting : null dist_x = abs(target.x - thrownthing.x) @@ -204,4 +204,4 @@ SUBSYSTEM_DEF(throwing) if(hit_thing) finalize(hit=TRUE, t_target=hit_thing) - return TRUE \ No newline at end of file + return TRUE diff --git a/code/datums/autolathe/medical_vr.dm b/code/datums/autolathe/medical_vr.dm index f59df10466..bfaeb3a63b 100644 --- a/code/datums/autolathe/medical_vr.dm +++ b/code/datums/autolathe/medical_vr.dm @@ -1,8 +1,9 @@ /datum/category_item/autolathe/medical/autoinjector name = "empty autoinjector" path =/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty + resources = list(MAT_PLASTIC = 10) //for recycling purposes mostly /datum/category_item/autolathe/medical/autoinjector/biginjector name = "empty large autoinjector" path =/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/empty - resources = list(MAT_PLASTIC = 2000) \ No newline at end of file + resources = list(MAT_PLASTIC = 500) \ No newline at end of file diff --git a/code/datums/components/crafting/recipes/weapons.dm b/code/datums/components/crafting/recipes/weapons.dm index 6baa4b5e9b..b8fe974e05 100644 --- a/code/datums/components/crafting/recipes/weapons.dm +++ b/code/datums/components/crafting/recipes/weapons.dm @@ -48,3 +48,11 @@ time = 40 category = CAT_WEAPONRY subcategory = CAT_AMMO + +/datum/crafting_recipe/primitive_shield + name = "Primitive Shield" + result = /obj/item/weapon/shield/primitive + reqs = list(list(/obj/item/stack/material/wood = 2), list(/obj/item/weapon/reagent_containers/glass/bucket/wood =1), list(/obj/item/stack/material/cloth = 5)) + time = 120 + category = CAT_WEAPONRY + subcategory = CAT_WEAPON diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 86573474e6..fbad2752ee 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -115,7 +115,7 @@ if(!(mat_container_flags & MATCONTAINER_SILENT)) to_chat(user, "[parent] won't accept [I]!") return - . = COMPONENT_NO_AFTERATTACK + . = COMPONENT_CANCEL_ATTACK_CHAIN var/datum/callback/pc = precondition if(pc && !pc.Invoke(user)) return @@ -168,7 +168,7 @@ // It shouldn't be possible to add more matter than our max ASSERT((total_amount + (matter_per_sheet * sheets_to_use)) <= max_amount) - + // Use the amount of sheets from the stack if(!S.use(sheets_to_use)) to_chat(user, "Something went wrong with your stack. Split it manually and try again.") @@ -358,7 +358,7 @@ if(materials[M] < (sheet_amt * SHEET_MATERIAL_AMOUNT)) sheet_amt = round(materials[M] / SHEET_MATERIAL_AMOUNT) - var/obj/item/stack/S = M.stack_type + var/obj/item/stack/S = M.stack_type var/max_stack_size = initial(S.max_amount) var/count = 0 diff --git a/code/datums/ghost_query.dm b/code/datums/ghost_query.dm index c471c47c81..6a342f5820 100644 --- a/code/datums/ghost_query.dm +++ b/code/datums/ghost_query.dm @@ -47,7 +47,7 @@ for(var/ban in check_bans) if(jobban_isbanned(candidate, ban)) return FALSE // They're banned from this role. - + return TRUE /// Send async alerts and ask for responses. Expects you to have tested D for client and type already @@ -59,10 +59,10 @@ var/client/C = D.client window_flash(C) - + if(query_sound) SEND_SOUND(C, sound(query_sound)) - + tgui_alert_async(D, question, "[role_name] request", list("Yes", "No", "Never for this round"), CALLBACK(src, .proc/get_reply), wait_time SECONDS) /// Process an async alert response @@ -70,9 +70,9 @@ var/mob/observer/dead/D = usr if(!D?.client) return - + // Unhandled are "No" and "Nevermind" responses, which should just do nothing - + // This response is always fine, doesn't warrant retesting switch(response) if("Never for this round") @@ -189,10 +189,12 @@ role_name = "Dark Creature" question = "A curious explorer has touched a mysterious rune. \ Would you like to play as the creature it summons?" + be_special_flag = BE_CORGI cutoff_number = 1 /datum/ghost_query/cursedblade role_name = "Cursed Sword" question = "A cursed blade has been discovered by a curious explorer. \ Would you like to play as the soul imprisoned within?" + be_special_flag = BE_CURSEDSWORD cutoff_number = 1 diff --git a/code/datums/looping_sounds/weather_sounds.dm b/code/datums/looping_sounds/weather_sounds.dm index 4a02993058..67a97c71f1 100644 --- a/code/datums/looping_sounds/weather_sounds.dm +++ b/code/datums/looping_sounds/weather_sounds.dm @@ -75,17 +75,24 @@ mid_sounds = list( 'sound/effects/weather/acidrain_mid.ogg' = 1 ) - mid_length = 15 SECONDS // The lengths for the files vary, but the longest is ten seconds, so this will make it sound like intermittent wind. + mid_length = 15 SECONDS start_sound = 'sound/effects/weather/acidrain_start.ogg' start_length = 13 SECONDS end_sound = 'sound/effects/weather/acidrain_end.ogg' volume = 20 -/datum/looping_sound/weather/rain/indoors - volume = 10 - /datum/looping_sound/weather/rain/heavy volume = 40 -/datum/looping_sound/weather/rain/heavy/indoors - volume = 20 \ No newline at end of file +/datum/looping_sound/weather/rain/indoors + mid_sounds = list( + 'sound/effects/weather/indoorrain_mid.ogg' = 1 + ) + mid_length = 15 SECONDS + start_sound = 'sound/effects/weather/indoorrain_start.ogg' + start_length = 13 SECONDS + end_sound = 'sound/effects/weather/indoorrain_end.ogg' + volume = 20 //Sound is already quieter in file + +/datum/looping_sound/weather/rain/indoors/heavy + volume = 40 \ No newline at end of file diff --git a/code/datums/outfits/costumes/halloween.dm b/code/datums/outfits/costumes/halloween.dm index 76b510807a..35f4aa238d 100644 --- a/code/datums/outfits/costumes/halloween.dm +++ b/code/datums/outfits/costumes/halloween.dm @@ -25,8 +25,8 @@ var/obj/item/weapon/storage/briefcase/new_briefcase = new(H) for(var/obj/item/briefcase_item in new_briefcase) qdel(briefcase_item) - new_briefcase.contents += new /obj/item/toy/crossbow - new_briefcase.contents += new /obj/item/weapon/gun/projectile/revolver/capgun + new_briefcase.contents += new /obj/item/weapon/gun/projectile/pistol/toy + new_briefcase.contents += new /obj/item/ammo_magazine/mfoam_dart/pistol new_briefcase.contents += new /obj/item/clothing/mask/gas/clown_hat H.equip_to_slot_or_del(new_briefcase, slot_l_hand) @@ -102,7 +102,7 @@ suit = /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless shoes = /obj/item/clothing/shoes/boots/jackboots gloves = /obj/item/clothing/gloves/fingerless - l_pocket = /obj/item/toy/crossbow + l_pocket = /obj/item/weapon/gun/projectile/revolver/toy/crossbow/halloween r_pocket = /obj/item/device/flashlight/color/red /decl/hierarchy/outfit/costume/pirate @@ -119,4 +119,12 @@ shoes = /obj/item/clothing/shoes/white suit = /obj/item/clothing/suit/storage/hooded/chaplain_hoodie/whiteout gloves = /obj/item/clothing/gloves/white - mask = /obj/item/clothing/mask/surgical \ No newline at end of file + mask = /obj/item/clothing/mask/surgical + +/decl/hierarchy/outfit/costume/marine + name = OUTFIT_COSTUME("Ruin Marine") + uniform = /obj/item/clothing/under/color/grey + shoes = /obj/item/clothing/shoes/brown + head = /obj/item/clothing/head/marine + suit = /obj/item/clothing/suit/marine + r_hand = /obj/item/weapon/gun/projectile/revolver/toy/sawnoff \ No newline at end of file diff --git a/code/datums/riding.dm b/code/datums/riding.dm index ba96dbc405..9dd32dcd93 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -8,6 +8,7 @@ var/key_name = "the keys" // What the 'keys' for the thing being rided on would be called. var/atom/movable/ridden = null // The thing that the datum is attached to. var/only_one_driver = FALSE // If true, only the person in 'front' (first on list of riding mobs) can drive. + var/rider_size = 1 // VOREStation Edit to figure out offsets for rider. /datum/riding/New(atom/movable/_ridden) ridden = _ridden diff --git a/code/datums/supplypacks/costumes_vr.dm b/code/datums/supplypacks/costumes_vr.dm index 482f024290..951f58fc8b 100644 --- a/code/datums/supplypacks/costumes_vr.dm +++ b/code/datums/supplypacks/costumes_vr.dm @@ -394,4 +394,22 @@ ) cost = 10 containertype = /obj/structure/closet/crate - containername = "Knights Gear Crate" \ No newline at end of file + containername = "Knights Gear Crate" + +/datum/supply_pack/costumes/christmas + name = "Christmas costume pack" + contains = list( + /obj/item/clothing/head/santa, + /obj/item/clothing/head/santa/green, + /obj/item/clothing/suit/storage/hooded/wintercoat/christmasred, + /obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen, + /obj/item/clothing/under/christmas/red, + /obj/item/clothing/under/christmas/green, + /obj/item/clothing/under/christmas/croptop/red, + /obj/item/clothing/under/christmas/croptop/green, + /obj/item/clothing/shoes/boots/winter/christmasred, + /obj/item/clothing/shoes/boots/winter/christmasgreen + ) + cost = 20 + containertype = /obj/structure/closet/crate + containername = "Christmas costume pack" \ No newline at end of file diff --git a/code/datums/supplypacks/hydroponics.dm b/code/datums/supplypacks/hydroponics.dm index 4b47a77140..66b3207b2f 100644 --- a/code/datums/supplypacks/hydroponics.dm +++ b/code/datums/supplypacks/hydroponics.dm @@ -49,6 +49,13 @@ containertype = /obj/structure/largecrate/animal/cat containername = "Cat Crate" +/datum/supply_pack/hydro/catslug + name = "Catslug Crate" + contains = list() + cost = 200 + containertype = /obj/structure/largecrate/animal/catslug + containername = "Catslug Crate" + /datum/supply_pack/hydro/hydroponics name = "Hydroponics Supply Crate" contains = list( diff --git a/code/datums/supplypacks/misc_vr.dm b/code/datums/supplypacks/misc_vr.dm index df7af42f5c..63f055d2d4 100644 --- a/code/datums/supplypacks/misc_vr.dm +++ b/code/datums/supplypacks/misc_vr.dm @@ -99,8 +99,8 @@ ) cost = 250 containertype = /obj/structure/closet/crate/secure/gear - containername = "Commonwealth medical hardsuit crate" - access = access_medical + containername = "Commonwealth engineering hardsuit crate" + access = access_engine /datum/supply_pack/misc/zero_rig name = "null hardsuit (jets)" @@ -157,5 +157,4 @@ ) cost = 300 containertype = /obj/structure/closet/crate - containername = "cordless jukebox speakers crate" - \ No newline at end of file + containername = "cordless jukebox speakers crate" \ No newline at end of file diff --git a/code/datums/supplypacks/munitions.dm b/code/datums/supplypacks/munitions.dm index f7b8eeebad..cec258270c 100644 --- a/code/datums/supplypacks/munitions.dm +++ b/code/datums/supplypacks/munitions.dm @@ -187,6 +187,14 @@ containername = "Magnetic ammunition crate" access = access_security +/datum/supply_pack/munitions/claymore + name = "Weapons - Melee - Claymores" + contains = list(/obj/item/weapon/material/sword = 2) + cost = 150 + containertype = /obj/structure/closet/crate/secure/weapon + containername = "Claymore crate" + access = access_armory //two swords that are a one-hit 40 brute + IB chance should be armory-locked + /datum/supply_pack/munitions/shotgunammo name = "Ammunition - Shotgun shells" contains = list( diff --git a/code/datums/supplypacks/recreation.dm b/code/datums/supplypacks/recreation.dm index a3b6ad30d5..ba6a33d48c 100644 --- a/code/datums/supplypacks/recreation.dm +++ b/code/datums/supplypacks/recreation.dm @@ -1,7 +1,7 @@ /* -* Here is where any supply packs -* related to recreation live. -*/ + * Here is where any supply packs + * related to recreation live. + */ /datum/supply_pack/recreation @@ -23,6 +23,25 @@ containertype = /obj/structure/closet/crate/allico containername = "foam weapon crate" +/datum/supply_pack/recreation/donksoftweapons + name = "Donk-Soft Weapon Crate" + contains = list( + /obj/item/ammo_magazine/ammo_box/foam = 2, + /obj/item/weapon/gun/projectile/shotgun/pump/toy = 2, + /obj/item/weapon/gun/projectile/pistol/toy = 2, + /obj/item/ammo_magazine/mfoam_dart/pistol = 2 + ) + cost = 50 + containertype = /obj/structure/closet/crate/allico + containername = "foam weapon crate" + +/datum/supply_pack/recreation/donksoftvend + name = "Donk-Soft Vendor Crate" + contains = list() + cost = 75 + containertype = /obj/structure/largecrate/donksoftvendor + containername = "\improper Donk-Soft vendor crate" + /datum/supply_pack/recreation/lasertag name = "Lasertag equipment" contains = list( diff --git a/code/datums/supplypacks/supplypacks.dm b/code/datums/supplypacks/supplypacks.dm index d419198af3..14e97cce7a 100644 --- a/code/datums/supplypacks/supplypacks.dm +++ b/code/datums/supplypacks/supplypacks.dm @@ -23,6 +23,7 @@ var/list/all_supply_groups = list("Atmospherics", "Science", "Security", "Supplies", + "Vendor Refills", "Voidsuits") /datum/supply_pack diff --git a/code/datums/supplypacks/vending_refills_vr.dm b/code/datums/supplypacks/vending_refills_vr.dm new file mode 100644 index 0000000000..47ee538d7e --- /dev/null +++ b/code/datums/supplypacks/vending_refills_vr.dm @@ -0,0 +1,137 @@ +/datum/supply_pack/vending_refills + group = "Vendor Refills" + containertype = /obj/structure/closet/crate/plastic + containername = "vendor refill cartridge crate" + +/datum/supply_pack/randomised/vending_refills + group = "Vendor Refills" + containertype = /obj/structure/closet/crate/plastic + containername = "vendor refill cartridge crate" + +/datum/supply_pack/vending_refills/snack + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snack) + name = "Getmore Chocolate Corp Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/fitness + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/fitness) + name = "SweatMAX Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/hotfood + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/hotfood) + name = "Hot Foods Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/weeb + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/weeb) + name = "Nippon-tan Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/sol + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/sol) + name = "Sol-Snacks Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/snix + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snix) + name = "Snix Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/snlvend + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snlvend) + name = "Shop-n-Large Snacks Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/sovietvend + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/sovietvend) + name = "Ration Station Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/coffee + contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/coffee) + name = "Hot Drinks Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/cola + contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/cola) + name = "Robust Softdrinks Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/cola_soft + contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/cola_soft) + name = "Soft Robustdrinks Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/sovietsoda + contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda) + name = "BODA Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/bepis + contains = list(/obj/item/weapon/refill_cartridge/autoname/drink/bepis) + name = "Bepis Softdrinks Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/cigarette + contains = list(/obj/item/weapon/refill_cartridge/autoname/cigarette) + name = "Cigarette Vendor Refill Cartridge" + cost = 15 + +/datum/supply_pack/vending_refills/wardrobe + contains = list(/obj/item/weapon/refill_cartridge/multitype/wardrobe) + name = "Wardrobe Vendor Refill Cartridge" + cost = 10 + +/datum/supply_pack/vending_refills/giftvendor + contains = list(/obj/item/weapon/refill_cartridge/autoname/giftvendor) + name = "AlliCo Baubles and Confectionaries Vendor Refill Cartridge" + cost = 20 + +/datum/supply_pack/vending_refills/general_food + contains = list(/obj/item/weapon/refill_cartridge/multitype/food = 5) + name = "5-Pack Food Vendor Refill Cartridges" + cost = 75 + +/datum/supply_pack/vending_refills/general_drink + contains = list(/obj/item/weapon/refill_cartridge/multitype/drink = 5) + name = "5-Pack Drink Vendor Refill Cartridges" + cost = 75 + +/datum/supply_pack/vending_refills/general_clothing + contains = list(/obj/item/weapon/refill_cartridge/multitype/clothing = 5) + name = "5-Pack Clothing Vendor Refill Cartridges" + cost = 75 + +/datum/supply_pack/vending_refills/general_technical + contains = list(/obj/item/weapon/refill_cartridge/multitype/technical = 5) + name = "5-Pack Technical Vendor Refill Cartridges" + cost = 75 + +/datum/supply_pack/vending_refills/general_specialty + contains = list(/obj/item/weapon/refill_cartridge/multitype/specialty = 5) + name = "5-Pack Specialty Vendor Refill Cartridges" + cost = 150 + +/datum/supply_pack/randomised/vending_refills/value_pack // 5 random vendor-specific cartridges at lower average price. But why? + num_contained = 5 + contains = list(/obj/item/weapon/refill_cartridge/autoname/food/snack, + /obj/item/weapon/refill_cartridge/autoname/food/fitness, + /obj/item/weapon/refill_cartridge/autoname/food/hotfood, + /obj/item/weapon/refill_cartridge/autoname/food/weeb, + /obj/item/weapon/refill_cartridge/autoname/food/sol, + /obj/item/weapon/refill_cartridge/autoname/food/snix, + /obj/item/weapon/refill_cartridge/autoname/food/snlvend, + /obj/item/weapon/refill_cartridge/autoname/food/sovietvend, + /obj/item/weapon/refill_cartridge/autoname/drink/coffee, + /obj/item/weapon/refill_cartridge/autoname/drink/cola, + /obj/item/weapon/refill_cartridge/autoname/drink/cola_soft, + /obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda, + /obj/item/weapon/refill_cartridge/autoname/drink/bepis, + /obj/item/weapon/refill_cartridge/autoname/cigarette, + /obj/item/weapon/refill_cartridge/multitype/wardrobe, + /obj/item/weapon/refill_cartridge/autoname/technical/assist, + /obj/item/weapon/refill_cartridge/autoname/technical/tool, + /obj/item/weapon/refill_cartridge/autoname/giftvendor) + name = "5-pack Extra-Cheap Vendor Refill Cartridges" + cost = 35 \ No newline at end of file diff --git a/code/datums/uplink/tools_vr.dm b/code/datums/uplink/tools_vr.dm index abc4d481bf..1cf66457d0 100644 --- a/code/datums/uplink/tools_vr.dm +++ b/code/datums/uplink/tools_vr.dm @@ -73,6 +73,11 @@ item_cost = 15 path = /obj/fiftyspawner/glass +/datum/uplink_item/item/tools/holdingpouch + name = "Pouch of Holding" + item_cost = 20 + path = /obj/item/weapon/storage/pouch/holding + /datum/uplink_item/item/tools/elitelaptop name = "Laptop (Advanced)" item_cost = 20 diff --git a/code/datums/vending/stored_item.dm b/code/datums/vending/stored_item.dm index 3b46c6be3f..48162fa940 100644 --- a/code/datums/vending/stored_item.dm +++ b/code/datums/vending/stored_item.dm @@ -42,6 +42,11 @@ var/atom/movable/product = instances[instances.len] // Remove the last added product instances -= product product.forceMove(product_location) + //VOREStation Addition Start + if(istype(product, /obj)) + var/obj/item = product + item.persist_storable = FALSE + //VOREStation Addition End return product /datum/stored_item/proc/add_product(var/atom/movable/product) @@ -60,7 +65,12 @@ var/new_product = new item_path(stored) instances += new_product - +/datum/stored_item/proc/refill_products(var/refill_amount) + if(!instances) + init_products() + for(var/i = 1 to refill_amount) + var/new_product = new item_path(stored) + instances += new_product /datum/stored_item/stack/get_amount() return amount @@ -75,15 +85,15 @@ /datum/stored_item/stack/get_product(var/product_location, var/count) if(!LAZYLEN(instances)) return null // Shouldn't happen, but will loudly complain if it breaks - + var/obj/item/stack/S = instances[1] count = min(count, S.get_max_amount()) src.amount -= count // We won't vend more than one full stack per call - + // Case 1: Draw the full amount from the first instance if(count < S.get_amount()) S = S.split(count) - + // Case 2: Amount at least one stack, or have to accumulate else if(count >= S.get_amount()) count -= S.get_amount() @@ -91,6 +101,8 @@ for(var/obj/item/stack/T as anything in instances) if(count <= 0) break + if(T.get_amount() <= count) + instances -=T count -= T.transfer_to(S, count) S.forceMove(product_location) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 249339c2f4..96ce6d7356 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -376,7 +376,7 @@ icon_state = unique_reskin[pick] item_state = unique_reskin[pick] reskin_ran = TRUE - to_chat(M, "[src] is now '[pick].'") + to_chat(M, "[src] is now '[pick]'.") /obj/item/weapon/storage/part_replacer/drop_contents() // hacky-feeling tier-based drop system hide_from(usr) diff --git a/code/game/area/CC_areas_vr.dm b/code/game/area/CC_areas_vr.dm index 170fd71cc6..b4853bd081 100644 --- a/code/game/area/CC_areas_vr.dm +++ b/code/game/area/CC_areas_vr.dm @@ -9,3 +9,28 @@ icon_state = "centcom_dock" ambience = AMBIENCE_ARRIVALS base_turf = /turf/simulated/floor/reinforced + +//////// Abductor Areas //////// +/area/unknown + requires_power = 0 + flags = RAD_SHIELDED + icon_state = "red2" + limit_mob_size = FALSE + +/area/unknown/dorm1 + name = "Unknown Dorm 1" + +/area/unknown/dorm2 + name = "Unknown Dorm 2" + +/area/unknown/dorm3 + name = "Unknown Dorm 3" + +/area/unknown/dorm4 + name = "Unknown Dorm 4" + +/area/unknown/dorm5 + name = "Unknown Dorm 5" + +/area/unknown/dorm6 + name = "Unknown Dorm 6" diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index c7a18a4107..f25c8e5f5f 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -42,4 +42,11 @@ /area/holodeck/source_smoleworld name = "\improper Holodeck - Smolworld" - +/area/holodeck/source_gym + name = "\improper Holodeck - Gym" + +/area/holodeck/source_game_room + name = "\improper Holodeck - Game Room" + +/area/holodeck/source_patient_ward + name = "\improper Holodeck - Patient Ward" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 55b6938a7c..3df1820fa9 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -125,6 +125,8 @@ /atom/proc/Bumped(AM as mob|obj) set waitfor = FALSE + SEND_SIGNAL(src, COMSIG_ATOM_BUMPED, AM) + // Convenience proc to see if a container is open for chemistry handling // returns true if open // false if closed @@ -166,6 +168,9 @@ return /atom/proc/bullet_act(obj/item/projectile/P, def_zone) + if(SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, P, def_zone) & COMPONENT_CANCEL_ATTACK_CHAIN) + return + P.on_hit(src, 0, def_zone) . = 0 @@ -260,8 +265,8 @@ invisibility = new_invisibility return TRUE -/atom/proc/ex_act() - return +/atom/proc/ex_act(var/strength = 3) + return (SEND_SIGNAL(src, COMSIG_ATOM_EX_ACT, strength, src) & COMPONENT_IGNORE_EXPLOSION) /atom/proc/emag_act(var/remaining_charges, var/mob/user, var/emag_source) return -1 diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 195e02e8fa..ef50823c48 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -85,6 +85,9 @@ if(!loc || !newloc) return FALSE + if(SEND_SIGNAL(src, COMSIG_MOVABLE_PRE_MOVE, newloc, direct, movetime) & COMPONENT_MOVABLE_BLOCK_PRE_MOVE) + return FALSE + // Store this early before we might move, it's used several places var/atom/oldloc = loc @@ -232,6 +235,9 @@ riding_datum.handle_vehicle_offsets() for (var/datum/light_source/light as anything in light_sources) // Cycle through the light sources on this atom and tell them to update. light.source_atom.update_light() + + SEND_SIGNAL(src, COMSIG_MOVABLE_MOVED, old_loc, direction) + return TRUE /atom/movable/set_dir(newdir) @@ -265,6 +271,9 @@ throwing = 0 if(QDELETED(A)) return + + SEND_SIGNAL(src, COMSIG_MOVABLE_BUMP, A) + A.Bumped(src) A.last_bumped = world.time diff --git a/code/game/dna/dna2.dm b/code/game/dna/dna2.dm index 93a2895311..df62ad8ecf 100644 --- a/code/game/dna/dna2.dm +++ b/code/game/dna/dna2.dm @@ -123,6 +123,7 @@ var/global/list/datum/dna/gene/dna_genes[0] // New stuff var/species = SPECIES_HUMAN var/list/body_markings = list() + var/list/body_markings_genetic = list() var/list/body_descriptors = null var/list/genetic_modifiers = list() // Modifiers with the MODIFIER_GENETIC flag are saved. Note that only the type is saved, not an instance. @@ -143,6 +144,8 @@ var/global/list/datum/dna/gene/dna_genes[0] new_dna.custom_ask=custom_ask //VOREStaton Edit new_dna.custom_whisper=custom_whisper //VOREStaton Edit new_dna.custom_exclaim=custom_exclaim //VOREStaton Edit + var/list/body_markings_genetic = (body_markings - body_marking_nopersist_list) + new_dna.body_markings=body_markings_genetic.Copy() for(var/b=1;b<=DNA_SE_LENGTH;b++) new_dna.SE[b]=SE[b] if(b<=DNA_UI_LENGTH) diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index ed28b847fa..cb2a3fcb4b 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -632,7 +632,7 @@ var/global/list/all_objectives = list() return /datum/objective/heist/kidnap/choose_target() - var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Station Engineer") + var/list/roles = list("Chief Engineer","Research Director","Roboticist","Chemist","Engineer") var/list/possible_targets = list() var/list/priority_targets = list() diff --git a/code/game/jobs/access_datum_vr.dm b/code/game/jobs/access_datum_vr.dm index bdfef8a12b..4500e061a5 100644 --- a/code/game/jobs/access_datum_vr.dm +++ b/code/game/jobs/access_datum_vr.dm @@ -15,7 +15,7 @@ var/const/access_pilot = 67 /datum/access/pilot id = access_pilot desc = "Pilot" - region = ACCESS_REGION_SUPPLY + region = ACCESS_REGION_GENERAL /var/const/access_talon = 301 /datum/access/talon diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm index 64b753daab..a055ce9590 100644 --- a/code/game/jobs/job/captain_vr.dm +++ b/code/game/jobs/job/captain_vr.dm @@ -2,7 +2,8 @@ disallow_jobhop = TRUE pto_type = PTO_CIVILIAN dept_time_required = 80 //Pending something more complicated - alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, "Captain" = /datum/alt_title/captain) + alt_titles = list("Overseer"= /datum/alt_title/overseer, "Facility Director" = /datum/alt_title/facility_director, "Chief Supervisor" = /datum/alt_title/chief_supervisor, + "Captain" = /datum/alt_title/captain) /datum/alt_title/facility_director title = "Facility Director" @@ -13,7 +14,6 @@ /datum/alt_title/captain title = "Captain" - /datum/job/hop disallow_jobhop = TRUE pto_type = PTO_CIVILIAN diff --git a/code/game/jobs/job/civilian_vr.dm b/code/game/jobs/job/civilian_vr.dm index a8a8b90d5e..c26903f1dc 100644 --- a/code/game/jobs/job/civilian_vr.dm +++ b/code/game/jobs/job/civilian_vr.dm @@ -196,6 +196,38 @@ title = "Monk" +////////////////////////////////// +// Pilot +////////////////////////////////// + +/datum/job/pilot + title = "Pilot" + flag = PILOT + departments = list(DEPARTMENT_CIVILIAN) + department_flag = CIVILIAN + faction = "Station" + total_positions = 5 + spawn_positions = 5 + supervisors = "the Head of Personnel" + selection_color = "#515151" + economic_modifier = 5 + minimal_player_age = 3 + pto_type = PTO_CIVILIAN + access = list(access_pilot) + minimal_access = list(access_pilot) + outfit_type = /decl/hierarchy/outfit/job/pilot + job_description = "A Pilot flies the various shuttles in the Virgo-Erigone System." + alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman) + +/datum/alt_title/co_pilot + title = "Co-Pilot" + title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" + +/datum/alt_title/navigator + title = "Navigator" + +/datum/alt_title/helmsman + title = "Helmsman" ////////////////////////////////// // Entertainer diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 95bfd63f7f..780f99a76f 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -42,7 +42,7 @@ // Engineer ////////////////////////////////// /datum/job/engineer - title = "Station Engineer" + title = "Engineer" flag = ENGINEER departments = list(DEPARTMENT_ENGINEERING) department_flag = ENGSEC diff --git a/code/game/jobs/job/exploration_vr.dm b/code/game/jobs/job/exploration_vr.dm index f201406fbc..80b32adb37 100644 --- a/code/game/jobs/job/exploration_vr.dm +++ b/code/game/jobs/job/exploration_vr.dm @@ -55,37 +55,6 @@ /datum/alt_title/exploration_manager title = "Exploration Manager" - -/datum/job/pilot - title = "Pilot" - flag = PILOT - departments = list(DEPARTMENT_CIVILIAN) - department_flag = CIVILIAN - faction = "Station" - total_positions = 5 - spawn_positions = 5 - supervisors = "the Head of Personnel" - selection_color = "#515151" - economic_modifier = 5 - minimal_player_age = 3 - pto_type = PTO_EXPLORATION - access = list(access_pilot) - minimal_access = list(access_pilot) - outfit_type = /decl/hierarchy/outfit/job/pilot - job_description = "A Pilot flies the various shuttles in the Virgo-Erigone System." - alt_titles = list("Co-Pilot" = /datum/alt_title/co_pilot, "Navigator" = /datum/alt_title/navigator, "Helmsman" = /datum/alt_title/helmsman) - -/datum/alt_title/co_pilot - title = "Co-Pilot" - title_blurb = "A Co-Pilot is there primarily to assist main pilot as well as learn from them" - -/datum/alt_title/navigator - title = "Navigator" - -/datum/alt_title/helmsman - title = "Helmsman" - - /datum/job/explorer title = "Explorer" flag = EXPLORER diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 6f04fc5121..8dfa4fe5af 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -59,6 +59,7 @@ var/const/TALPIL =(1<<1) var/const/TALDOC =(1<<2) var/const/TALSEC =(1<<3) var/const/TALENG =(1<<4) +var/const/TALMIN =(1<<5) //VOREStation Add End /proc/guest_jobbans(var/job) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index c2170d5b7b..f33549fc23 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -219,7 +219,7 @@ if(H.reagents.reagent_list.len >= 1) for(var/datum/reagent/R in H.reagents.reagent_list) reagentData[++reagentData.len] = list( - "name" = R.name, + "name" = R.name, "amount" = R.volume, "overdose" = (R.overdose && R.volume > R.overdose) ? TRUE : FALSE, ) @@ -291,7 +291,7 @@ if(istype(E, /obj/item/organ/external/chest) && H.is_lung_ruptured()) organData["lungRuptured"] = 1 - + for(var/datum/wound/W in E.wounds) if(W.internal) organData["internalBleeding"] = 1 @@ -349,10 +349,10 @@ var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(target)) var/name = occupant ? occupant.name : "Unknown" P.info = "
Body Scan - [name]

" - P.info += "Time of scan: [worldtime2stationtime(world.time)]

" + P.info += "Time of scan: [stationtime2text()]

" P.info += "[generate_printing_text()]" P.info += "

Notes:
" - P.name = "Body Scan - [name] ([worldtime2stationtime(world.time)]" + P.name = "Body Scan - [name] ([stationtime2text()]" else return FALSE @@ -479,7 +479,7 @@ var/obj/item/device/nif/N = I //VOREStation Add: NIFs if(istype(I) && I.known_implant) imp += "[I] implanted:" - if(istype(N) && N.known_implant) //VOREStation Add: NIFs + else if(istype(N) && N.known_implant) //VOREStation Add: NIFs imp += "[N] implanted:" else unknown_body++ diff --git a/code/game/machinery/atm_ret_field.dm b/code/game/machinery/atm_ret_field.dm index 9e9a2af168..bcf78539a7 100644 --- a/code/game/machinery/atm_ret_field.dm +++ b/code/game/machinery/atm_ret_field.dm @@ -230,4 +230,11 @@ desc = "A shimmering forcefield that keeps the good air inside and the bad air outside. It seems fairly solid, almost like it's made out of some kind of hardened light.

Note: prolonged immersion in active atmospheric retention fields may have negative long-term health consequences." icon = 'icons/obj/atm_fieldgen.dmi' icon_state = "arfg_field" - density = TRUE \ No newline at end of file + density = TRUE + +/obj/machinery/atmospheric_field_generator/perma/underdoors + field_type = /obj/structure/atmospheric_retention_field/underdoors + +/obj/structure/atmospheric_retention_field/underdoors + plane = OBJ_PLANE + layer = UNDER_JUNK_LAYER diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index e51b4825cc..6bdf71c525 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -15,9 +15,11 @@ /obj/machinery/portable_atmospherics/New() ..() - - air_contents.volume = volume - air_contents.temperature = T20C + //VOREStation Edit - Fix runtime + if(air_contents) + air_contents.volume = volume + air_contents.temperature = T20C + //VOREStation Edit End return 1 diff --git a/code/game/machinery/bioprinter.dm b/code/game/machinery/bioprinter.dm index d00efc79b6..4c684abb99 100644 --- a/code/game/machinery/bioprinter.dm +++ b/code/game/machinery/bioprinter.dm @@ -34,6 +34,7 @@ "Eyes" = list(/obj/item/organ/internal/eyes, 20), "Liver" = list(/obj/item/organ/internal/liver, 20), "Spleen" = list(/obj/item/organ/internal/spleen, 20), + "Stomach" = list(/obj/item/organ/internal/stomach, 20), "Arm, Left" = list(/obj/item/organ/external/arm, 40), "Arm, Right" = list(/obj/item/organ/external/arm/right, 40), "Leg, Left" = list(/obj/item/organ/external/leg, 40), @@ -80,7 +81,7 @@ /obj/machinery/organ_printer/Initialize() . = ..() default_apply_parts() - + /obj/machinery/organ_printer/examine(var/mob/user) . = ..() var/biomass = get_biomass_volume() diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index cef3a344bb..7e1de88bbb 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -99,6 +99,12 @@ var/global/list/engineering_networks = list( /obj/machinery/camera/network/telecom network = list(NETWORK_TELECOM) +/obj/machinery/camera/network/exploration + network = list(NETWORK_EXPLORATION) + +/obj/machinery/camera/network/research/xenobio + network = list(NETWORK_RESEARCH, NETWORK_XENOBIO) + /obj/machinery/camera/network/thunder network = list(NETWORK_THUNDER) invuln = 1 @@ -171,9 +177,9 @@ var/global/list/engineering_networks = list( var/list/my_area = by_area[A.name] my_area += src var/number = my_area.len - + c_tag = "[A.name] #[number]" - + /obj/machinery/camera/autoname/Destroy() var/area/A = get_area(src) if(!A || !by_area || !by_area[A.name]) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 4061c677db..b4f85da77d 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -8,8 +8,8 @@ /obj/item/toy/blink = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/sword = 2, - /obj/item/weapon/gun/projectile/revolver/capgun = 2, - /obj/item/toy/crossbow = 2, + /obj/item/weapon/storage/box/capguntoy = 2, + /obj/item/weapon/gun/projectile/revolver/toy/crossbow = 2, /obj/item/clothing/suit/syndicatefake = 2, /obj/item/weapon/storage/fancy/crayons = 2, /obj/item/toy/spinningtoy = 2, @@ -1083,7 +1083,7 @@ /obj/machinery/computer/arcade/clawmachine name = "AlliCo Grab-a-Gift" desc = "Show off your arcade skills for that special someone!" - icon_state = "clawmachine" + icon_state = "clawmachine_new" icon_keyboard = null icon_screen = null circuit = /obj/item/weapon/circuitboard/arcade/clawmachine @@ -1244,10 +1244,10 @@ /// TGUI Stuff -/obj/machinery/computer/arcade/clawmachine/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) +/obj/machinery/computer/arcade/clawmachine/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) if(!ui) - ui = new(user, src, ui_key, "ClawMachine", name, 300, 400, master_ui, state) + ui = new(user, src, "ClawMachine", name, ui_x = 300, ui_y = 400) ui.autoupdate = TRUE ui.open() @@ -1270,7 +1270,7 @@ if(action == "newgame" && gamepaid == 1) gameStatus = "CLAWMACHINE_ON" - icon_state = "clawmachine_move" + icon_state = "clawmachine_new_move" instructions = "Guide the claw to the prize you want!" wintick = 0 @@ -1307,7 +1307,7 @@ winscreen = "Aw, shucks. Try again!" wintick = 0 gamepaid = 0 - icon_state = "clawmachine" + icon_state = "clawmachine_new" gameStatus = "CLAWMACHINE_END" /obj/machinery/computer/arcade/clawmachine/emag_act(mob/user) diff --git a/code/game/machinery/computer/arcade_vr.dm b/code/game/machinery/computer/arcade_vr.dm index 210f31360f..cc5bd8fe74 100644 --- a/code/game/machinery/computer/arcade_vr.dm +++ b/code/game/machinery/computer/arcade_vr.dm @@ -3,8 +3,8 @@ /obj/item/toy/blink = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/sword = 2, - /obj/item/weapon/gun/projectile/revolver/capgun = 2, - /obj/item/toy/crossbow = 2, + /obj/item/weapon/storage/box/capguntoy = 2, + /obj/item/weapon/gun/projectile/revolver/toy/crossbow = 2, /obj/item/clothing/suit/syndicatefake = 2, /obj/item/weapon/storage/fancy/crayons = 2, /obj/item/toy/spinningtoy = 2, diff --git a/code/game/machinery/computer/camera_vr.dm b/code/game/machinery/computer/camera_vr.dm index 1e006b0f4b..372a5bfb11 100644 --- a/code/game/machinery/computer/camera_vr.dm +++ b/code/game/machinery/computer/camera_vr.dm @@ -23,4 +23,13 @@ "TalonShip", "Entertainment", "Communicators" - ) \ No newline at end of file + ) + +/obj/machinery/computer/security/xenobio + name = "xenobiology camera monitor" + desc = "Used to access the xenobiology cell cameras." + icon_keyboard = "mining_key" + icon_screen = "mining" + network = list(NETWORK_XENOBIO) + circuit = /obj/item/weapon/circuitboard/security/xenobio + light_color = "#F9BBFC" \ No newline at end of file diff --git a/code/game/machinery/computer/guestpass.dm b/code/game/machinery/computer/guestpass.dm index 1d5392fc54..c3584ee48a 100644 --- a/code/game/machinery/computer/guestpass.dm +++ b/code/game/machinery/computer/guestpass.dm @@ -5,6 +5,7 @@ name = "guest pass" desc = "Allows temporary access to station areas." icon_state = "guest" + initial_sprite_stack = list() light_color = "#0099ff" var/temp_access = list() //to prevent agent cards stealing access as permanent @@ -12,6 +13,9 @@ var/expired = 0 var/reason = "NOT SPECIFIED" +/obj/item/weapon/card/id/guest/update_icon() + return + /obj/item/weapon/card/id/guest/GetAccess() if(world.time > expiration_time) return access diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index a2f310aaf1..6a61f01502 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -50,6 +50,11 @@ if(istype(P, /obj/item/weapon/circuitboard)) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") + //VOREStation Addition End + if(istype(B, /obj/item/weapon/circuitboard/quantumpad) && istype(get_area(src), /area/shuttle)) + to_chat(user, "This is too unstable a platform for a quantum pad to operate on!") + return + //VOREStation Addition End playsound(src, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You add the circuit board to the frame.") circuit = P diff --git a/code/game/machinery/cryopod_vr.dm b/code/game/machinery/cryopod_vr.dm index b6aa3e227f..0ccd6a5d05 100644 --- a/code/game/machinery/cryopod_vr.dm +++ b/code/game/machinery/cryopod_vr.dm @@ -8,6 +8,10 @@ /obj/machinery/cryopod/robot spawnpoint_type = /datum/spawnpoint/cyborg +// Used at centcomm for the elevator +/obj/machinery/cryopod/robot/door/dorms + spawnpoint_type = /datum/spawnpoint/tram + /obj/machinery/cryopod/robot/door/gateway name = "public teleporter" desc = "The short-range teleporter you might've came in from. You could leave easily using this." @@ -35,23 +39,23 @@ /obj/machinery/cryopod/proc/log_special_item(var/atom/movable/item,var/mob/to_despawn) ASSERT(item && to_despawn) - + var/loaded_from_key var/char_name = to_despawn.name var/item_name = item.name - + // Best effort key aquisition if(ishuman(to_despawn)) var/mob/living/carbon/human/H = to_despawn if(H.original_player) loaded_from_key = H.original_player - + if(!loaded_from_key && to_despawn.mind && to_despawn.mind.loaded_from_ckey) loaded_from_key = to_despawn.mind.loaded_from_ckey - + else loaded_from_key = "INVALID" - + // Log to harrass them later log_game("CRYO [loaded_from_key]/([to_despawn.name]) cryo'd with [item_name] ([item.type])") qdel(item) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 7ff6f5971b..20d0f634da 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -979,6 +979,7 @@ About the new airlock wires panel: return /obj/machinery/door/airlock/AltClick(mob/user as mob) + . = ..() user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(!Adjacent(user)) return @@ -988,13 +989,13 @@ About the new airlock wires panel: if(icon_state == "door_closed" && arePowerSystemsOn()) flick("door_deny", src) playsound(src, knock_hammer_sound, 50, 0, 3) - else if(arePowerSystemsOn()) + else if(arePowerSystemsOn() && user.a_intent == I_HELP) src.visible_message("[user] presses the door bell on \the [src].", "\The [src]'s bell rings.") src.add_fingerprint(user) if(icon_state == "door_closed") flick("door_deny", src) playsound(src, knock_sound, 50, 0, 3) - else + else if(user.a_intent == I_HELP) src.visible_message("[user] knocks on \the [src].", "Someone knocks on \the [src].") src.add_fingerprint(user) playsound(src, knock_unpowered_sound, 50, 0, 3) diff --git a/code/game/machinery/doors/blast_door.dm b/code/game/machinery/doors/blast_door.dm index e820be315a..08ae8653df 100644 --- a/code/game/machinery/doors/blast_door.dm +++ b/code/game/machinery/doors/blast_door.dm @@ -319,6 +319,23 @@ density = FALSE opacity = 0 + +// SUBTYPE: Shuttle +// Slightly weaker, intergrated shutters - open state is hidden from view. Found on fancy_shuttles +/obj/machinery/door/blast/shuttle + name = "shuttle blast doors" + icon_state_open = "spdoor0" + icon_state_opening = "spdoorc0" + icon_state_closed = "spdoor1" + icon_state_closing = "spdoorc1" + icon_state = "spdoor1" + maxhealth = 400 + +/obj/machinery/door/blast/shuttle/open + icon_state = "spdoor0" + density = FALSE + opacity = 0 + // SUBTYPE: Shutters // Nicer looking, and also weaker, shutters. Found in kitchen and similar areas. /obj/machinery/door/blast/shutters diff --git a/code/game/machinery/doors/door_vr.dm b/code/game/machinery/doors/door_vr.dm index 6583b841b8..1a504065cc 100644 --- a/code/game/machinery/doors/door_vr.dm +++ b/code/game/machinery/doors/door_vr.dm @@ -101,7 +101,19 @@ /obj/machinery/door/blast/regular/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) return // blast doors are immune to fire completely. -/obj/machinery/door/blast/regular/ +/obj/machinery/door/blast/regular + heat_proof = 1 //just so repairing them doesn't try to fireproof something that never takes fire damage + +/obj/machinery/door/blast/angled/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) + return // blast doors are immune to fire completely. + +/obj/machinery/door/blast/angled + heat_proof = 1 //just so repairing them doesn't try to fireproof something that never takes fire damage + +/obj/machinery/door/blast/puzzle/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume) + return // blast doors are immune to fire completely. + +/obj/machinery/door/blast/puzzle heat_proof = 1 //just so repairing them doesn't try to fireproof something that never takes fire damage /obj/machinery/door/proc/toggle() diff --git a/code/game/machinery/doors/firedoor_vr.dm b/code/game/machinery/doors/firedoor_vr.dm index 2bc297a041..2466cabe87 100644 --- a/code/game/machinery/doors/firedoor_vr.dm +++ b/code/game/machinery/doors/firedoor_vr.dm @@ -16,3 +16,8 @@ name = "\improper Emergency Shutter System" desc = "Emergency air-tight shutter, capable of sealing off breached areas. This model fits flush with the walls, and has a panel in the floor for maintenance." icon = 'icons/obj/doors/DoorHazardHidden_steel.dmi' + +/obj/machinery/door/firedoor/glass/hidden/shuttle + name = "\improper Emergency Shuttle Shutters" + desc = "Emergency air-tight shutter, capable of sealing off breached areas. This model fits flush with shuttle walls." + icon = 'icons/obj/doors/DoorHazardHidden_shuttle.dmi' \ No newline at end of file diff --git a/code/game/machinery/pipe/pipe_recipes.dm b/code/game/machinery/pipe/pipe_recipes.dm index 8aee2a1908..ad70f938a0 100644 --- a/code/game/machinery/pipe/pipe_recipes.dm +++ b/code/game/machinery/pipe/pipe_recipes.dm @@ -134,7 +134,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( dirtype = initial(construction_type.dispenser_class) if (dirtype == PIPE_TRIN_M) icon_state_m = "[icon_state]m" - paintable = ispath(path, /obj/machinery/atmospherics/pipe) && !(ispath(path, /obj/machinery/atmospherics/pipe/vent)) // VOREStation Add + paintable = !ispath(path, /obj/machinery/atmospherics/pipe/simple/heat_exchanging) && ispath(path, /obj/machinery/atmospherics/pipe) && !(ispath(path, /obj/machinery/atmospherics/pipe/vent)) // VOREStation Add // diff --git a/code/game/machinery/reagents/pump.dm b/code/game/machinery/reagents/pump.dm deleted file mode 100644 index c48e8d9834..0000000000 --- a/code/game/machinery/reagents/pump.dm +++ /dev/null @@ -1,270 +0,0 @@ - -/obj/machinery/pump - name = "fluid pump" - desc = "A fluid pumping machine." - - description_info = "A machine that can pump fluid from certain turfs.
\ - Water can be pumped from any body of water. Certain locations or environmental\ - conditions can cause different byproducts to be produced.
\ - Magma or Lava can be pumped to produce mineralized fluid." - - anchored = FALSE - density = TRUE - - icon = 'icons/obj/machines/reagent.dmi' - icon_state = "pump" - - circuit = /obj/item/weapon/circuitboard/fluidpump - - var/on = 0 - var/obj/item/weapon/cell/cell = null - var/use = 200 - var/efficiency = 1 - var/reagents_per_cycle = 40 - var/unlocked = 0 - var/open = 0 - - var/obj/item/hose_connector/output/Output - -// Overlay cache vars. - var/icon/liquid - var/icon/tank - var/icon/powerlow - var/icon/glass - var/icon/open_overlay - var/icon/cell_overlay - -/obj/machinery/pump/Initialize() - create_reagents(200) - . = ..() - default_apply_parts() - - if(ispath(cell)) - cell = new cell(src) - - Output = new(src) - - RefreshParts() - update_icon() - -/obj/machinery/pump/update_icon() - ..() - if(!tank) - tank = new/icon(icon, "[icon_state]-volume") - - if(!powerlow) - powerlow = new/icon(icon, "[icon_state]-lowpower") - - if(!liquid) - var/icon/cutter = new/icon(icon, "[icon_state]-volume") - - cutter.Blend(rgb(0, 0, 0,), ICON_MULTIPLY) - - liquid = new/icon(icon, "[icon_state]-cutting") - - liquid.Blend(cutter,ICON_AND) - - if(!glass) - glass = new/icon(icon, "[icon_state]-glass") - - glass.Blend(rgb(1,1,1,0.5), ICON_MULTIPLY) - - if(!open_overlay) - open_overlay = new/icon(icon, "[icon_state]-open") - - if(!cell_overlay) - cell_overlay = new/icon(icon, "[icon_state]-cell") - - cut_overlays() - add_overlay(tank) - - if(cell && cell.charge < (use * CELLRATE / efficiency)) - add_overlay(powerlow) - - if(reagents.total_volume >= 1) - var/list/hextorgb = hex2rgb(reagents.get_color()) - liquid.GrayScale() - - liquid.Blend(rgb(hextorgb[1],hextorgb[2],hextorgb[3]),ICON_MULTIPLY) - - add_overlay(liquid) - - add_overlay(glass) - - if(open) - add_overlay(open_overlay) - - if(cell) - add_overlay(cell_overlay) - - if(on) - icon_state = "[initial(icon_state)]-running" - - else - icon_state = "[initial(icon_state)]" - -/obj/machinery/pump/process() - if(Output.get_pairing()) - reagents.trans_to_holder(Output.reagents, Output.reagents.maximum_volume) - if(prob(5)) - visible_message("\The [src] gurgles as it exports fluid.") - - if(!on) - return - - if(!cell || (cell.charge < (use * CELLRATE / efficiency))) - turn_off(TRUE) - return - - handle_pumping() - update_icon() - -/obj/machinery/pump/RefreshParts() - for(var/obj/item/weapon/stock_parts/manipulator/SM in component_parts) - efficiency = SM.rating - - var/total_bin_rating = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/SB in component_parts) - total_bin_rating += SB.rating - - reagents.maximum_volume = round(initial(reagents.maximum_volume) + 100 * total_bin_rating) - - return - -/obj/machinery/pump/power_change() - if(!cell || cell.charge < (use * CELLRATE) || !anchored) - return turn_off(TRUE) - - return FALSE - - -// Returns 0 on failure and 1 on success -/obj/machinery/pump/proc/turn_on(var/loud = 0) - if(!cell) - return 0 - if(cell.charge < (use * CELLRATE)) - return 0 - - on = 1 - update_icon() - if(loud) - visible_message("\The [src] turns on.") - return 1 - -/obj/machinery/pump/proc/turn_off(var/loud = 0) - on = 0 - set_light(0, 0) - update_icon() - if(loud) - visible_message("\The [src] shuts down.") - - if(!on) - return TRUE - - return FALSE - -/obj/machinery/pump/attack_ai(mob/user as mob) - if(istype(user, /mob/living/silicon/robot) && Adjacent(user)) - return attack_hand(user) - - if(on) - turn_off(TRUE) - else - if(!turn_on(1)) - to_chat(user, "You try to turn on \the [src] but it does not work.") - -/obj/machinery/pump/attack_hand(mob/user as mob) - if(open && cell) - if(ishuman(user)) - if(!user.get_active_hand()) - user.put_in_hands(cell) - cell.loc = user.loc - else - cell.loc = src.loc - - cell.add_fingerprint(user) - cell.update_icon() - - cell = null - on = 0 - set_light(0) - to_chat(user, "You remove the power cell.") - update_icon() - return - - if(on) - turn_off(TRUE) - else if(anchored) - if(!turn_on(1)) - to_chat(user, "You try to turn on \the [src] but it does not work.") - - update_icon() - -/obj/machinery/pump/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(W.is_screwdriver()) - if(!open) - if(unlocked) - unlocked = 0 - to_chat(user, "You screw the battery panel in place.") - else - unlocked = 1 - to_chat(user, "You unscrew the battery panel.") - - else if(W.is_crowbar()) - if(unlocked) - if(open) - open = 0 - overlays = null - to_chat(user, "You crowbar the battery panel in place.") - else - if(unlocked) - open = 1 - to_chat(user, "You remove the battery panel.") - - else if(W.is_wrench()) - if(on) - to_chat(user, "\The [src] is active. Turn it off before trying to move it!") - return - default_unfasten_wrench(user, W, 2 SECONDS) - - else if(istype(W, /obj/item/weapon/cell)) - if(open) - if(cell) - to_chat(user, "There is a power cell already installed.") - else - user.drop_item() - W.loc = src - cell = W - to_chat(user, "You insert the power cell.") - else - ..() - RefreshParts() - update_icon() - -/obj/machinery/pump/proc/handle_pumping() - var/turf/T = get_turf(src) - - if(istype(T, /turf/simulated/floor/water)) - cell.use(use * CELLRATE / efficiency) - reagents.add_reagent("water", reagents_per_cycle) - - if(T.temperature <= T0C) - reagents.add_reagent("ice", round(reagents_per_cycle / 2, 0.1)) - - if((istype(T,/turf/simulated/floor/water/pool) || istype(T,/turf/simulated/floor/water/deep/pool))) - reagents.add_reagent("chlorine", round(reagents_per_cycle / 10 * efficiency, 0.1)) - - else if(istype(T,/turf/simulated/floor/water/contaminated)) - reagents.add_reagent("vatstabilizer", round(reagents_per_cycle / 2)) - - if(T.loc.name == "Sea") // Saltwater. - reagents.add_reagent("sodiumchloride", round(reagents_per_cycle / 10 * efficiency, 0.1)) - - for(var/turf/simulated/mineral/MT in range(5)) - if(MT.mineral) - var/obj/effect/mineral/OR = MT.mineral - reagents.add_reagent(OR.ore_reagent, round(reagents_per_cycle / 20 * efficiency, 0.1)) - - else if(istype(T, /turf/simulated/floor/lava)) - cell.use(use * CELLRATE / efficiency * 4) - reagents.add_reagent("mineralizedfluid", round(reagents_per_cycle * efficiency / 2, 0.1)) diff --git a/code/game/machinery/requests_console_vr.dm b/code/game/machinery/requests_console_vr.dm index 9e93691c2e..39f0a8ecb9 100644 --- a/code/game/machinery/requests_console_vr.dm +++ b/code/game/machinery/requests_console_vr.dm @@ -10,7 +10,7 @@ name = "" department = "" departmentType = "" - announcementConsole = 0 + announcementConsole = TRUE // Departments /obj/machinery/requests_console/preset/cargo diff --git a/code/game/machinery/suit_cycler_datums.dm b/code/game/machinery/suit_cycler_datums.dm index e796213acf..9938af1cd0 100644 --- a/code/game/machinery/suit_cycler_datums.dm +++ b/code/game/machinery/suit_cycler_datums.dm @@ -286,6 +286,10 @@ GLOBAL_LIST_EMPTY(suit_cycler_emagged) name = "Talon Pilot (Closed Helm)" helmet_becomes = /obj/item/clothing/head/helmet/space/void/refurb/pilot/alt/talon suit_becomes = /obj/item/clothing/suit/space/void/refurb/pilot/talon +/datum/suit_cycler_choice/department/talon/miner + name = "Talon Miner" + helmet_becomes = /obj/item/clothing/head/helmet/space/void/refurb/mining/talon + suit_becomes = /obj/item/clothing/suit/space/void/refurb/mining/talon /datum/suit_cycler_choice/department/talon/res name = "Talon Research (Bubble Helm)" helmet_becomes = /obj/item/clothing/head/helmet/space/void/refurb/research/alt/talon diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 4337096a68..be0d121096 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -52,4 +52,10 @@ name = "Talon captain suit cycler" model_text = "Talon captain" req_access = list(access_talon) - departments = list(/datum/suit_cycler_choice/department/talon/officer) \ No newline at end of file + departments = list(/datum/suit_cycler_choice/department/talon/officer) + +/obj/machinery/suit_cycler/vintage/tminer + name = "Talon miner suit cycler" + model_text = "Talon miner" + req_access = list(access_talon) + departments = list(/datum/suit_cycler_choice/department/talon/miner) \ No newline at end of file diff --git a/code/game/machinery/virtual_reality/vr_console.dm b/code/game/machinery/virtual_reality/vr_console.dm index 694d08fa13..4a83de34d3 100644 --- a/code/game/machinery/virtual_reality/vr_console.dm +++ b/code/game/machinery/virtual_reality/vr_console.dm @@ -185,7 +185,8 @@ if(!forced && avatar && tgui_alert(avatar, "Someone wants to remove you from virtual reality. Do you want to leave?", "Leave VR?", list("Yes", "No")) == "No") return - avatar.exit_vr() + if(avatar) + avatar.exit_vr() avatar = null if(occupant.client) diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 83fdefe442..be00cab96a 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/stock_parts.dmi' icon_state = "frame_bitem" var/build_machine_type + var/build_wall_only = FALSE var/refund_amt = 5 var/refund_type = /obj/item/stack/material/steel var/reverse = 0 //if resulting object faces opposite its dir (like light fixtures) @@ -27,7 +28,7 @@ ..() update_type_list() var/datum/frame/frame_types/frame_type - if(!build_machine_type) + if(!build_machine_type && !build_wall_only) var/datum/frame/frame_types/response = tgui_input_list(user, "What kind of frame would you like to make?", "Frame type request", frame_types_floor) if(!response) return diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index cab7caba17..2c65530b9f 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -3,16 +3,18 @@ desc = "You're not so sure about this, anymore..." icon = 'icons/obj/device.dmi' icon_state = "syndbeacon" - use_power = USE_POWER_OFF - anchored = TRUE - density = TRUE - var/charges = 1 - var/insisting = 0 -/obj/machinery/wish_granter/attack_hand(var/mob/user as mob) + anchored = 1 + density = 1 + use_power = USE_POWER_OFF + + var/chargesa = 1 + var/insistinga = 0 + +/obj/machinery/wish_granter/attack_hand(var/mob/living/carbon/human/user as mob) usr.set_machine(src) - if(charges <= 0) + if(chargesa <= 0) to_chat(user, "The Wish Granter lies silent.") return @@ -23,47 +25,45 @@ else if(is_special_character(user)) to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") - else if(!insisting) + else if (!insistinga) to_chat(user, "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?") - insisting++ + insistinga++ else - var/message = "You speak. [pick("I want the station to disappear","Humanity is corrupt, mankind must be destroyed","I want to be rich", "I want to rule the world","I want immortality.")]. The Wish Granter answers." - to_chat(user, message) - to_chat(user, "Your head pounds for a moment, before your vision clears. You are the avatar of the Wish Granter, and your power is LIMITLESS! And it's all yours. You need to make sure no one can take it from you. No one can know, first.") - - charges-- - insisting = 0 - - if(!(HULK in user.mutations)) - user.mutations.Add(HULK) - - if(!(LASER in user.mutations)) - user.mutations.Add(LASER) - - if(!(XRAY in user.mutations)) - user.mutations.Add(XRAY) - user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) - user.see_in_dark = 8 - user.see_invisible = SEE_INVISIBLE_LEVEL_TWO - - if(!(COLD_RESISTANCE in user.mutations)) - user.mutations.Add(COLD_RESISTANCE) - - if(!(TK in user.mutations)) - user.mutations.Add(TK) - - if(!(HEAL in user.mutations)) - user.mutations.Add(HEAL) - - user.update_mutations() - user.mind.special_role = "Avatar of the Wish Granter" - - var/datum/objective/silence/silence = new - silence.owner = user.mind - user.mind.objectives += silence - - show_objectives(user.mind) - to_chat(user, "You have a very bad feeling about this.") - - return \ No newline at end of file + chargesa-- + insistinga = 0 + var/wish = tgui_input_list(usr, "You want...","Wish", list("Power","Wealth","Immortality","To Kill","Peace")) + switch(wish) + if("Power") + to_chat(user, "Your wish is granted, but at a terrible cost...") + to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul.") + if (!(LASER in user.mutations)) + user.mutations.Add(LASER) + to_chat(user, "You feel pressure building behind your eyes.") + if (!(COLD_RESISTANCE in user.mutations)) + user.mutations.Add(COLD_RESISTANCE) + to_chat(user, "Your body feels warm.") + if (!(XRAY in user.mutations)) + user.mutations.Add(XRAY) + user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) + user.see_in_dark = 8 + user.see_invisible = SEE_INVISIBLE_LEVEL_TWO + to_chat(user, "The walls suddenly disappear.") + if("Wealth") + to_chat(user, "Your wish is granted, but at a terrible cost...") + to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul.") + new /obj/structure/closet/syndicate/resources/everything(loc) + if("To Kill") + to_chat(user, "Your wish is granted, but at a terrible cost...") + to_chat(user, "The Wish Granter is outraged at your excessive wickedness, yet grants you your wish regardless. Someone will be killed soon.") + spawn(100) + if(user) + to_chat(user, "Suddenly, you feel as though you are being torn to countless shreds! Your wish is coming true!") + user.gib() + if("Peace") + to_chat(user, "Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.") + to_chat(user, "You feel as if you just narrowly avoided a terrible fate...") + for(var/mob/living/simple_mob/faithless/F in living_mob_list) + F.health = -10 + F.set_stat(DEAD) + F.icon_state = "faithless_dead" \ No newline at end of file diff --git a/code/game/mecha/equipment/tools/jetpack.dm b/code/game/mecha/equipment/tools/jetpack.dm index 5f2fc153a2..9b6de6121f 100644 --- a/code/game/mecha/equipment/tools/jetpack.dm +++ b/code/game/mecha/equipment/tools/jetpack.dm @@ -48,6 +48,43 @@ if(!action_checks()) return chassis.dyndomove(direction) var/move_result = 0 + if(direction == UP || direction == DOWN) + if(!chassis.can_ztravel()) + chassis.occupant_message("Your vehicle lacks the capacity to move in that direction!") + return FALSE + + //We're using locs because some mecha are 2x2 turfs. So thicc! + var/result = TRUE + + for(var/turf/T in chassis.locs) + if(!T.CanZPass(chassis,direction)) + chassis.occupant_message("You can't move that direction from here!") + result = FALSE + break + var/turf/dest = (direction == UP) ? GetAbove(chassis) : GetBelow(chassis) + if(!dest) + chassis.occupant_message("There is nothing of interest in this direction.") + result = FALSE + break + if(!dest.CanZPass(chassis,direction)) + chassis.occupant_message("There's something blocking your movement in that direction!") + result = FALSE + break + if(result) + move_result = chassis.mechstep(direction) + + if(move_result) + chassis.can_move = 0 + chassis.use_power(chassis.step_energy_drain) + if(istype(chassis.loc, /turf/space)) + if(!chassis.check_for_support()) + chassis.float_direction = direction + chassis.start_process(MECHA_PROC_MOVEMENT) + chassis.log_message("Movement control lost. Inertial movement started.") + if(chassis.do_after(get_step_delay())) + chassis.can_move = 1 + return 1 + return 0 if(chassis.hasInternalDamage(MECHA_INT_CONTROL_LOST)) move_result = step_rand(chassis) else if(chassis.dir!=direction) diff --git a/code/game/mecha/equipment/tools/storage_compartment.dm b/code/game/mecha/equipment/tools/storage_compartment.dm new file mode 100644 index 0000000000..1cbd0acce5 --- /dev/null +++ b/code/game/mecha/equipment/tools/storage_compartment.dm @@ -0,0 +1,25 @@ +/obj/item/mecha_parts/mecha_equipment/storage + name = "auxillary exosuit storage bay" + desc = "An auxillary storage compartment, for attaching to exosuits." + icon_state = "mecha_tiler" + icon = 'icons/mecha/mecha_equipment_vr.dmi' + origin_tech = list(TECH_MATERIAL = 3) + range = 0 + var/storage_added = 5 + equip_type = EQUIP_SPECIAL + +/obj/item/mecha_parts/mecha_equipment/storage/attach(obj/mecha/M) + . = ..() + M.cargo_capacity += storage_added + +/obj/item/mecha_parts/mecha_equipment/storage/detach() + chassis.cargo_capacity -= storage_added + ..() + +/obj/item/mecha_parts/mecha_equipment/storage/bluespace + name = "auxillary exosuit storage wormhole" + desc = "An auxillary storage wormhole, utilizing a localized rip in bluespace for storage. Interestingly enough, teleport-stable, \ + despite its blatant disregard for the fabric of reality or reality-adjacency." + icon_state = "mecha_phase_array" + storage_added = 15 + origin_tech = list(TECH_MATERIAL = 6, TECH_ENGINEERING = 4, TECH_MAGNET = 4, TECH_POWER = 5, TECH_BLUESPACE = 3) \ No newline at end of file diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c83fb398b2..3c428580f3 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -101,7 +101,7 @@ var/list/equipment = new //This lists holds what stuff you bolted onto your baby ride var/obj/item/mecha_parts/mecha_equipment/selected var/max_equip = 2 - + // What direction to float in, if inertial movement is active. var/float_direction = 0 // Process() iterator count. @@ -833,7 +833,7 @@ if(hasInternalDamage(MECHA_INT_CONTROL_LOST)) move_result = mechsteprand() //Up/down zmove - else if(direction & UP || direction & DOWN) + else if(direction == UP || direction == DOWN) if(!can_ztravel()) occupant_message("Your vehicle lacks the capacity to move in that direction!") return FALSE @@ -846,7 +846,7 @@ occupant_message("You can't move that direction from here!") result = FALSE break - var/turf/dest = direction & UP ? GetAbove(T) : GetBelow(T) + var/turf/dest = (direction == UP) ? GetAbove(src) : GetBelow(src) if(!dest) occupant_message("There is nothing of interest in this direction.") result = FALSE @@ -2483,8 +2483,8 @@ var/obj/item/mecha_parts/mecha_equipment/equip = top_filter.getObj("select_equip") if(equip) src.selected = equip - src.occupant_message("You switch to [equip]") - src.visible_message("[src] raises [equip]") + src.occupant_message("You switch to [equip].") + src.visible_message("[src] raises [equip].") send_byjax(src.occupant,"exosuit.browser","eq_list",src.get_equipment_list()) return if(href_list["eject"]) diff --git a/code/game/objects/effects/decals/posters/voreposters_vr.dm b/code/game/objects/effects/decals/posters/voreposters_vr.dm index 3974cecf9f..03af8416e4 100644 --- a/code/game/objects/effects/decals/posters/voreposters_vr.dm +++ b/code/game/objects/effects/decals/posters/voreposters_vr.dm @@ -363,7 +363,7 @@ name = "Virgo Orbital Research Establishment" desc = "It features the logo of the local branch of Nanotrasen; Virgo Orbital Research Establishment." /decl/poster/vore_95 - icon_state = "3btetherposter" + icon_state = "tetherposter" name = "The Frontier Awaits" desc = "A stunning depiction of Virgo 3b in front of a field of stars, a purple nebula laces in from behind, while the shining tower of NSB Adephagia gleams in the starlight. 'The Frontier Awaits' is printed in silver lettering. It looks like a recruitment ad." /decl/poster/vore_96 diff --git a/code/game/objects/effects/job_start_landmarks.dm b/code/game/objects/effects/job_start_landmarks.dm index 56711c46f8..974b34a93f 100644 --- a/code/game/objects/effects/job_start_landmarks.dm +++ b/code/game/objects/effects/job_start_landmarks.dm @@ -17,7 +17,7 @@ /obj/effect/landmark/start/atmostech name = "Atmospheric Technician" /obj/effect/landmark/start/engineer - name = "Station Engineer" + name = "Engineer" /obj/effect/landmark/start/cmo name = "Chief Medical Officer" /obj/effect/landmark/start/chemist @@ -90,3 +90,5 @@ name = "Talon Guard" /obj/effect/landmark/start/talonpilot name = "Talon Pilot" +/obj/effect/landmark/start/talonminer + name = "Talon Miner" diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 51ee1430f5..fc6af6b2fd 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -29,6 +29,7 @@ return if("JoinLateGateway") latejoin_gateway += loc + latejoin += src //VOREStation Addition delete_me = 1 return if("JoinLateElevator") @@ -77,6 +78,12 @@ endgame_exits += loc delete_me = 1 return + //VOREStation Add Start + if("vinestart") + vinestart += loc + delete_me = 1 + return + //VORE Station Add End landmarks_list += src return 1 diff --git a/code/game/objects/effects/landmarks_vr.dm b/code/game/objects/effects/landmarks_vr.dm index b9dd81e967..e436447109 100644 --- a/code/game/objects/effects/landmarks_vr.dm +++ b/code/game/objects/effects/landmarks_vr.dm @@ -1,6 +1,12 @@ /obj/effect/landmark var/abductor = 0 +/obj/effect/landmark/vines + name = "vinestart" + +/obj/effect/landmark/vermin + name = "verminstart" + /obj/effect/landmark/late_antag name = "Antag Latespawn" var/antag_id @@ -39,4 +45,4 @@ /obj/effect/landmark/late_antag/raider name = "Raider - Lateload" - antag_id = MODE_RAIDER \ No newline at end of file + antag_id = MODE_RAIDER diff --git a/code/game/objects/effects/semirandom_mobs_vr.dm b/code/game/objects/effects/semirandom_mobs_vr.dm index b7008b4627..e6b26da087 100644 --- a/code/game/objects/effects/semirandom_mobs_vr.dm +++ b/code/game/objects/effects/semirandom_mobs_vr.dm @@ -51,11 +51,16 @@ var/global/list/semirandom_mob_spawner_decisions = list() list(/mob/living/simple_mob/animal/passive/opossum), list(/mob/living/simple_mob/animal/passive/pillbug), list(/mob/living/simple_mob/animal/passive/snake), + list(/mob/living/simple_mob/animal/passive/snake/red), + list(/mob/living/simple_mob/animal/passive/snake/python), list(/mob/living/simple_mob/animal/passive/tindalos), list(/mob/living/simple_mob/animal/passive/yithian), list( /mob/living/simple_mob/animal/wolf = 10, - /mob/living/simple_mob/animal/wolf/direwolf = 1 + /mob/living/simple_mob/animal/wolf/direwolf = 5, + /mob/living/simple_mob/vore/greatwolf = 1, + /mob/living/simple_mob/vore/greatwolf/black = 1, + /mob/living/simple_mob/vore/greatwolf/grey = 1 ), list(/mob/living/simple_mob/vore/rabbit), list(/mob/living/simple_mob/vore/redpanda), @@ -109,12 +114,8 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/animal/giant_spider/phorogenic = 10, /mob/living/simple_mob/animal/giant_spider/thermic = 5, /mob/living/simple_mob/animal/giant_spider/tunneler = 10, - /mob/living/simple_mob/animal/giant_spider/webslinger = 5 - ), - list( - /mob/living/simple_mob/animal/wolf = 10, - /mob/living/simple_mob/animal/wolf/direwolf = 1 - ), + /mob/living/simple_mob/animal/giant_spider/webslinger = 5, + /mob/living/simple_mob/animal/giant_spider/broodmother = 1), list(/mob/living/simple_mob/creature/strong), list(/mob/living/simple_mob/faithless/strong), list(/mob/living/simple_mob/animal/goat), @@ -244,7 +245,6 @@ var/global/list/semirandom_mob_spawner_decisions = list() list(/mob/living/simple_mob/mechanical/wahlem), list(/mob/living/simple_mob/animal/passive/fox/syndicate), list(/mob/living/simple_mob/animal/passive/fox), - list(/mob/living/simple_mob/animal/wolf/direwolf), list(/mob/living/simple_mob/animal/space/jelly), list( /mob/living/simple_mob/otie/feral, @@ -253,12 +253,12 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/otie/red/chubby ), list( - /mob/living/simple_mob/shadekin/blue/ai = 100, - /mob/living/simple_mob/shadekin/green/ai = 50, - /mob/living/simple_mob/shadekin/orange/ai = 20, - /mob/living/simple_mob/shadekin/purple/ai = 60, - /mob/living/simple_mob/shadekin/red/ai = 40, - /mob/living/simple_mob/shadekin/yellow/ai = 1 + /mob/living/simple_mob/shadekin/blue = 100, + /mob/living/simple_mob/shadekin/green = 50, + /mob/living/simple_mob/shadekin/orange = 20, + /mob/living/simple_mob/shadekin/purple = 60, + /mob/living/simple_mob/shadekin/red = 40, + /mob/living/simple_mob/shadekin/yellow = 1 ), list( /mob/living/simple_mob/vore/aggressive/corrupthound, @@ -292,7 +292,21 @@ var/global/list/semirandom_mob_spawner_decisions = list() ), list(/mob/living/simple_mob/vore/solargrub), list(/mob/living/simple_mob/vore/woof), - list(/mob/living/simple_mob/vore/alienanimals/teppi) + list(/mob/living/simple_mob/vore/alienanimals/teppi), + list(/mob/living/simple_mob/vore/alienanimals/space_ghost), + list(/mob/living/simple_mob/vore/alienanimals/catslug), + list(/mob/living/simple_mob/vore/alienanimals/space_jellyfish), + list(/mob/living/simple_mob/vore/alienanimals/startreader), + list( + /mob/living/simple_mob/vore/bigdragon, + /mob/living/simple_mob/vore/bigdragon/friendly), + list( + /mob/living/simple_mob/vore/leopardmander = 50, + /mob/living/simple_mob/vore/leopardmander/blue = 10, + /mob/living/simple_mob/vore/leopardmander/exotic = 1 + ), + list(/mob/living/simple_mob/vore/sheep), + list(/mob/living/simple_mob/vore/weretiger) ) /obj/random/mob/semirandom_mob_spawner/item_to_spawn() @@ -359,11 +373,16 @@ var/global/list/semirandom_mob_spawner_decisions = list() list(/mob/living/simple_mob/animal/passive/opossum) = 10, list(/mob/living/simple_mob/animal/passive/pillbug) = 10, list(/mob/living/simple_mob/animal/passive/snake) = 10, + list(/mob/living/simple_mob/animal/passive/snake/red) = 10, + list(/mob/living/simple_mob/animal/passive/snake/python) = 10, list(/mob/living/simple_mob/animal/passive/tindalos) = 10, list(/mob/living/simple_mob/animal/passive/yithian) = 10, list( /mob/living/simple_mob/animal/wolf = 10, - /mob/living/simple_mob/animal/wolf/direwolf = 1 + /mob/living/simple_mob/animal/wolf/direwolf = 5, + /mob/living/simple_mob/vore/greatwolf = 1, + /mob/living/simple_mob/vore/greatwolf/black = 1, + /mob/living/simple_mob/vore/greatwolf/grey = 1 ) = 10, list(/mob/living/simple_mob/vore/rabbit) = 10, list(/mob/living/simple_mob/vore/redpanda) = 10, @@ -407,7 +426,18 @@ var/global/list/semirandom_mob_spawner_decisions = list() ) = 5, list(/mob/living/simple_mob/animal/sif/siffet) = 5, list(/mob/living/simple_mob/animal/sif/tymisian) = 5, - list(/mob/living/simple_mob/vore/alienanimals/teppi) = 10 + list(/mob/living/simple_mob/vore/alienanimals/teppi) = 10, + list(/mob/living/simple_mob/vore/alienanimals/dustjumper) = 5, + list(/mob/living/simple_mob/vore/alienanimals/space_jellyfish) = 5, + list(/mob/living/simple_mob/vore/alienanimals/space_ghost) = 5, + list( + /mob/living/simple_mob/vore/leopardmander = 50, + /mob/living/simple_mob/vore/leopardmander/blue = 10, + /mob/living/simple_mob/vore/leopardmander/exotic = 1 + ) = 5, + list(/mob/living/simple_mob/vore/sheep) = 5, + list(/mob/living/simple_mob/vore/weretiger) = 5, + list(/mob/living/simple_mob/vore/alienanimals/skeleton) = 5 ) /obj/random/mob/semirandom_mob_spawner/monster @@ -433,14 +463,17 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/animal/giant_spider/webslinger = 5 ) = 100, list( - /mob/living/simple_mob/shadekin/red/ai = 5, - /mob/living/simple_mob/shadekin/orange/ai = 1, - /mob/living/simple_mob/shadekin/purple/ai = 10 + /mob/living/simple_mob/shadekin/red = 5, + /mob/living/simple_mob/shadekin/orange = 1, + /mob/living/simple_mob/shadekin/purple = 10 ) = 1, list( /mob/living/simple_mob/animal/wolf = 10, - /mob/living/simple_mob/animal/wolf/direwolf = 1, - ) = 80, + /mob/living/simple_mob/animal/wolf/direwolf = 5, + /mob/living/simple_mob/vore/greatwolf = 1, + /mob/living/simple_mob/vore/greatwolf/black = 1, + /mob/living/simple_mob/vore/greatwolf/grey = 1 + ) = 40, list(/mob/living/simple_mob/creature/strong) = 40, list(/mob/living/simple_mob/faithless/strong) = 20, list(/mob/living/simple_mob/animal/goat) = 1, @@ -501,7 +534,18 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/vore/oregrub = 5, /mob/living/simple_mob/vore/oregrub/lava = 1 ) = 15, - list(/mob/living/simple_mob/vore/alienanimals/teppi) = 15 + list(/mob/living/simple_mob/vore/alienanimals/teppi) = 15, + list(/mob/living/simple_mob/vore/alienanimals/space_jellyfish) = 5, + list(/mob/living/simple_mob/vore/alienanimals/space_ghost) = 5, + list( + /mob/living/simple_mob/vore/leopardmander = 50, + /mob/living/simple_mob/vore/leopardmander/blue = 10, + /mob/living/simple_mob/vore/leopardmander/exotic = 1 + ) = 5, + list(/mob/living/simple_mob/vore/sheep) = 5, + list(/mob/living/simple_mob/vore/weretiger) = 5, + list(/mob/living/simple_mob/vore/alienanimals/skeleton) = 5, + list(/mob/living/simple_mob/vore/alienanimals/catslug) = 5 ) /obj/random/mob/semirandom_mob_spawner/humanoid @@ -512,9 +556,9 @@ var/global/list/semirandom_mob_spawner_decisions = list() possible_mob_types = list( list( - /mob/living/simple_mob/shadekin/blue/ai = 25, - /mob/living/simple_mob/shadekin/green/ai = 10, - /mob/living/simple_mob/shadekin/purple/ai = 1, + /mob/living/simple_mob/shadekin/blue = 25, + /mob/living/simple_mob/shadekin/green = 10, + /mob/living/simple_mob/shadekin/purple = 1, ) = 1, list(/mob/living/simple_mob/vore/catgirl) = 100, list(/mob/living/simple_mob/vore/wolfgirl) = 100, @@ -537,7 +581,7 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/vore/lamia/zebra/bra, /mob/living/simple_mob/vore/lamia/zebra/shirt ) = 100, -// LOOK OKAY MERCS ARE HUMANOIDS SO THEY ARE HERE, but they are also kind of bullshit so they probably shouldn't be able to spawn in the same place as catgirls. +// LOOK OKAY MERCS ARE HUMANOIDS SO THEY ARE HERE, but they are also kind of bullshit so they probably shouldn't be able to spawn in the same place as catgirls. // I want some better potentially hostile humanoids that aren't stupid to fight. If they become a big issue I'll comment them out. // For now they are just rare, and the ranged ones are way more rare than the melee ones, which I think will help balance them out. list( @@ -675,7 +719,12 @@ var/global/list/semirandom_mob_spawner_decisions = list() mob_faction = "vore" possible_mob_types = list( - list(/mob/living/simple_mob/animal/wolf/direwolf) = 100, + list( + /mob/living/simple_mob/animal/wolf/direwolf = 5, + /mob/living/simple_mob/vore/greatwolf = 1, + /mob/living/simple_mob/vore/greatwolf/black = 1, + /mob/living/simple_mob/vore/greatwolf/grey = 1 + ) = 100, list(/mob/living/simple_mob/animal/space/jelly) = 70, list( /mob/living/simple_mob/otie/feral, @@ -684,12 +733,12 @@ var/global/list/semirandom_mob_spawner_decisions = list() /mob/living/simple_mob/otie/red/chubby ) = 50, list( - /mob/living/simple_mob/shadekin/blue/ai = 100, - /mob/living/simple_mob/shadekin/green/ai = 50, - /mob/living/simple_mob/shadekin/orange/ai = 20, - /mob/living/simple_mob/shadekin/purple/ai = 60, - /mob/living/simple_mob/shadekin/red/ai = 40, - /mob/living/simple_mob/shadekin/yellow/ai = 1 + /mob/living/simple_mob/shadekin/blue = 100, + /mob/living/simple_mob/shadekin/green = 50, + /mob/living/simple_mob/shadekin/orange = 20, + /mob/living/simple_mob/shadekin/purple = 60, + /mob/living/simple_mob/shadekin/red = 40, + /mob/living/simple_mob/shadekin/yellow = 1 ) = 1, list( /mob/living/simple_mob/vore/aggressive/corrupthound, diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 811167bd22..02dd0426fb 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -87,7 +87,7 @@ // Works similarly to worn sprite_sheets, except the alternate sprites are used when the clothing/refit_for_species() proc is called. var/list/sprite_sheets_obj - var/toolspeed = 1.0 // This is a multipler on how 'fast' a tool works. e.g. setting this to 0.5 will make the tool work twice as fast. + var/toolspeed = 1 // This is a multipler on how 'fast' a tool works. e.g. setting this to 0.5 will make the tool work twice as fast. var/attackspeed = DEFAULT_ATTACK_COOLDOWN // How long click delay will be when using this, in 1/10ths of a second. Checked in the user's get_attack_speed(). var/reach = 1 // Length of tiles it can reach, 1 is adjacent. var/addblends // Icon overlay for ADD highlights when applicable. diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index ccde6e9c60..ca3f7241c3 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -6,6 +6,7 @@ icon = 'icons/obj/apc_repair.dmi' icon_state = "apc_frame" refund_amt = 2 + build_wall_only = TRUE matter = list(MAT_STEEL = 100, MAT_GLASS = 30) /obj/item/frame/apc/try_build(turf/on_wall, mob/user as mob) diff --git a/code/game/objects/items/devices/denecrotizer_vr.dm b/code/game/objects/items/devices/denecrotizer_vr.dm index 164e069398..4a6160b242 100644 --- a/code/game/objects/items/devices/denecrotizer_vr.dm +++ b/code/game/objects/items/devices/denecrotizer_vr.dm @@ -76,6 +76,10 @@ // Clean up the simplemob ghostjoin = FALSE ghostjoin_icon() + if(capture_caught) + to_chat(src, "You are bound to [revivedby], follow their commands within reason and to the best of your abilities, and avoid betraying or abandoning them. You are allied with [revivedby]. Do not attack anyone for no reason. Of course, you may do scenes as you like, but you must still respect preferences.") + visible_message("[src]'s eyes flicker with a curious intelligence.", runemessage = "looks around") + return if(revivedby != "no one") to_chat(src, "Where once your life had been rough and scary, you have been assisted by [revivedby]. They seem to be the reason you are on your feet again... so perhaps you should help them out. Being as you were revived, you are allied with the station. Do not attack anyone unless they are threatening the one who revived you. And try to listen to the one who revived you within reason. Of course, you may do scenes as you like, but you must still respect preferences.") visible_message("[src]'s eyes flicker with a curious intelligence.", runemessage = "looks around") @@ -95,6 +99,10 @@ to_chat(D, "Sorry, someone else has already inhabited [src].") return FALSE + if(capture_caught && !D.client.prefs.capture_crystal) + to_chat(D, "Sorry, [src] is participating in capture mechanics, and your preferences do not allow for that.") + return FALSE + // Insert whatever ban checks you want here if we ever add simplemob bans return TRUE diff --git a/code/game/objects/items/devices/translocator_vr.dm b/code/game/objects/items/devices/translocator_vr.dm index 5cf4f70038..02089da037 100644 --- a/code/game/objects/items/devices/translocator_vr.dm +++ b/code/game/objects/items/devices/translocator_vr.dm @@ -409,7 +409,7 @@ GLOBAL_LIST_BOILERPLATE(premade_tele_beacons, /obj/item/device/perfect_tele_beac if(confirm == "Eat it!") var/obj/belly/bellychoice = tgui_input_list(usr, "Which belly?","Select A Belly", L.vore_organs) if(bellychoice) - user.visible_message("[user] is trying to stuff \the [src] into [user.gender == MALE ? "his" : user.gender == FEMALE ? "her" : "their"] [bellychoice]!","You begin putting \the [src] into your [bellychoice]!") + user.visible_message("[user] is trying to stuff \the [src] into [user.gender == MALE ? "his" : user.gender == FEMALE ? "her" : "their"] [bellychoice.name]!","You begin putting \the [src] into your [bellychoice.name]!") if(do_after(user,5 SECONDS,src)) user.unEquip(src) forceMove(bellychoice) diff --git a/code/game/objects/items/paintkit.dm b/code/game/objects/items/paintkit.dm index 45430a41c9..f172326fce 100644 --- a/code/game/objects/items/paintkit.dm +++ b/code/game/objects/items/paintkit.dm @@ -259,6 +259,17 @@ new_desc = "A very retro APLU unit; didn't they retire these back in 2543?" new_icon = "ripley-old" allowed_types = list("ripley") + var/showpilot = TRUE + var/showpilot_lift = 5 + +/obj/item/device/kit/paint/ripley/customize(obj/mecha/M, mob/user) + if(showpilot) + M.show_pilot = TRUE + M.pilot_lift = 5 + else + M.show_pilot = FALSE + M.pilot_lift = 0 + . = ..() /obj/item/device/kit/paint/ripley/death name = "\"Reaper\" APLU customisation kit" @@ -266,18 +277,21 @@ new_desc = "A terrifying, grim power loader. Why do those clamps have spikes?" new_icon = "deathripley" allowed_types = list("ripley","firefighter") + showpilot = FALSE /obj/item/device/kit/paint/ripley/flames_red name = "\"Firestarter\" APLU customisation kit" new_name = "APLU \"Firestarter\"" new_desc = "A standard APLU exosuit with stylish orange flame decals." new_icon = "ripley_flames_red" + showpilot = FALSE /obj/item/device/kit/paint/ripley/flames_blue name = "\"Burning Chrome\" APLU customisation kit" new_name = "APLU \"Burning Chrome\"" new_desc = "A standard APLU exosuit with stylish blue flame decals." new_icon = "ripley_flames_blue" + showpilot = FALSE // Durand kits. /obj/item/device/kit/paint/durand diff --git a/code/game/objects/items/robot/robot_upgrades_vr.dm b/code/game/objects/items/robot/robot_upgrades_vr.dm index b31f737e78..215a936bda 100644 --- a/code/game/objects/items/robot/robot_upgrades_vr.dm +++ b/code/game/objects/items/robot/robot_upgrades_vr.dm @@ -8,6 +8,7 @@ R.add_language(LANGUAGE_ENOCHIAN, 1) R.add_language(LANGUAGE_SLAVIC, 1) R.add_language(LANGUAGE_DRUDAKAR, 1) + R.add_language(LANGUAGE_TAVAN, 1) return 1 else return 0 diff --git a/code/game/objects/items/toys/mech_toys.dm b/code/game/objects/items/toys/mech_toys.dm index a8dd875f30..3fdb9c6659 100644 --- a/code/game/objects/items/toys/mech_toys.dm +++ b/code/game/objects/items/toys/mech_toys.dm @@ -2,7 +2,7 @@ * Mech toys (previously labeled prizes, but that's unintuitive) * Mech toy combat */ - + // Mech battle special attack types. #define SPECIAL_ATTACK_HEAL 1 #define SPECIAL_ATTACK_DAMAGE 2 @@ -17,7 +17,7 @@ icon_state = "ripleytoy" drop_sound = 'sound/mecha/mechstep.ogg' reach = 2 // So you can battle across the table! - + // Mech Battle Vars var/timer = 0 // Timer when it'll be off cooldown var/cooldown = 1.5 SECONDS // Cooldown between play sessions (and interactions) @@ -34,7 +34,7 @@ var/special_attack_cooldown = 0 // Current cooldown of their special attack var/wins = 0 // This mech's win count in combat var/losses = 0 // ...And their loss count in combat - + /obj/item/toy/mecha/Initialize() . = ..() desc = "Mini-Mecha action figure! Collect them all! Attack your friends or another mech with one to initiate epic mech combat! [desc]." @@ -58,7 +58,7 @@ return 0 //not in range and not telekinetic /** - * this proc combines "sleep" while also checking for if the battle should continue + * this proc combines "sleep" while also checking for if the battle should continue * * this goes through some of the checks - the toys need to be next to each other to fight! * if it's player vs themself: They need to be able to "control" both mechs (either must be adjacent or using TK). @@ -112,7 +112,7 @@ // If all that is good, then we can sleep peacefully. sleep(delay) return TRUE - + //all credit to skasi for toy mech fun ideas /obj/item/toy/mecha/attack_self(mob/user) if(timer < world.time) @@ -130,15 +130,15 @@ attack_self(user) /** - * If you attack a mech with a mech, initiate combat between them + * If you attack a mech with a mech, initiate combat between them */ /obj/item/toy/mecha/attackby(obj/item/user_toy, mob/living/user) - if(istype(user_toy, /obj/item/toy/mecha)) + if(istype(user_toy, /obj/item/toy/mecha)) var/obj/item/toy/mecha/M = user_toy if(check_battle_start(user, M)) mecha_brawl(M, user) ..() - + /** * Attack is called from the user's toy, aimed at target(another human), checking for target's toy. */ @@ -241,9 +241,9 @@ sleep(1 SECONDS) //--THE BATTLE BEGINS-- - while(combat_health > 0 && attacker.combat_health > 0 && battle_length < MAX_BATTLE_LENGTH) + while(combat_health > 0 && attacker.combat_health > 0 && battle_length < MAX_BATTLE_LENGTH) if(!combat_sleep(0.5 SECONDS, attacker, attacker_controller, opponent)) //combat_sleep checks everything we need to have checked for combat to continue - break + break //before we do anything - deal with charged attacks if(special_attack_charged) @@ -269,7 +269,7 @@ attacker.special_attack_charged = TRUE attacker_controller.visible_message(" [attacker] begins charging its special attack!! ", \ " You begin charging [attacker]'s special attack! ") - else //just attack + else //just attack attacker.SpinAnimation(5, 0) playsound(attacker, 'sound/mecha/mechstep.ogg', 30, TRUE) combat_health-- @@ -322,7 +322,7 @@ special_attack_charged = TRUE src_controller.visible_message(" [src] begins charging its special attack!! ", \ " You begin charging [src]'s special attack! ") - else //just attack + else //just attack SpinAnimation(5, 0) playsound(src, 'sound/mecha/mechstep.ogg', 30, TRUE) attacker.combat_health-- @@ -333,12 +333,12 @@ attacker.combat_health-- playsound(attacker, 'sound/effects/meteorimpact.ogg', 20, TRUE) src_controller.visible_message(" ...and lands a CRIPPLING BLOW! ", \ - " ...and you land a CRIPPLING blow on [attacker]! ", null) + " ...and you land a CRIPPLING blow on [attacker]! ", null) else attacker_controller.visible_message(" [src] and [attacker] stand around awkwardly.", \ - " You don't know what to do next.") + " You don't know what to do next.") - battle_length++ + battle_length++ sleep(0.5 SECONDS) /// Lines chosen for the winning mech @@ -347,7 +347,7 @@ if(attacker.combat_health <= 0 && combat_health <= 0) //both lose playsound(src, 'sound/machines/warning-buzzer.ogg', 20, TRUE) attacker_controller.visible_message(" MUTUALLY ASSURED DESTRUCTION!! [src] and [attacker] both end up destroyed!", \ - " Both [src] and [attacker] are destroyed!") + " Both [src] and [attacker] are destroyed!") else if(attacker.combat_health <= 0) //src wins wins++ attacker.losses++ @@ -359,7 +359,7 @@ " You raise up [src] victoriously over [attacker]!") else if (combat_health <= 0) //attacker wins attacker.wins++ - losses++ + losses++ playsound(src, 'sound/effects/light_flicker.ogg', 20, TRUE) src_controller.visible_message(" [src] collapses!", \ " [src] collapses!", null) @@ -374,7 +374,7 @@ in_combat = FALSE attacker.in_combat = FALSE - combat_health = max_combat_health + combat_health = max_combat_health attacker.combat_health = attacker.max_combat_health return @@ -382,49 +382,49 @@ /** * This proc checks if a battle can be initiated between src and attacker. * - * Both SRC and attacker (if attacker is included) timers are checked if they're on cooldown, and + * Both SRC and attacker (if attacker is included) timers are checked if they're on cooldown, and * both SRC and attacker (if attacker is included) are checked if they are in combat already. * If any of the above are true, the proc returns FALSE and sends a message to user (and target, if included) otherwise, it returns TRUE * Arguments: * * user: the user who is initiating the battle - * * attacker: optional arg for checking two mechs at once + * * attacker: optional arg for checking two mechs at once * * target: optional arg used in Mech PvP battles (if used, attacker is target's toy) */ -/obj/item/toy/mecha/proc/check_battle_start(mob/living/carbon/user, obj/item/toy/mecha/attacker, mob/living/carbon/target) - var/datum/gender/T +/obj/item/toy/mecha/proc/check_battle_start(mob/living/carbon/user, obj/item/toy/mecha/attacker, mob/living/carbon/target) + var/datum/gender/T if(target) T = gender_datums[target.get_visible_gender()] // Doing this because Polaris Code has shitty gender datums and it's clunkier than FUCK. if(attacker && attacker.in_combat) to_chat(user, "[target ? T.His : "Your" ] [attacker.name] is in combat.") - if(target) + if(target) to_chat(target, "Your [attacker.name] is in combat.") - return FALSE + return FALSE if(in_combat) to_chat(user, "Your [name] is in combat.") - if(target) + if(target) to_chat(target, "[T.His] [name] is in combat.") - return FALSE + return FALSE if(attacker && attacker.timer > world.time) to_chat(user, "[target?T.His : "Your" ] [attacker.name] isn't ready for battle.") - if(target) + if(target) to_chat(target, "Your [attacker.name] isn't ready for battle.") - return FALSE + return FALSE if(timer > world.time) to_chat(user, "Your [name] isn't ready for battle.") - if(target) + if(target) to_chat(target, "[T.His] [name] isn't ready for battle.") - return FALSE + return FALSE return TRUE /** - * Processes any special attack moves that happen in the battle (called in the mechaBattle proc). + * Processes any special attack moves that happen in the battle (called in the mechaBattle proc). * * Makes the toy shout their special attack cry and updates its cooldown. Then, does the special attack. * Arguments: * * victim - the toy being hit by the special move */ -/obj/item/toy/mecha/proc/special_attack_move(obj/item/toy/mecha/victim) +/obj/item/toy/mecha/proc/special_attack_move(obj/item/toy/mecha/victim) visible_message(special_attack_cry + "!!") special_attack_charged = FALSE @@ -447,15 +447,15 @@ visible_message("I FORGOT MY SPECIAL ATTACK...") /** - * Base proc for 'other' special attack moves. + * Base proc for 'other' special attack moves. * - * This one is only for inheritance, each mech with an 'other' type move has their procs below. + * This one is only for inheritance, each mech with an 'other' type move has their procs below. * Arguments: * * victim - the toy being hit by the super special move (doesn't necessarily need to be used) */ -/obj/item/toy/mecha/proc/super_special_attack(obj/item/toy/mecha/victim) +/obj/item/toy/mecha/proc/super_special_attack(obj/item/toy/mecha/victim) visible_message(" [src] does a cool flip.") - + /obj/random/mech_toy name = "Random Mech Toy" desc = "This is a random mech toy." @@ -488,8 +488,8 @@ special_attack_type = SPECIAL_ATTACK_OTHER special_attack_type_message = "instantly destroys the opposing mech if its health is less than this mech's health." special_attack_cry = "KILLER CLAMP" - -/obj/item/toy/mecha/deathripley/super_special_attack(obj/item/toy/mecha/victim) + +/obj/item/toy/mecha/deathripley/super_special_attack(obj/item/toy/mecha/victim) playsound(src, 'sound/weapons/sonic_jackhammer.ogg', 20, TRUE) if(victim.combat_health < combat_health) // Instantly kills the other mech if it's health is below our's. visible_message("EXECUTE!!") @@ -522,7 +522,7 @@ special_attack_type_message = "puts the opposing mech's special move on cooldown and heals this mech." special_attack_cry = "MEGA HORN" -/obj/item/toy/mecha/honk/super_special_attack(obj/item/toy/mecha/victim) +/obj/item/toy/mecha/honk/super_special_attack(obj/item/toy/mecha/victim) playsound(src, 'sound/machines/honkbot_evil_laugh.ogg', 20, TRUE) victim.special_attack_cooldown += 3 // Adds cooldown to the other mech and gives a minor self heal combat_health++ @@ -577,7 +577,7 @@ special_attack_type_message = "has a lower cooldown than normal special moves, increases the opponent's cooldown, and deals damage." special_attack_cry = "*wave" -/obj/item/toy/mecha/reticence/super_special_attack(obj/item/toy/mecha/victim) +/obj/item/toy/mecha/reticence/super_special_attack(obj/item/toy/mecha/victim) special_attack_cooldown-- //Has a lower cooldown... victim.special_attack_cooldown++ //and increases the opponent's cooldown by 1... victim.combat_health-- //and some free damage. diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index e428ddfc54..0b1343d63e 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -3,8 +3,6 @@ * Balloons * Fake telebeacon * Fake singularity - * Toy gun - * Toy crossbow * Toy swords * Toy bosun's whistle * Snap pops @@ -145,127 +143,6 @@ icon = 'icons/obj/singularity.dmi' icon_state = "singularity_s1" -/* - * Toy crossbow - */ - -/obj/item/toy/crossbow - name = "foam dart crossbow" - desc = "A weapon favored by many overactive children. Ages 8 and up." - icon = 'icons/obj/gun.dmi' - icon_state = "crossbow" - item_icons = list( - icon_l_hand = 'icons/mob/items/lefthand_guns.dmi', - icon_r_hand = 'icons/mob/items/righthand_guns.dmi', - ) - slot_flags = SLOT_HOLSTER - w_class = ITEMSIZE_SMALL - attack_verb = list("attacked", "struck", "hit") - var/bullets = 5 - drop_sound = 'sound/items/drop/gun.ogg' - -/obj/item/toy/crossbow/examine(mob/user) - . = ..() - if(bullets && get_dist(user, src) <= 2) - . += "It is loaded with [bullets] foam darts!" - -/obj/item/toy/crossbow/attackby(obj/item/I as obj, mob/user as mob) - if(istype(I, /obj/item/toy/ammo/crossbow)) - if(bullets <= 4) - user.drop_item() - qdel(I) - bullets++ - to_chat(user, "You load the foam dart into the crossbow.") - else - to_chat(usr, "It's already fully loaded.") - - -/obj/item/toy/crossbow/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) - if(!isturf(target.loc) || target == user) return - if(flag) return - - if (locate (/obj/structure/table, src.loc)) - return - else if (bullets) - var/turf/trg = get_turf(target) - var/obj/effect/foam_dart_dummy/D = new/obj/effect/foam_dart_dummy(get_turf(src)) - bullets-- - D.icon_state = "foamdart" - D.name = "foam dart" - playsound(src, 'sound/items/syringeproj.ogg', 50, 1) - - for(var/i=0, i<6, i++) - if (D) - if(D.loc == trg) break - step_towards(D,trg) - - for(var/mob/living/M in D.loc) - if(!istype(M,/mob/living)) continue - if(M == user) continue - for(var/mob/O in viewers(world.view, D)) - O.show_message(text("\The [] was hit by the foam dart!", M), 1) - new /obj/item/toy/ammo/crossbow(M.loc) - qdel(D) - return - - for(var/atom/A in D.loc) - if(A == user) continue - if(A.density) - new /obj/item/toy/ammo/crossbow(A.loc) - qdel(D) - - sleep(1) - - spawn(10) - if(D) - new /obj/item/toy/ammo/crossbow(D.loc) - qdel(D) - - return - else if (bullets == 0) - user.Weaken(5) - for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\The [] realized they were out of ammo and starting scrounging for some!", user), 1) - - -/obj/item/toy/crossbow/attack(mob/M as mob, mob/user as mob) - src.add_fingerprint(user) - -// ******* Check - - if (src.bullets > 0 && M.lying) - - for(var/mob/O in viewers(M, null)) - if(O.client) - O.show_message(text("\The [] casually lines up a shot with []'s head and pulls the trigger!", user, M), 1, "You hear the sound of foam against skull", 2) - O.show_message(text("\The [] was hit in the head by the foam dart!", M), 1) - - playsound(src, 'sound/items/syringeproj.ogg', 50, 1) - new /obj/item/toy/ammo/crossbow(M.loc) - src.bullets-- - else if (M.lying && src.bullets == 0) - for(var/mob/O in viewers(M, null)) - if (O.client) O.show_message(text("\The [] casually lines up a shot with []'s head, pulls the trigger, then realizes they are out of ammo and drops to the floor in search of some!", user, M), 1, "You hear someone fall", 2) - user.Weaken(5) - return - -/obj/item/toy/ammo/crossbow - name = "foam dart" - desc = "It's nerf or nothing! Ages 8 and up." - icon = 'icons/obj/toy.dmi' - icon_state = "foamdart" - w_class = ITEMSIZE_TINY - slot_flags = SLOT_EARS - drop_sound = 'sound/items/drop/food.ogg' - -/obj/effect/foam_dart_dummy - name = "" - desc = "" - icon = 'icons/obj/toy.dmi' - icon_state = "null" - anchored = TRUE - density = FALSE - /* * Toy swords */ @@ -394,7 +271,6 @@ /* * Bosun's whistle */ - /obj/item/toy/bosunwhistle name = "bosun's whistle" desc = "A genuine Admiral Krush Bosun's Whistle, for the aspiring ship's captain! Suitable for ages 8 and up, do not swallow." @@ -945,7 +821,7 @@ else searching = FALSE - if(world.time - last_message <= 1 SECOND) + if(world.time - last_message <= 15 SECONDS) return if(user.a_intent == I_HELP) user.visible_message("\The [user] hugs [src]!","You hug [src]!") @@ -1526,7 +1402,7 @@ name = "black king" desc = "A black king chess piece." description_info = "The King can move exactly one square horizontally, vertically, or diagonally. If your opponent captures this piece, you lose." - icon_state = "black_king" + icon_state = "black_king" /// Balloon structures diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index 3884b0a17c..a13046dc63 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -1,9 +1,44 @@ +/* Virgo Toys! + * Contains: + * Mistletoe + * Plushies + * Pet rocks + * Chew toys + * Cat toys + * Fake flash + * Big red button + * Garden gnome + * Toy AI + * Hand buzzer + * Toy cuffs + * Toy nuke + * Toy gibber + * Toy xeno + * Russian revolver + * Trick revolver + * Toy chainsaw + * Random miniature spawner + * Snake popper + * Professor Who universal ID + * Professor Who sonic driver + * Action figures + */ + + +/* + * Mistletoe + */ /obj/item/toy/mistletoe name = "mistletoe" desc = "You are supposed to kiss someone under these" icon = 'icons/obj/toy_vr.dmi' icon_state = "mistletoe" +/* + * Plushies + */ +// HEY FUTURE PLUSHIE CODERS: IF YOU'RE ADDING A SNOWFLAKE PLUSH ITEM USE PATH /obj/item/toy/plushie/fluff +// the loadout entry shouldn't be able to grab those if everything goes right /obj/item/toy/plushie/lizardplushie name = "lizard plushie" desc = "An adorable stuffed toy that resembles a lizardperson." @@ -101,38 +136,6 @@ /obj/item/toy/plushie/vox/proc/cooldownreset() cooldown = 0 -/* -* 4/9/21 * -* IPC Plush -* Toaster plush -* Snake plush -* Cube plush -* Pip plush -* Moth plush -* Crab plush -* Possum plush -* Goose plush -* White mouse plush -* Pet rock -* Pet rock (m) -* Pet rock (f) -* Chew toys -* Cat toy * 2 -* Toy flash -* Toy button -* Gnome -* Toy AI -* Buzzer ring -* Fake handcuffs -* Nuke toy -* Toy gibber -* Toy xeno -* Fake gun * 2 -* Toy chainsaw -* Random tabletop miniature spawner -* snake popper -*/ - /obj/item/toy/plushie/ipc name = "IPC plushie" desc = "A pleasing soft-toy of a monitor-headed robot. Toaster functionality included." @@ -172,7 +175,6 @@ else return ..() - /obj/item/toy/plushie/ipc/attack_self(mob/user as mob) if(!cooldown) playsound(user, 'sound/machines/ping.ogg', 10, 0) @@ -274,7 +276,9 @@ /obj/item/toy/plushie/goose name = "goose plushie" - desc = "An adorable likeness of a terrifying beast. It's simple existance chills you to the bone and compells you to hide any loose objects it might steal." + desc = "An adorable likeness of a terrifying beast. \ + It's simple existance chills you to the bone and \ + compells you to hide any loose objects it might steal." icon = 'icons/obj/toy_vr.dmi' icon_state = "goose" attack_verb = list("honked") @@ -284,9 +288,54 @@ icon_state = "mouse" icon = 'icons/obj/toy_vr.dmi' +/obj/item/toy/plushie/susred + name = "red spaceman plushie" + desc = "A suspicious looking red spaceman plushie. Why does it smell like the vents?" + icon = 'icons/obj/toy_vr.dmi' + icon_state = "sus_red" + attack_verb = list("stabbed", "slashed") + +/obj/item/toy/plushie/ipc/toaster/attack_self(mob/user as mob) + if(!cooldown) + playsound(user, 'sound/weapons/slice.ogg', 10, 0) + src.visible_message("Stab!") + cooldown = 1 + addtimer(CALLBACK(src, .proc/cooldownreset), 50) + return ..() + +/obj/item/toy/plushie/susblue + name = "blue spaceman plushie" + desc = "A dapper looking blue spaceman plushie. Looks very intuitive." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "sus_blue" + +/obj/item/toy/plushie/suswhite + name = "white spaceman plushie" + desc = "A whiny looking white spaceman plushie. Looks like it could cry at any moment." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "sus_white" + +/obj/item/toy/plushie/bigcat + name = "big cat plushie" + desc = "A big, fluffy looking cat that just looks very huggable." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "big_cat" + +/obj/item/toy/plushie/basset + name = "basset plushie" + desc = "A sleepy looking basset hound plushie." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "basset" + +/* + * Pet rocks + */ /obj/item/toy/rock name = "pet rock" - desc = "A stuffed version of the classic pet. The soft ones were made after kids kept throwing them at each other. It has a small piece of soft plastic that you can draw on if you wanted." + desc = "A stuffed version of the classic pet. \ + The soft ones were made after kids kept throwing \ + them at each other. It has a small piece of soft \ + plastic that you can draw on if you wanted." icon = 'icons/obj/toy_vr.dmi' icon_state = "rock" attack_verb = list("grug'd", "unga'd") @@ -307,6 +356,9 @@ to_chat(user, "You draw a face on the rock and pull aside the plastic slightly, revealing a small pink bow.") return +/* + * Chew toys + */ /obj/item/toy/chewtoy name = "chew toy" desc = "A red hard-rubber chew toy shaped like a bone. Perfect for your dog! You wouldn't want to chew on it, right?" @@ -330,6 +382,9 @@ playsound(loc, 'sound/items/drop/plushie.ogg', 50, 1) user.visible_message("\The [user] gnaws on [src]!","You gnaw on [src]!") +/* + * Cat toys + */ /obj/item/toy/cat_toy name = "toy mouse" desc = "A colorful toy mouse!" @@ -349,6 +404,9 @@ slot_r_hand_str = 'icons/mob/items/righthand_material.dmi', ) +/* + * Fake flash + */ /obj/item/toy/flash name = "toy flash" desc = "FOR THE REVOLU- Oh wait, that's just a toy." @@ -374,6 +432,9 @@ /obj/item/toy/flash/proc/cooldownreset() cooldown = 0 +/* + * Big red button + */ /obj/item/toy/redbutton name = "big red button" desc = "A big, plastic red button. Reads 'From HonkCo Pranks?' on the back." @@ -394,12 +455,18 @@ else to_chat(user, "Nothing happens.") +/* + * Garden gnome + */ /obj/item/toy/gnome name = "garden gnome" desc = "It's a gnome, not a gnelf. Made of weak ceramic." icon = 'icons/obj/toy_vr.dmi' icon_state = "gnome" +/* + * Toy AI + */ /obj/item/toy/AI name = "toy AI" desc = "A little toy model AI core with real law announcing action!" @@ -434,6 +501,9 @@ /obj/item/toy/AI/proc/cooldownreset() cooldown = 0 +/* + * Hand buzzer + */ /obj/item/clothing/gloves/ring/buzzer/toy name = "steel ring" desc = "Torus shaped finger decoration. It has a small piece of metal on the palm-side." @@ -460,6 +530,9 @@ return 0 +/* + * Toy cuffs + */ /obj/item/weapon/handcuffs/fake name = "plastic handcuffs" desc = "Use this to keep plastic prisoners in line." @@ -484,6 +557,9 @@ foldable = null can_hold = list(/obj/item/weapon/handcuffs/fake, /obj/item/weapon/handcuffs/legcuffs/fake) +/* + * Toy nuke + */ /obj/item/toy/nuke name = "\improper Nuclear Fission Explosive toy" desc = "A plastic model of a Nuclear Fission Explosive." @@ -510,6 +586,9 @@ if(istype(I, /obj/item/weapon/disk/nuclear)) to_chat(user, "Nice try. Put that disk back where it belongs.") +/* + * Toy gibber + */ /obj/item/toy/minigibber name = "miniature gibber" desc = "A miniature recreation of NanoTrasen's famous meat grinder. Equipped with a special interlock that prevents insertion of organic material." @@ -547,6 +626,9 @@ else ..() +/* + * Toy xeno + */ /obj/item/toy/toy_xeno icon = 'icons/obj/toy_vr.dmi' icon_state = "xeno" @@ -571,6 +653,9 @@ to_chat(user, "The string on [src] hasn't rewound all the way!") return +/* + * Russian revolver + */ /obj/item/toy/russian_revolver name = "russian revolver" desc = "For fun and games!" @@ -641,6 +726,9 @@ to_chat(user, "[src] needs to be reloaded.") return FALSE +/* + * Trick revolver + */ /obj/item/toy/russian_revolver/trick_revolver name = "\improper .357 revolver" desc = "A suspicious revolver. Uses .357 ammo." @@ -668,6 +756,9 @@ sleep(5) icon_state = "[initial(icon_state)]" +/* + * Toy chainsaw + */ /obj/item/toy/chainsaw name = "Toy Chainsaw" desc = "A toy chainsaw with a rubber edge. Ages 8 and up" @@ -690,6 +781,9 @@ /obj/item/toy/chainsaw/proc/cooldownreset() cooldown = 0 +/* + * Random miniature spawner + */ /obj/random/miniature name = "Random miniature" desc = "This is a random miniature." @@ -699,6 +793,9 @@ /obj/random/miniature/item_to_spawn() return pick(typesof(/obj/item/toy/character)) +/* + * Snake popper + */ /obj/item/toy/snake_popper name = "bread tube" desc = "Bread in a tube. Chewy...and surprisingly tasty." @@ -775,3 +872,93 @@ real = 2 to_chat(user, "You short out the bluespace refill system of [src].") +/* + * Professor Who universal ID + */ +/obj/item/clothing/under/universalid + name = "identification card" + desc = "A novelty identification card based on Professor Who's Universal ID." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "universal_id" + w_class = ITEMSIZE_TINY + slot_flags = SLOT_ID | SLOT_EARS + body_parts_covered = 0 + equip_sound = null + + sprite_sheets = null + + item_state = "golem" //This is dumb and hacky but was here when I got here. + worn_state = "golem" //It's basically just a coincidentally black iconstate in the file. + +/* + * Professor Who sonic driver + */ +/obj/item/weapon/tool/screwdriver/sdriver + name = "sonic driver" + desc = "A novelty screwdriver that uses tiny magnets to manipulate screws." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "sonic_driver" + item_state = "screwdriver_black" + usesound = 'sound/items/sonic_driver.ogg' + toolspeed = 1 + random_color = FALSE + +/* + * Professor Who time capsule + */ +/obj/item/weapon/storage/box/timecap + name = "action time capsule" + desc = "A toy recreation of the Time Capsule from Professor Who. Can hold up to two action figures." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "time_cap" + can_hold = list(/obj/item/toy/figure) + max_w_class = ITEMSIZE_TINY + max_storage_space = ITEMSIZE_COST_TINY * 2 + use_sound = 'sound/machines/click.ogg' + drop_sound = 'sound/items/drop/accessory.ogg' + pickup_sound = 'sound/items/pickup/accessory.ogg' + +/* + * Action figures + */ +/obj/item/toy/figure/ranger + name = "Space Ranger action figure" + desc = "A \"Space Life\" brand Space Ranger action figure." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "ranger" + toysay = "To the Fontier and beyond!" + +/obj/item/toy/figure/leadbandit + name = "Bandit Leader action figure" + desc = "A \"Space Life\" brand Bandit Leader action figure." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "bandit_lead" + toysay = "Give us yer bluespace crystals!" + +/obj/item/toy/figure/bandit + name = "Bandit action figure" + desc = "A \"Space Life\" brand Bandit action figure." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "bandit" + toysay = "Stick em' up!" + +/obj/item/toy/figure/abe + name = "Action Abe action figure" + desc = "A \"Space Life\" brand Action Abe action figure." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "action_abe" + toysay = "Four score and seven decades ago..." + +/obj/item/toy/figure/profwho + name = "Professor Who action figure" + desc = "A \"Space Life\" brand Professor Who action figure." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "prof_who" + toysay = "Smells like... bad wolf..." + +/obj/item/toy/figure/prisoner + name = "prisoner action figure" + desc = "A \"Space Life\" brand prisoner action figure." + icon = 'icons/obj/toy_vr.dmi' + icon_state = "prisoner" + toysay = "I did not hit her! I did not!" diff --git a/code/game/objects/items/weapons/RPD_vr.dm b/code/game/objects/items/weapons/RPD_vr.dm index 3c9a79f43e..8affac0c7f 100644 --- a/code/game/objects/items/weapons/RPD_vr.dm +++ b/code/game/objects/items/weapons/RPD_vr.dm @@ -16,7 +16,7 @@ item_icons = list( slot_l_hand_str = 'icons/mob/items/lefthand_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_vr.dmi', - ) + ) flags = NOBLUDGEON force = 10 throwforce = 10 @@ -184,9 +184,9 @@ activate() animate_deletion(A) return - + if((mode & PAINT_MODE)) //Paint pipes - if(istype(A, /obj/machinery/atmospherics/pipe)) + if(!istype(A, /obj/machinery/atmospherics/pipe/simple/heat_exchanging) && istype(A, /obj/machinery/atmospherics/pipe)) var/obj/machinery/atmospherics/pipe/P = A playsound(src, 'sound/machines/click.ogg', 50, 1) P.change_color(pipe_colors[paint_color]) diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm new file mode 100644 index 0000000000..d9c4d79a3d --- /dev/null +++ b/code/game/objects/items/weapons/capture_crystal.dm @@ -0,0 +1,845 @@ +/obj/item/capture_crystal + name = "curious crystal" + desc = "A silent, unassuming crystal in what appears to be some kind of steel housing." + icon = 'icons/obj/capture_crystal_vr.dmi' + icon_state = "inactive" + drop_sound = 'sound/items/drop/ring.ogg' + pickup_sound = 'sound/items/pickup/ring.ogg' + throwforce = 0 + force = 0 + action_button_name = "Command" + + var/active = FALSE //Is it set up? + var/mob/living/owner //Reference to the owner + var/mob/living/bound_mob //Reference to our bound mob + var/spawn_mob_type //The kind of mob an inactive crystal will try to spawn when activated + var/activate_cooldown = 30 SECONDS //How long do we wait between unleashing and recalling + var/last_activate //Automatically set by things that try to move the bound mob or capture things + var/empty_icon = "empty" + var/full_icon = "full" + var/capture_chance_modifier = 1 //So we can have special subtypes with different capture rates! + +/obj/item/capture_crystal/Initialize() + . = ..() + update_icon() + +//Let's make sure we clean up our references and things if the crystal goes away (such as when it's digested) +/obj/item/capture_crystal/Destroy() + if(bound_mob) + if(bound_mob in contents) + unleash() + to_chat(bound_mob, "You feel like yourself again. You are no longer under the influence of \the [src]'s command.") + UnregisterSignal(bound_mob, COMSIG_PARENT_QDELETING) + bound_mob.capture_caught = FALSE + bound_mob = null + if(owner) + UnregisterSignal(owner, COMSIG_PARENT_QDELETING) + owner = null + return ..() + +/obj/item/capture_crystal/examine(user) + . = ..() + if(user == owner && bound_mob) + . += "[bound_mob]'s crystal" + if(isanimal(bound_mob)) + . += "[bound_mob.health / bound_mob.maxHealth * 100]%" + if(bound_mob.ooc_notes) + . += "OOC Notes: \[View\]" + . += "\[Mechanical Vore Preferences\]" + +//Command! This lets the owner toggle hostile on AI controlled mobs, or send a silent command message to your bound mob, wherever they may be. +/obj/item/capture_crystal/ui_action_click() + if(!ismob(loc)) + return + var/mob/living/M = src.loc + if(M != owner) + to_chat(M, "\The [src] emits an unpleasant tone... It does not respond to your command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(!bound_mob) + to_chat(M, "\The [src] emits an unpleasant tone... There is nothing to command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(isanimal(bound_mob) && !bound_mob.client) + if(!isnull(bound_mob.get_AI_stance())) + var/datum/ai_holder/AI = bound_mob.ai_holder + AI.hostile = !AI.hostile + if(!AI.hostile) + AI.set_stance(STANCE_IDLE) + to_chat(M, span("notice", "\The [bound_mob] is now [AI.hostile ? "hostile" : "passive"].")) + log_admin("[key_name_admin(M)] set [bound_mob] to [AI.hostile].") + else if(bound_mob.client) + var/transmit_msg = tgui_input_text(usr, "What is your command?", "Command") + if(length(transmit_msg) >= MAX_MESSAGE_LEN) + to_chat(M, "Your message was TOO LONG!:[transmit_msg]") + return + transmit_msg = sanitize(transmit_msg, max_length = MAX_MESSAGE_LEN) + if(isnull(transmit_msg)) + to_chat(M, "You decided against it.") + return + to_chat(bound_mob, "\The [owner] commands, '[transmit_msg]'") + to_chat(M, "Your command has been transmitted, '[transmit_msg]'") + log_admin("[key_name_admin(M)] sent the command, '[transmit_msg]' to [bound_mob].") + else + to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is unresponsive.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + +//Lets the owner get AI controlled bound mobs to follow them, or tells player controlled mobs to follow them. +/obj/item/capture_crystal/verb/follow_owner() + set name = "Toggle Follow" + set category = "Object" + set src in usr + if(!ismob(loc)) + return + var/mob/living/M = src.loc + if(M != owner) + to_chat(M, "\The [src] emits an unpleasant tone... It does not respond to your command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(bound_mob.stat != CONSCIOUS) + to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is not able to hear your command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(bound_mob.client) + to_chat(bound_mob, "\The [owner] wishes for you to follow them.") + else if(bound_mob in contents) + if(!bound_mob.ai_holder) + to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is not able to follow your command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + return + var/datum/ai_holder/AI = bound_mob.ai_holder + if(AI.leader) + to_chat(M, "\The [src] chimes~ \The [bound_mob] stopped following [AI.leader].") + AI.lose_follow(AI.leader) + else + AI.set_follow(M) + to_chat(M, "\The [src] chimes~ \The [bound_mob] started following following [AI.leader].") + else if(!(bound_mob in view(M))) + to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is not able to hear your command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + if(!bound_mob.ai_holder) + to_chat(M, "\The [src] emits an unpleasant tone... \The [bound_mob] is not able to follow your command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + return + var/datum/ai_holder/AI = bound_mob.ai_holder + if(AI.leader) + to_chat(M, "\The [src] chimes~ \The [bound_mob] stopped following [AI.leader].") + AI.lose_follow(AI.leader) + else + AI.set_follow(M) + to_chat(M, "\The [src] chimes~ \The [bound_mob] started following following [AI.leader].") + +//Don't really want people 'haha funny' capturing and releasing one another willy nilly. So! If you wanna release someone, you gotta destroy the thingy. +//(Which is consistent with how it works with digestion anyway.) +/obj/item/capture_crystal/verb/destroy_crystal() + set name = "Destroy Crystal" + set category = "Object" + set src in usr + if(!ismob(loc)) + return + var/mob/living/M = src.loc + if(M != owner) + to_chat(M, "\The [src] is too hard for you to break.") + else + M.visible_message("\The [M] crushes \the [src] into dust...", "\The [src] cracks and disintegrates in your hand.") + qdel(src) + +//If you catch something/someone and want to give it to someone else though, that's fine. +/obj/item/capture_crystal/verb/release_ownership() + set name = "Release Ownership" + set category = "Object" + set src in usr + if(!ismob(loc)) + return + var/mob/living/M = src.loc + if(M != owner) + to_chat(M, "\The [src] emits an unpleasant tone... It does not respond to your command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else + M.visible_message("\The [src] flickers in \the [M]'s hand and emits a little tone.", "\The [src] flickers in your hand and emits a little tone.") + playsound(src, 'sound/effects/capture-crystal-out.ogg', 75, 1, -1) + UnregisterSignal(owner, COMSIG_PARENT_QDELETING) + owner = null + +//Let's make inviting ghosts be an option you can do instead of an automatic thing! +/obj/item/capture_crystal/verb/invite_ghost() + set name = "Enhance (Toggle Ghost Join)" + set category = "Object" + set src in usr + if(!ismob(loc)) + return + var/mob/living/U = src.loc + if(!bound_mob) + to_chat(U, "\The [src] emits an unpleasant tone... There is nothing to enhance.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + return + else if(U != owner) + to_chat(U, "\The [src] emits an unpleasant tone... It does not respond to your command.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + return + else if(bound_mob.client || !isanimal(bound_mob)) + to_chat(U, "\The [src] emits an unpleasant tone... \The [bound_mob] is not eligable for enhancement.") + playsound(src, 'sound/effects/capture-crystal-problem.ogg', 75, 1, -1) + return //Need to type cast the mob so it can detect ghostjoin + var/mob/living/simple_mob/M = bound_mob + if(M.ghostjoin) + M.ghostjoin = FALSE + to_chat(U, "\The [bound_mob] is no longer eligable to be joined by ghosts.") + else if(tgui_alert(U, "Do you want to offer your [bound_mob] up to ghosts to play as? There is no way undo this once a ghost takes over.", "Invite ghosts?",list("No","Yes")) == "Yes") + M.ghostjoin = TRUE + to_chat(U, "\The [bound_mob] is now eligable to be joined by ghosts. It will need to be out of the crystal to be able to be joined.") + else + to_chat(U, "You decided against it.") + +/obj/item/capture_crystal/update_icon() + . = ..() + if(spawn_mob_type) + icon_state = full_icon + else if(!bound_mob) + icon_state = "inactive" + else if(bound_mob in contents) + icon_state = full_icon + else + icon_state = empty_icon + if(!cooldown_check()) + icon_state = "[icon_state]-busy" + spawn(activate_cooldown) //If it's busy then we want to wait a bit to fix the sprite after the cooldown is done. + update_icon() + +/obj/item/capture_crystal/proc/cooldown_check() + if(world.time < last_activate + activate_cooldown) + return FALSE + else return TRUE + +/obj/item/capture_crystal/attack(mob/living/M, mob/living/user) + if(bound_mob) + if(!bound_mob.devourable) //Don't eat if prefs are bad + return + if(user.zone_sel.selecting == "mouth") //Click while targetting the mouth and you eat/feed the stored mob to whoever you clicked on + if(bound_mob in contents) + user.visible_message("\The [user] moves \the [src] to [M]'s [M.vore_selected]...") + M.perform_the_nom(M, bound_mob, M, M.vore_selected) + else if(M == user) //You don't have a mob, you ponder the orb instead of trying to capture yourself + user.visible_message("\The [user] ponders \the [src]...", "You ponder \the [src]...") + else if (cooldown_check()) //Try to capture someone without throwing + user.visible_message("\The [user] taps \the [M] with \the [src].") + activate(user, M) + else + to_chat(user, "\The [src] emits an unpleasant tone... It is not ready yet.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + +//Tries to unleash or recall your stored mob +/obj/item/capture_crystal/attack_self(mob/living/user) + if(!cooldown_check()) + to_chat(user, "\The [src] emits an unpleasant tone... It is not ready yet.") + if(bound_mob) + playsound(src, 'sound/effects/capture-crystal-problem.ogg', 75, 1, -1) + else + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(user == bound_mob) //You can't recall yourself + to_chat(user, "\The [src] emits an unpleasant tone... It does not activate for you.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(!active) + activate(user) + else + determine_action(user) + +//Make it so the crystal knows if its mob references get deleted to make sure things get cleaned up +/obj/item/capture_crystal/proc/knowyoursignals(mob/living/M, mob/living/U) + RegisterSignal(M, COMSIG_PARENT_QDELETING, .proc/mob_was_deleted, TRUE) + RegisterSignal(U, COMSIG_PARENT_QDELETING, .proc/owner_was_deleted, TRUE) + +//The basic capture command does most of the registration work. +/obj/item/capture_crystal/proc/capture(mob/living/M, mob/living/U) + if(!M.capture_crystal || M.capture_caught) + to_chat(U, "This creature is not suitable for capture.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + return + knowyoursignals(M, U) + owner = U + if(isanimal(M)) + var/mob/living/simple_mob/S = M + S.revivedby = U.name + if(!bound_mob) + bound_mob = M + bound_mob.capture_caught = TRUE + persist_storable = FALSE + desc = "A glowing crystal in what appears to be some kind of steel housing." + +//Determines the capture chance! So you can't capture AI mobs if they're perfectly healthy and all that +/obj/item/capture_crystal/proc/capture_chance(mob/living/M, user) + if(capture_chance_modifier >= 100) //Master crystal always work + return 100 + var/capture_chance = ((1 - (M.health / M.maxHealth)) * 100) //Inverted health percent! 100% = 0% + //So I don't know how this works but here's a kind of explanation + //Basic chance + ((Mob's max health - minimum calculated health) / (Max allowed health - Min allowed health)*(Chance at Max allowed health - Chance at minimum allowed health) + capture_chance += 35 + ((M.maxHealth - 5)/ (1000-5)*(-100 - 35)) + //Basically! Mobs over 1000 max health will be unable to be caught without using status effects. + //Thanks Aronai! + var/effect_count = 0 //This will give you a smol chance to capture if you have applied status effects, even if the chance would ordinarily be <0 + if(M.stat == UNCONSCIOUS) + capture_chance += 0.1 + effect_count += 1 + else if(M.stat == CONSCIOUS) + capture_chance *= 0.9 + else + capture_chance = 0 + if(M.weakened) //Haha you fall down + capture_chance += 0.1 + effect_count += 1 + if(M.stunned) //What's the matter??? + capture_chance += 0.1 + effect_count += 1 + if(M.on_fire) //AAAAAAAA + capture_chance += 0.1 + effect_count += 1 + if(M.paralysis) //Oh noooo + capture_chance += 0.1 + effect_count += 1 + if(M.ai_holder.stance == STANCE_IDLE) //SNEAK ATTACK??? + capture_chance += 0.1 + effect_count += 1 + + capture_chance *= capture_chance_modifier + + if(capture_chance <= 0) + capture_chance = 0 + effect_count + if(capture_chance <= 0) + capture_chance = 0 + to_chat(user, "There's no chance... It needs to be weaker.") + + last_activate = world.time + log_admin("[user] threw a capture crystal at [M] and got [capture_chance]% chance to catch.") + return capture_chance + +//Handles checking relevent bans, preferences, and asking the player if they want to be caught +/obj/item/capture_crystal/proc/capture_player(mob/living/M, mob/living/U) + if(jobban_isbanned(M, "GhostRoles")) + to_chat(U, "This creature is not suitable for capture.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(!M.capture_crystal || M.capture_caught) + to_chat(U, "This creature is not suitable for capture.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(tgui_alert(M, "Would you like to be caught by in [src] by [U]? You will be bound to their will.", "Become Caught",list("No","Yes")) == "Yes") + if(tgui_alert(M, "Are you really sure? The only way to undo this is to OOC escape while you're in the crystal.", "Become Caught", list("No","Yes")) == "Yes") + log_admin("[key_name(M)] has agreed to become caught by [key_name(U)].") + capture(M, U) + recall(U) + return + to_chat(U, "This creature is too strong willed to be captured.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + +//The clean up procs! +/obj/item/capture_crystal/proc/mob_was_deleted() + UnregisterSignal(bound_mob, COMSIG_PARENT_QDELETING) + UnregisterSignal(owner, COMSIG_PARENT_QDELETING) + bound_mob.capture_caught = FALSE + bound_mob = null + owner = null + active = FALSE + persist_storable = TRUE + update_icon() + +/obj/item/capture_crystal/proc/owner_was_deleted() + UnregisterSignal(owner, COMSIG_PARENT_QDELETING) + owner = null + active = FALSE + update_icon() + +//If the crystal hasn't been set up, it does this +/obj/item/capture_crystal/proc/activate(mob/living/user, target) + if(!cooldown_check()) //Are we ready to do things yet? + to_chat(thrower, "\The [src] clicks unsatisfyingly... It is not ready yet.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + return + if(spawn_mob_type && !bound_mob) //We don't already have a mob, but we know what kind of mob we want + bound_mob = new spawn_mob_type(src) //Well let's spawn it then! + bound_mob.faction = user.faction + spawn_mob_type = null + capture(bound_mob, user) + if(bound_mob) //We have a mob! Let's finish setting up. + user.visible_message("\The [src] clicks, and then emits a small chime.", "\The [src] grows warm in your hand, something inside is awake.") + active = TRUE + if(!owner) //Do we have an owner? It's pretty unlikely that this would ever happen! But it happens, let's claim the crystal. + owner = user + if(isanimal(bound_mob)) + var/mob/living/simple_mob/S = bound_mob + S.revivedby = user.name + determine_action(user, target) + return + else if(isliving(target)) //So we don't have a mob, let's try to claim one! Is the target a mob? + var/mob/living/M = target + last_activate = world.time + if(M.capture_caught) //Can't capture things that were already caught. + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + to_chat(user, "\The [src] clicks unsatisfyingly... \The [M] is already under someone else's control.") + return + else if(M.stat == DEAD) //Is it dead? We can't influence dead things. + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + to_chat(user, "\The [src] clicks unsatisfyingly... \The [M] is not in a state to be captured.") + return + else if(M.client) //Is it player controlled? + capture_player(M, user) //We have to do things a little differently if so. + return + else if(!isanimal(M)) //So it's not player controlled, but it's also not a simplemob? + to_chat(user, "This creature is not suitable for capture.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + return + var/mob/living/simple_mob/S = M + if(!S.ai_holder) //We don't really want to capture simplemobs that don't have an AI + to_chat(user, "This creature is not suitable for capture.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(prob(capture_chance(S, user))) //OKAY! So we have an NPC simplemob with an AI, let's calculate its capture chance! It varies based on the mob's condition. + capture(S, user) //We did it! Woo! We capture it! + user.visible_message("\The [src] clicks, and then emits a small chime.", "Alright! \The [S] was caught!") + recall(user) + active = TRUE + else //Shoot, it didn't work and now it's mad!!! + S.ai_holder.go_wake() + S.ai_holder.target = user + S.ai_holder.track_target_position() + S.ai_holder.set_stance(STANCE_FIGHT) + user.visible_message("\The [src] bonks into \the [S], angering it!") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + to_chat(user, "\The [src] clicks unsatisfyingly.") + update_icon() + return + //The target is not a mob, so let's not do anything. + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + to_chat(user, "\The [src] clicks unsatisfyingly.") + +//We're using the crystal, but what will it do? +/obj/item/capture_crystal/proc/determine_action(mob/living/U, T) + if(!cooldown_check()) //Are we ready yet? + to_chat(thrower, "\The [src] clicks unsatisfyingly... It is not ready yet.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + return //No + if(bound_mob in contents) //Do we have our mob? + if(T) + unleash(U, T) //Yes, let's let it out! + else + unleash(U) + else if (bound_mob) //Do we HAVE a mob? + recall(U) //Yes, let's try to put it back in the crystal + else //No we don't have a mob, let's reset the crystal. + to_chat(U, "\The [src] clicks unsatisfyingly.") + active = FALSE + update_icon() + owner = null + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + +//Let's try to call our mob back! +/obj/item/capture_crystal/proc/recall(mob/living/user) + if(bound_mob in view(user)) //We can only recall it if we can see it + var/turf/turfmemory = get_turf(bound_mob) + if(isanimal(bound_mob)) + var/mob/living/simple_mob/M = bound_mob + M.ai_holder.go_sleep() //AI doesn't need to think when it's in the crystal + bound_mob.forceMove(src) + last_activate = world.time + bound_mob.visible_message("\The [user]'s [src] flashes, disappearing [bound_mob] in an instant!!!", "\The [src] pulls you back into confinement in a flash of light!!!") + animate_action(turfmemory) + playsound(src, 'sound/effects/capture-crystal-in.ogg', 75, 1, -1) + update_icon() + else + to_chat(user, "\The [src] clicks and emits a small, unpleasant tone. \The [bound_mob] cannot be recalled.") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + +//Let's let our mob out! +/obj/item/capture_crystal/proc/unleash(mob/living/user, atom/target) + if(!user && !target) //We got thrown but we're not sure who did it, let's go to where the crystal is + bound_mob.forceMove(src.drop_location()) + return + if(!target) //We know who wants to let us out, but they didn't say where, so let's drop us on them + bound_mob.forceMove(user.drop_location()) + else //We got thrown! Let's go where we got thrown + bound_mob.forceMove(target.drop_location()) + last_activate = world.time + if(isanimal(bound_mob)) + var/mob/living/simple_mob/M = bound_mob + M.ai_holder.go_wake() //Okay it's time to do work, let's wake up! + bound_mob.faction = owner.faction //Let's make sure we aren't hostile to our owner or their friends + bound_mob.visible_message("\The [user]'s [src] flashes, \the [bound_mob] appears in an instant!!!", "The world around you rematerialize as you are unleashed from the [src] next to \the [user]. You feel a strong compulsion to enact \the [owner]'s will.") + animate_action(get_turf(bound_mob)) + playsound(src, 'sound/effects/capture-crystal-out.ogg', 75, 1, -1) + update_icon() + +//Let's make a flashy sparkle when someone appears or disappears! +/obj/item/capture_crystal/proc/animate_action(atom/thing) + var/image/coolanimation = image('icons/obj/capture_crystal_vr.dmi', null, "animation") + coolanimation.plane = PLANE_LIGHTING_ABOVE + thing.overlays += coolanimation + sleep(11) + thing.overlays -= coolanimation + +//IF the crystal somehow ends up in a tummy and digesting with a bound mob who doesn't want to be eaten, let's move them to the ground +/obj/item/capture_crystal/digest_act(var/atom/movable/item_storage = null) + if(bound_mob in contents && !bound_mob.devourable) + bound_mob.forceMove(src.drop_location()) + return ..() + +//We got thrown! Let's figure out what to do +/obj/item/capture_crystal/throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, datum/callback/callback) + . = ..() + if(target == bound_mob && thrower != bound_mob) //We got thrown at our bound mob (and weren't thrown by the bound mob) let's ignore the cooldown and just put them back in + recall(thrower) + else if(!cooldown_check()) //OTHERWISE let's obey the cooldown + to_chat(thrower, "\The [src] emits an soft tone... It is not ready yet.") + if(bound_mob) + playsound(src, 'sound/effects/capture-crystal-problem.ogg', 75, 1, -1) + else + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(!active) //The ball isn't set up, let's try to set it up. + if(isliving(target)) //We're hitting a mob, let's try to capture it. + sleep(10) + activate(thrower, target) + return + sleep(10) + activate(thrower, src) + else if(!bound_mob) //We hit something else, and we don't have a mob, so we can't really do anything! + to_chat(thrower, "\The [src] clicks unpleasantly...") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + else if(bound_mob in contents) //We have our mob! Let's try to let it out. + sleep(10) + unleash(thrower, src) + update_icon() + else //Our mob isn't here, we can't do anything. + to_chat(thrower, "\The [src] clicks unpleasantly...") + playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1) + +/obj/item/capture_crystal/great + capture_chance_modifier = 1.5 + +/obj/item/capture_crystal/ultra + capture_chance_modifier = 2 + +/obj/item/capture_crystal/master + capture_chance_modifier = 100 + +/obj/item/capture_crystal/cass + spawn_mob_type = /mob/living/simple_mob/vore/woof/cass +/obj/item/capture_crystal/adg + spawn_mob_type = /mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced +/obj/item/capture_crystal/bigdragon + spawn_mob_type = /mob/living/simple_mob/vore/bigdragon +/obj/item/capture_crystal/bigdragon/friendly + spawn_mob_type = /mob/living/simple_mob/vore/bigdragon/friendly +/obj/item/capture_crystal/teppi + spawn_mob_type = /mob/living/simple_mob/vore/alienanimals/teppi +/obj/item/capture_crystal/broodmother + spawn_mob_type = /mob/living/simple_mob/animal/giant_spider/broodmother +/obj/item/capture_crystal/skeleton + spawn_mob_type = /mob/living/simple_mob/vore/alienanimals/skeleton +/obj/item/capture_crystal/dustjumper + spawn_mob_type = /mob/living/simple_mob/vore/alienanimals/dustjumper + +/obj/item/capture_crystal/random + var/static/list/possible_mob_types = list( + list(/mob/living/simple_mob/animal/goat), + list( + /mob/living/simple_mob/animal/passive/bird, + /mob/living/simple_mob/animal/passive/bird/azure_tit, + /mob/living/simple_mob/animal/passive/bird/black_bird, + /mob/living/simple_mob/animal/passive/bird/european_robin, + /mob/living/simple_mob/animal/passive/bird/goldcrest, + /mob/living/simple_mob/animal/passive/bird/ringneck_dove, + /mob/living/simple_mob/animal/passive/bird/parrot, + /mob/living/simple_mob/animal/passive/bird/parrot/black_headed_caique, + /mob/living/simple_mob/animal/passive/bird/parrot/budgerigar, + /mob/living/simple_mob/animal/passive/bird/parrot/budgerigar/blue, + /mob/living/simple_mob/animal/passive/bird/parrot/budgerigar/bluegreen, + /mob/living/simple_mob/animal/passive/bird/parrot/cockatiel, + /mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/grey, + /mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/white, + /mob/living/simple_mob/animal/passive/bird/parrot/cockatiel/yellowish, + /mob/living/simple_mob/animal/passive/bird/parrot/eclectus, + /mob/living/simple_mob/animal/passive/bird/parrot/grey_parrot, + /mob/living/simple_mob/animal/passive/bird/parrot/kea, + /mob/living/simple_mob/animal/passive/bird/parrot/pink_cockatoo, + /mob/living/simple_mob/animal/passive/bird/parrot/sulphur_cockatoo, + /mob/living/simple_mob/animal/passive/bird/parrot/white_caique, + /mob/living/simple_mob/animal/passive/bird/parrot/white_cockatoo + ), + list( + /mob/living/simple_mob/animal/passive/cat, + /mob/living/simple_mob/animal/passive/cat/black + ), + list(/mob/living/simple_mob/animal/passive/chick), + list(/mob/living/simple_mob/animal/passive/cow), + list(/mob/living/simple_mob/animal/passive/dog/brittany), + list(/mob/living/simple_mob/animal/passive/dog/corgi), + list(/mob/living/simple_mob/animal/passive/dog/tamaskan), + list(/mob/living/simple_mob/animal/passive/fox), + list(/mob/living/simple_mob/animal/passive/hare), + list(/mob/living/simple_mob/animal/passive/lizard), + list(/mob/living/simple_mob/animal/passive/mouse), + list(/mob/living/simple_mob/animal/passive/mouse/jerboa), + list(/mob/living/simple_mob/animal/passive/opossum), + list(/mob/living/simple_mob/animal/passive/pillbug), + list(/mob/living/simple_mob/animal/passive/snake), + list(/mob/living/simple_mob/animal/passive/tindalos), + list(/mob/living/simple_mob/animal/passive/yithian), + list( + /mob/living/simple_mob/animal/wolf, + /mob/living/simple_mob/animal/wolf/direwolf + ), + list(/mob/living/simple_mob/vore/rabbit), + list(/mob/living/simple_mob/vore/redpanda), + list(/mob/living/simple_mob/vore/woof), + list(/mob/living/simple_mob/vore/fennec), + list(/mob/living/simple_mob/vore/fennix), + list(/mob/living/simple_mob/vore/hippo), + list(/mob/living/simple_mob/vore/horse), + list(/mob/living/simple_mob/vore/bee), + list( + /mob/living/simple_mob/animal/space/bear, + /mob/living/simple_mob/animal/space/bear/brown + ), + list( + /mob/living/simple_mob/otie/feral, + /mob/living/simple_mob/otie/feral/chubby, + /mob/living/simple_mob/otie/red, + /mob/living/simple_mob/otie/red/chubby + ), + list(/mob/living/simple_mob/animal/sif/diyaab), + list(/mob/living/simple_mob/animal/sif/duck), + list(/mob/living/simple_mob/animal/sif/frostfly), + list( + /mob/living/simple_mob/animal/sif/glitterfly =50, + /mob/living/simple_mob/animal/sif/glitterfly/rare = 1 + ), + list( + /mob/living/simple_mob/animal/sif/kururak = 10, + /mob/living/simple_mob/animal/sif/kururak/leader = 1, + /mob/living/simple_mob/animal/sif/kururak/hibernate = 2, + ), + list( + /mob/living/simple_mob/animal/sif/sakimm = 10, + /mob/living/simple_mob/animal/sif/sakimm/intelligent = 1 + ), + list(/mob/living/simple_mob/animal/sif/savik) = 5, + list( + /mob/living/simple_mob/animal/sif/shantak = 10, + /mob/living/simple_mob/animal/sif/shantak/leader = 1 + ), + list(/mob/living/simple_mob/animal/sif/siffet), + list(/mob/living/simple_mob/animal/sif/tymisian), + list( + /mob/living/simple_mob/animal/giant_spider/nurse = 10, + /mob/living/simple_mob/animal/giant_spider/electric = 5, + /mob/living/simple_mob/animal/giant_spider/frost = 5, + /mob/living/simple_mob/animal/giant_spider/hunter = 10, + /mob/living/simple_mob/animal/giant_spider/ion = 5, + /mob/living/simple_mob/animal/giant_spider/lurker = 10, + /mob/living/simple_mob/animal/giant_spider/pepper = 10, + /mob/living/simple_mob/animal/giant_spider/phorogenic = 10, + /mob/living/simple_mob/animal/giant_spider/thermic = 5, + /mob/living/simple_mob/animal/giant_spider/tunneler = 10, + /mob/living/simple_mob/animal/giant_spider/webslinger = 5, + /mob/living/simple_mob/animal/giant_spider/broodmother = 1), + list( + /mob/living/simple_mob/animal/wolf = 10, + /mob/living/simple_mob/animal/wolf/direwolf = 5, + /mob/living/simple_mob/vore/greatwolf = 1, + /mob/living/simple_mob/vore/greatwolf/black = 1, + /mob/living/simple_mob/vore/greatwolf/grey = 1 + ), + list(/mob/living/simple_mob/creature/strong), + list(/mob/living/simple_mob/faithless/strong), + list(/mob/living/simple_mob/animal/goat), + list( + /mob/living/simple_mob/animal/sif/shantak/leader = 1, + /mob/living/simple_mob/animal/sif/shantak = 10), + list(/mob/living/simple_mob/animal/sif/savik,), + list(/mob/living/simple_mob/animal/sif/hooligan_crab), + list( + /mob/living/simple_mob/animal/space/alien = 50, + /mob/living/simple_mob/animal/space/alien/drone = 40, + /mob/living/simple_mob/animal/space/alien/sentinel = 25, + /mob/living/simple_mob/animal/space/alien/sentinel/praetorian = 15, + /mob/living/simple_mob/animal/space/alien/queen = 10, + /mob/living/simple_mob/animal/space/alien/queen/empress = 5, + /mob/living/simple_mob/animal/space/alien/queen/empress/mother = 1 + ), + list(/mob/living/simple_mob/animal/space/bats/cult/strong), + list( + /mob/living/simple_mob/animal/space/bear, + /mob/living/simple_mob/animal/space/bear/brown + ), + list( + /mob/living/simple_mob/animal/space/carp = 50, + /mob/living/simple_mob/animal/space/carp/large = 10, + /mob/living/simple_mob/animal/space/carp/large/huge = 5 + ), + list(/mob/living/simple_mob/animal/space/goose), + list(/mob/living/simple_mob/animal/space/jelly), + list(/mob/living/simple_mob/animal/space/tree), + list( + /mob/living/simple_mob/vore/aggressive/corrupthound = 10, + /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi = 1, + ), + list(/mob/living/simple_mob/vore/aggressive/deathclaw), + list(/mob/living/simple_mob/vore/aggressive/dino), + list(/mob/living/simple_mob/vore/aggressive/dragon), + list(/mob/living/simple_mob/vore/aggressive/dragon/virgo3b), + list(/mob/living/simple_mob/vore/aggressive/frog), + list(/mob/living/simple_mob/vore/aggressive/giant_snake), + list(/mob/living/simple_mob/vore/aggressive/mimic), + list(/mob/living/simple_mob/vore/aggressive/panther), + list(/mob/living/simple_mob/vore/aggressive/rat), + list(/mob/living/simple_mob/vore/bee), + list( + /mob/living/simple_mob/vore/sect_drone = 10, + /mob/living/simple_mob/vore/sect_queen = 1 + ), + list(/mob/living/simple_mob/vore/solargrub), + list( + /mob/living/simple_mob/vore/oregrub = 5, + /mob/living/simple_mob/vore/oregrub/lava = 1 + ), + list(/mob/living/simple_mob/vore/catgirl), + list(/mob/living/simple_mob/vore/wolfgirl), + list( + /mob/living/simple_mob/vore/lamia, + /mob/living/simple_mob/vore/lamia/albino, + /mob/living/simple_mob/vore/lamia/albino/bra, + /mob/living/simple_mob/vore/lamia/albino/shirt, + /mob/living/simple_mob/vore/lamia/bra, + /mob/living/simple_mob/vore/lamia/cobra, + /mob/living/simple_mob/vore/lamia/cobra/bra, + /mob/living/simple_mob/vore/lamia/cobra/shirt, + /mob/living/simple_mob/vore/lamia/copper, + /mob/living/simple_mob/vore/lamia/copper/bra, + /mob/living/simple_mob/vore/lamia/copper/shirt, + /mob/living/simple_mob/vore/lamia/green, + /mob/living/simple_mob/vore/lamia/green/bra, + /mob/living/simple_mob/vore/lamia/green/shirt, + /mob/living/simple_mob/vore/lamia/zebra, + /mob/living/simple_mob/vore/lamia/zebra/bra, + /mob/living/simple_mob/vore/lamia/zebra/shirt + ), + list( + /mob/living/simple_mob/humanoid/merc = 100, + /mob/living/simple_mob/humanoid/merc/melee/sword = 50, + /mob/living/simple_mob/humanoid/merc/ranged = 25, + /mob/living/simple_mob/humanoid/merc/ranged/grenadier = 1, + /mob/living/simple_mob/humanoid/merc/ranged/ionrifle = 10, + /mob/living/simple_mob/humanoid/merc/ranged/laser = 5, + /mob/living/simple_mob/humanoid/merc/ranged/rifle = 5, + /mob/living/simple_mob/humanoid/merc/ranged/smg = 5, + /mob/living/simple_mob/humanoid/merc/ranged/sniper = 1, + /mob/living/simple_mob/humanoid/merc/ranged/space = 10, + /mob/living/simple_mob/humanoid/merc/ranged/technician = 5 + ), + list( + /mob/living/simple_mob/humanoid/pirate = 3, + /mob/living/simple_mob/humanoid/pirate/ranged = 1 + ), + list(/mob/living/simple_mob/mechanical/combat_drone), + list(/mob/living/simple_mob/mechanical/corrupt_maint_drone), + list( + /mob/living/simple_mob/mechanical/hivebot = 100, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage = 20, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/backline = 10, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/basic = 20, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/dot = 5, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/ion = 20, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/laser = 10, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/rapid = 2, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege = 1, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/emp = 5, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/fragmentation = 1, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/siege/radiation = 1, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong = 3, + /mob/living/simple_mob/mechanical/hivebot/ranged_damage/strong/guard = 3, + /mob/living/simple_mob/mechanical/hivebot/support = 8, + /mob/living/simple_mob/mechanical/hivebot/support/commander = 5, + /mob/living/simple_mob/mechanical/hivebot/support/commander/autofollow = 10, + /mob/living/simple_mob/mechanical/hivebot/swarm = 20, + /mob/living/simple_mob/mechanical/hivebot/tank = 20, + /mob/living/simple_mob/mechanical/hivebot/tank/armored = 20, + /mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_bullet = 20, + /mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_laser = 20, + /mob/living/simple_mob/mechanical/hivebot/tank/armored/anti_melee = 20, + /mob/living/simple_mob/mechanical/hivebot/tank/meatshield = 20 + ), + list(/mob/living/simple_mob/mechanical/infectionbot), + list(/mob/living/simple_mob/mechanical/mining_drone), + list(/mob/living/simple_mob/mechanical/technomancer_golem), + list( + /mob/living/simple_mob/mechanical/viscerator, + /mob/living/simple_mob/mechanical/viscerator/piercing + ), + list(/mob/living/simple_mob/mechanical/wahlem), + list(/mob/living/simple_mob/animal/passive/fox/syndicate), + list(/mob/living/simple_mob/animal/passive/fox), + list(/mob/living/simple_mob/animal/wolf/direwolf), + list(/mob/living/simple_mob/animal/space/jelly), + list( + /mob/living/simple_mob/otie/feral, + /mob/living/simple_mob/otie/feral/chubby, + /mob/living/simple_mob/otie/red, + /mob/living/simple_mob/otie/red/chubby + ), + list( + /mob/living/simple_mob/shadekin/blue = 100, + /mob/living/simple_mob/shadekin/green = 50, + /mob/living/simple_mob/shadekin/orange = 20, + /mob/living/simple_mob/shadekin/purple = 60, + /mob/living/simple_mob/shadekin/red = 40, + /mob/living/simple_mob/shadekin/yellow = 1 + ), + list( + /mob/living/simple_mob/vore/aggressive/corrupthound, + /mob/living/simple_mob/vore/aggressive/corrupthound/prettyboi + ), + list(/mob/living/simple_mob/vore/aggressive/deathclaw), + list(/mob/living/simple_mob/vore/aggressive/dino), + list(/mob/living/simple_mob/vore/aggressive/dragon), + list(/mob/living/simple_mob/vore/aggressive/dragon/virgo3b), + list(/mob/living/simple_mob/vore/aggressive/frog), + list(/mob/living/simple_mob/vore/aggressive/giant_snake), + list(/mob/living/simple_mob/vore/aggressive/mimic), + list(/mob/living/simple_mob/vore/aggressive/panther), + list(/mob/living/simple_mob/vore/aggressive/rat), + list(/mob/living/simple_mob/vore/bee), + list(/mob/living/simple_mob/vore/catgirl), + list(/mob/living/simple_mob/vore/cookiegirl), + list(/mob/living/simple_mob/vore/fennec), + list(/mob/living/simple_mob/vore/fennix), + list(/mob/living/simple_mob/vore/hippo), + list(/mob/living/simple_mob/vore/horse), + list(/mob/living/simple_mob/vore/oregrub), + list(/mob/living/simple_mob/vore/rabbit), + list( + /mob/living/simple_mob/vore/redpanda = 50, + /mob/living/simple_mob/vore/redpanda/fae = 1 + ), + list( + /mob/living/simple_mob/vore/sect_drone = 10, + /mob/living/simple_mob/vore/sect_queen = 1 + ), + list(/mob/living/simple_mob/vore/solargrub), + list(/mob/living/simple_mob/vore/woof), + list(/mob/living/simple_mob/vore/alienanimals/teppi), + list(/mob/living/simple_mob/vore/alienanimals/space_ghost), + list(/mob/living/simple_mob/vore/alienanimals/catslug), + list(/mob/living/simple_mob/vore/alienanimals/space_jellyfish), + list(/mob/living/simple_mob/vore/alienanimals/startreader), + list(/mob/living/simple_mob/vore/bigdragon), + list( + /mob/living/simple_mob/vore/leopardmander = 50, + /mob/living/simple_mob/vore/leopardmander/blue = 10, + /mob/living/simple_mob/vore/leopardmander/exotic = 1 + ), + list(/mob/living/simple_mob/vore/sheep), + list(/mob/living/simple_mob/vore/weretiger), + list(/mob/living/simple_mob/vore/alienanimals/skeleton), + list(/mob/living/simple_mob/vore/alienanimals/dustjumper) + ) + +/obj/item/capture_crystal/random/Initialize() + var/subchoice = pickweight(possible_mob_types) //Some of the lists have nested lists, so let's pick one of them + var/choice = pickweight(subchoice) //And then we'll pick something from whatever's left + spawn_mob_type = choice //Now when someone uses this, we'll spawn whatever we picked! + return ..() + +/mob/living + var/capture_crystal = TRUE //If TRUE, the mob is capturable. Otherwise it isn't. + var/capture_caught = FALSE //If TRUE, the mob has already been caught, and so cannot be caught again. \ No newline at end of file diff --git a/code/game/objects/items/weapons/chewables.dm b/code/game/objects/items/weapons/chewables.dm index 93a2df1615..181db77e91 100644 --- a/code/game/objects/items/weapons/chewables.dm +++ b/code/game/objects/items/weapons/chewables.dm @@ -254,6 +254,7 @@ desc = "A chocolate-coated biscuit stick." icon_state = "pockystick" item_state = "pocky" + type_butt = null /obj/item/clothing/mask/chewable/candy/pocky/process() chew() diff --git a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm index 2311e48983..174e1cde97 100644 --- a/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm +++ b/code/game/objects/items/weapons/circuitboards/circuitboards_vr.dm @@ -60,3 +60,10 @@ build_path = /obj/machinery/computer/id_restorer board_type = new /datum/frame/frame_types/id_restorer matter = list(MAT_STEEL = 50, MAT_GLASS = 50) + +/obj/item/weapon/circuitboard/security/xenobio + name = T_BOARD("xenobiology camera monitor") + build_path = /obj/machinery/computer/security/xenobio + network = list(NETWORK_XENOBIO) + req_access = list() + matter = list(MAT_STEEL = 50, MAT_GLASS = 50) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 285fba5bfd..d7fcb01fce 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -85,8 +85,8 @@ /obj/item/weapon/beach_ball/holoball, /obj/item/toy/balloon, /obj/item/toy/blink, - /obj/item/toy/crossbow, - /obj/item/weapon/gun/projectile/revolver/capgun, + /obj/item/weapon/gun/projectile/revolver/toy/crossbow, + /obj/item/weapon/storage/box/capguntoy, /obj/item/toy/katana, /obj/item/toy/mecha/deathripley, /obj/item/toy/mecha/durand, diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 744cc130e2..1a19b98910 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -55,7 +55,7 @@ C.throw_mode_on() /obj/item/weapon/grenade/chem_grenade/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/device/assembly_holder) && (!stage || stage==1) && path != 2) + if(istype(W,/obj/item/device/assembly_holder) && (!stage || stage==1) && !detonator && path != 2) var/obj/item/device/assembly_holder/det = W if(istype(det.a_left,det.a_right.type) || (!isigniter(det.a_left) && !isigniter(det.a_right))) to_chat(user, "Assembly must contain one igniter.") @@ -314,4 +314,3 @@ beakers += B1 beakers += B2 - \ No newline at end of file diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index fe034f0095..35e55428a9 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -141,6 +141,7 @@ var/last_chew = 0 /obj/item/weapon/handcuffs/fuzzy name = "fuzzy cuffs" icon_state = "fuzzycuff" + breakouttime = 100 //VOREstation edit desc = "Use this to keep... 'prisoners' in line." /obj/item/weapon/handcuffs/cable diff --git a/code/game/objects/items/weapons/id cards/cards.dm b/code/game/objects/items/weapons/id cards/cards.dm index 4831d92e56..260eff8539 100644 --- a/code/game/objects/items/weapons/id cards/cards.dm +++ b/code/game/objects/items/weapons/id cards/cards.dm @@ -116,7 +116,6 @@ else log_and_message_admins("attempted to emag \an [A].") // Vorestation Edit: End of Edit - log_and_message_admins("emagged \an [A].") if(uses<1) user.visible_message("\The [src] fizzles and sparks - it seems it's been used once too often, and is now spent.") diff --git a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm index 13680cadbe..159041e571 100644 --- a/code/game/objects/items/weapons/id cards/id_stacks_vr.dm +++ b/code/game/objects/items/weapons/id cards/id_stacks_vr.dm @@ -261,6 +261,10 @@ name = "Talon Pilot ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-purple", "stripe-purple") +/obj/item/weapon/card/id/talon/miner + name = "Talon Mining ID" + initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-brown", "stripe-brown") + /obj/item/weapon/card/id/talon/captain name = "Talon Captain ID" initial_sprite_stack = list("base-stamp-dark", "top-dark", "stamp-silhouette", "pips-gold", "stripe-gold") diff --git a/code/game/objects/items/weapons/id cards/station_ids_vr.dm b/code/game/objects/items/weapons/id cards/station_ids_vr.dm index 0a9015145a..286b9f3e79 100644 --- a/code/game/objects/items/weapons/id cards/station_ids_vr.dm +++ b/code/game/objects/items/weapons/id cards/station_ids_vr.dm @@ -208,6 +208,7 @@ "Shaft Miner" = "itg", "Intern" = "itg", "Talon Pilot" = "itg", + "Talon Miner" = "itg", "Bartender" = "itg_green", "Botanist" = "itg_green", "Chef" = "itg_green", @@ -233,7 +234,7 @@ "Field Medic" = "itg_white", "Talon Doctor" = "itg_white", "Atmospheric Technician" = "itg_orange", - "Station Engineer" = "itg_orange", + "Engineer" = "itg_orange", "Off-duty Officer" = "itg_red", "Off-duty Engineer" = "itg_orange", "Off-duty Medic" = "itg_white", diff --git a/code/game/objects/items/weapons/implants/implant_vr.dm b/code/game/objects/items/weapons/implants/implant_vr.dm index 133bcb48f4..0702ac6697 100644 --- a/code/game/objects/items/weapons/implants/implant_vr.dm +++ b/code/game/objects/items/weapons/implants/implant_vr.dm @@ -35,6 +35,7 @@ source.add_language(LANGUAGE_CANILUNZT) source.add_language(LANGUAGE_SLAVIC) source.add_language(LANGUAGE_SOL_COMMON) //In case they're giving a xenomorph an implant or something. + source.add_language(LANGUAGE_TAVAN) /obj/item/weapon/implant/vrlanguage/post_implant(mob/source) source.mind.store_memory("A implant can be activated by using the smile emote, say *smile to attempt to activate.", 0, 0) diff --git a/code/game/objects/items/weapons/implants/implantlanguage.dm b/code/game/objects/items/weapons/implants/implantlanguage.dm index 692cdd381f..595e40c2b9 100644 --- a/code/game/objects/items/weapons/implants/implantlanguage.dm +++ b/code/game/objects/items/weapons/implants/implantlanguage.dm @@ -7,6 +7,7 @@ desc = "An implant allowing someone to speak the range of frequencies used in Galactic Common, as well as produce any phonemes that they usually cannot. Only helps with producing sounds, not understanding them." known_implant = TRUE var/list/languages = list(LANGUAGE_GALCOM) // List of languages that this assists with + initialize_loc = BP_HEAD /obj/item/weapon/implant/language/post_implant(mob/M) // Amends the mob's voice organ, then deletes itself if(ishuman(M)) diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm index bf6e8c4829..10c57abf85 100644 --- a/code/game/objects/items/weapons/material/misc.dm +++ b/code/game/objects/items/weapons/material/misc.dm @@ -23,7 +23,20 @@ applies_material_colour = 0 drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' +/* VOREStation Removal - We have one already +/obj/item/weapon/material/knife/machete/hatchet/stone + name = "sharp rock" + desc = "The secret is to bang the rocks together, guys." + force_divisor = 0.2 + icon_state = "rock" + item_state = "rock" + attack_verb = list("chopped", "torn", "cut") +/obj/item/weapon/material/knife/machete/hatchet/stone/set_material(var/new_material) + var/old_name = name + . = ..() + name = old_name +*/ /obj/item/weapon/material/knife/machete/hatchet/unathiknife name = "duelling knife" desc = "A length of leather-bound wood studded with razor-sharp teeth. How crude." diff --git a/code/game/objects/items/weapons/shields_vr.dm b/code/game/objects/items/weapons/shields_vr.dm index 514ecd15c9..a311a74089 100644 --- a/code/game/objects/items/weapons/shields_vr.dm +++ b/code/game/objects/items/weapons/shields_vr.dm @@ -92,3 +92,11 @@ icon_state = "explorer_shield_P_lighted" else icon_state = "explorer_shield_P" + +/obj/item/weapon/shield/primitive + name = "primitive shield" + desc = "A defensive object that is little more than planks strapped your arm" + icon = 'icons/obj/weapons.dmi' + icon_state = "buckler" + w_class = ITEMSIZE_LARGE + base_block_chance = 30 diff --git a/code/game/objects/items/weapons/storage/backpack_vr.dm b/code/game/objects/items/weapons/storage/backpack_vr.dm index a3c1e34619..5588969224 100644 --- a/code/game/objects/items/weapons/storage/backpack_vr.dm +++ b/code/game/objects/items/weapons/storage/backpack_vr.dm @@ -190,3 +190,14 @@ icon_override = 'icons/inventory/back/mob_vr.dmi' item_state = "kr_rucksack" icon_state = "kr_rucksack" + + +//strapless +/obj/item/weapon/storage/backpack/satchel/strapless + name = "strapless satchel" + desc = "A satchel for carrying a large number of supplies easily. Without Straps" + icon = 'icons/inventory/back/item_vr.dmi' + icon_override = 'icons/inventory/back/mob_vr.dmi' + icon_state = "satchel_strapless" + item_state_slots = null + diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 1c92c3e94e..96d0326654 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -123,11 +123,11 @@ ) /obj/item/weapon/storage/belt/utility/holding - name = "tool-belt of holding" + name = "tool-belt of holding" desc = "A belt that uses localized bluespace pockets to hold more items than expected!" icon_state = "utility_holding" storage_slots = 14 //twice the amount as a normal belt - max_storage_space = ITEMSIZE_COST_NORMAL * 14 + max_storage_space = ITEMSIZE_COST_NORMAL * 14 can_hold = list( /obj/item/weapon/tool/crowbar, /obj/item/weapon/tool/screwdriver, @@ -158,7 +158,13 @@ /obj/item/stack/nanopaste, /obj/item/weapon/cell, //this is a bigger belt, might as well make it hold bigger cells too /obj/item/weapon/pipe_dispenser, //bigger belt for bigger tools - /obj/item/weapon/rcd //see above + /obj/item/weapon/rcd, //see above + /obj/item/device/quantum_pad_booster, + /obj/item/weapon/inducer, + /obj/item/stack/material/steel, + /obj/item/stack/material/glass, + /obj/item/device/lightreplacer, + /obj/item/weapon/pickaxe/plasmacutter ) @@ -201,11 +207,11 @@ icon_state = "ems" /obj/item/weapon/storage/belt/medical/holding - name = "medical belt of holding" + name = "medical belt of holding" desc = "A belt that uses localized bluespace pockets to hold more items than expected!" icon_state = "med_holding" storage_slots = 14 //twice the amount as a normal belt - max_storage_space = ITEMSIZE_COST_NORMAL * 14 + max_storage_space = ITEMSIZE_COST_NORMAL * 14 /obj/item/weapon/storage/belt/security name = "security belt" @@ -523,4 +529,13 @@ name = "ranger belt" desc = "The fancy utility-belt holding the tools, cuffs and gadgets of the Go Go ERT-Rangers. The belt buckle is not real phoron, but it is still surprisingly comfortable to wear." icon = 'icons/obj/clothing/ranger.dmi' - icon_state = "ranger_belt" \ No newline at end of file + icon_state = "ranger_belt" + +/obj/item/weapon/storage/belt/dbandolier + name = "\improper Donk-Soft bandolier" + desc = "A Donk-Soft bandolier! Carry your spare darts anywhere! Ages 8 and up." + icon_state = "dbandolier" + storage_slots = 8 + can_hold = list( + /obj/item/ammo_casing/afoam_dart + ) \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 2f293ddde9..4eac505ebf 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -568,3 +568,17 @@ name = "ambrosia deus seeds box" desc = "Contains the seeds you need to get a proper healthy high." starts_with = list(/obj/item/seeds/ambrosiadeusseed = 7) + +/obj/item/weapon/storage/box/capguntoy + name = "\improper AlliCo \"Zipper\" Cap Gun" + icon = 'icons/obj/gun_toy.dmi' + icon_state = "cap_gun_box" + desc = "This box is shaped on the inside so that only the \"Zipper\" Capgun and extra caps can fit." + item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit") + storage_slots = 2 + max_w_class = ITEMSIZE_NORMAL + can_hold = list(/obj/item/weapon/gun/projectile/revolver/capgun, /obj/item/ammo_magazine/ammo_box/cap) + starts_with = list( + /obj/item/weapon/gun/projectile/revolver/capgun = 1, + /obj/item/ammo_magazine/ammo_box/cap = 1 + ) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index 78eb6d5d48..aa0e4598ea 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -68,7 +68,7 @@ item_state = "candlebox5" throwforce = 2 slot_flags = SLOT_BELT - max_storage_space = ITEMSIZE_COST_SMALL * 5 + max_storage_space = ITEMSIZE_COST_TINY * 5 can_hold = list(/obj/item/weapon/flame/candle) starts_with = list(/obj/item/weapon/flame/candle = 5) @@ -81,7 +81,7 @@ item_state = "whitecandlebox5" throwforce = 2 slot_flags = SLOT_BELT - max_storage_space = ITEMSIZE_COST_SMALL * 5 + max_storage_space = ITEMSIZE_COST_TINY * 5 can_hold = list(/obj/item/weapon/flame/candle) starts_with = list(/obj/item/weapon/flame/candle/white = 5) @@ -94,7 +94,7 @@ item_state = "blackcandlebox5" throwforce = 2 slot_flags = SLOT_BELT - max_storage_space = ITEMSIZE_COST_SMALL * 5 + max_storage_space = ITEMSIZE_COST_TINY * 5 can_hold = list(/obj/item/weapon/flame/candle) starts_with = list(/obj/item/weapon/flame/candle/black = 5) diff --git a/code/game/objects/items/weapons/storage/pouches.dm b/code/game/objects/items/weapons/storage/pouches.dm index 62e04c0764..3cbf4d5130 100644 --- a/code/game/objects/items/weapons/storage/pouches.dm +++ b/code/game/objects/items/weapons/storage/pouches.dm @@ -15,7 +15,7 @@ can_hold = null pocketable = TRUE - var/insert_delay = 0 + var/insert_delay = 0 SECONDS var/remove_delay = 2 SECONDS /obj/item/weapon/storage/pouch/stall_insertion(obj/item/W, mob/user) @@ -23,26 +23,23 @@ if(user.get_active_hand() == src || user.get_inactive_hand() == src) return TRUE // Skip delay - if(insert_delay && !do_after(user, 2 SECONDS, src, needhand = TRUE, exclusive = TASK_USER_EXCLUSIVE)) - return FALSE // Moved or whatever + if(insert_delay && !do_after(user, insert_delay, src, needhand = TRUE, exclusive = TASK_USER_EXCLUSIVE)) + return FALSE // Moved while there is a delay - if(W in src) - return TRUE // Item is still inside - - return FALSE + return TRUE //Now we're allowed to put the item in the pouch /obj/item/weapon/storage/pouch/stall_removal(obj/item/W, mob/user) // No delay if you have the pouch in your hands if(user.get_active_hand() == src || user.get_inactive_hand() == src) return TRUE // Skip delay - if(remove_delay && !do_after(user, 2 SECONDS, src, needhand = TRUE, exclusive = TASK_USER_EXCLUSIVE)) - return FALSE // Moved or whatever + if(remove_delay && !do_after(user, remove_delay, src, needhand = TRUE, exclusive = TASK_USER_EXCLUSIVE)) + return FALSE // Moved while there is a delay if(W in src) return TRUE // Item is still inside - return FALSE + return FALSE //Item was somehow already removed /obj/item/weapon/storage/pouch/pocket_description(mob/haver, mob/examiner) return "[src]" diff --git a/code/game/objects/random/gradient.dm b/code/game/objects/random/gradient.dm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/code/game/objects/random/mapping.dm b/code/game/objects/random/mapping.dm index a98edbf598..a9e567c6c0 100644 --- a/code/game/objects/random/mapping.dm +++ b/code/game/objects/random/mapping.dm @@ -109,7 +109,7 @@ /obj/random/vendordrink/item_to_spawn() //Not including coffee as it's more specific in usage. return pick (/obj/machinery/vending/cola, /obj/machinery/vending/cola/soft, - /obj/machinery/vending/bepis, + /obj/machinery/vending/bepis, /obj/machinery/vending/sovietsoda, /obj/machinery/vending/radren) //VOREStation Edit End @@ -1455,4 +1455,194 @@ /obj/random/turf/lava/item_to_spawn() return pick(prob(5);/turf/simulated/floor/lava, prob(3);/turf/simulated/floor/outdoors/rocks/caves, - prob(1);/turf/simulated/mineral) + prob(1);/turf/simulated/mineral/ignore_mapgen/cave) + +//VOREStation Add Start - Underdark stuff that would be cool if existed if the underdark doesn't. + +/obj/random/underdark + name = "random underdark loot" + desc = "Random loot for Underdark." + icon = 'icons/obj/items.dmi' + icon_state = "spickaxe" + +/obj/random/underdark/item_to_spawn() + return pick(prob(3);/obj/random/multiple/underdark/miningdrills, + prob(3);/obj/random/multiple/underdark/ores, + prob(2);/obj/random/multiple/underdark/treasure, + prob(1);/obj/random/multiple/underdark/mechtool) + +/obj/random/underdark/uncertain + icon_state = "upickaxe" + spawn_nothing_percentage = 65 //only 33% to spawn loot + +/obj/random/multiple/underdark/miningdrills + name = "random underdark mining tool loot" + desc = "Random mining tool loot for Underdark." + icon = 'icons/obj/items.dmi' + icon_state = "spickaxe" + +/obj/random/multiple/underdark/miningdrills/item_to_spawn() + return pick( + prob(10);list(/obj/item/weapon/pickaxe/silver), + prob(8);list(/obj/item/weapon/pickaxe/drill), + prob(6);list(/obj/item/weapon/pickaxe/jackhammer), + prob(5);list(/obj/item/weapon/pickaxe/gold), + prob(4);list(/obj/item/weapon/pickaxe/plasmacutter), + prob(2);list(/obj/item/weapon/pickaxe/diamond), + prob(1);list(/obj/item/weapon/pickaxe/diamonddrill) + ) + +/obj/random/multiple/underdark/ores + name = "random underdark mining ore loot" + desc = "Random mining utility loot for Underdark." + icon = 'icons/obj/mining.dmi' + icon_state = "satchel" + +/obj/random/multiple/underdark/ores/item_to_spawn() + return pick( + prob(9);list( + /obj/item/weapon/storage/bag/ore, + /obj/item/weapon/shovel, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/glass, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen, + /obj/item/weapon/ore/hydrogen + ), + prob(7);list( + /obj/item/weapon/storage/bag/ore, + /obj/item/weapon/pickaxe, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium, + /obj/item/weapon/ore/osmium + ), + prob(4);list( + /obj/item/clothing/suit/radiation, + /obj/item/clothing/head/radiation, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium, + /obj/item/weapon/ore/uranium), + prob(2);list( + /obj/item/device/flashlight/lantern, + /obj/item/clothing/glasses/material, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond, + /obj/item/weapon/ore/diamond + ), + prob(1);list( + /obj/item/weapon/mining_scanner, + /obj/item/weapon/shovel/spade, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/verdantium, + /obj/item/weapon/ore/verdantium + ) + ) + +/obj/random/multiple/underdark/treasure + name = "random underdark treasure" + desc = "Random treasure loot for Underdark." + icon = 'icons/obj/storage.dmi' + icon_state = "cashbag" + +/obj/random/multiple/underdark/treasure/item_to_spawn() + return pick( + prob(5);list( + /obj/random/coin, + /obj/random/coin, + /obj/random/coin, + /obj/random/coin, + /obj/random/coin, + /obj/item/clothing/head/pirate + ), + prob(4);list( + /obj/item/weapon/storage/bag/cash, + /obj/item/weapon/spacecash/c500, + /obj/item/weapon/spacecash/c100, + /obj/item/weapon/spacecash/c50 + ), + prob(3);list( + /obj/item/clothing/head/hardhat/orange, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold, + /obj/item/stack/material/gold), + prob(1);list( + /obj/item/stack/material/phoron, + /obj/item/stack/material/phoron, + /obj/item/stack/material/phoron, + /obj/item/stack/material/phoron, + /obj/item/stack/material/diamond, + /obj/item/stack/material/diamond, + /obj/item/stack/material/diamond + ) + ) + +/obj/random/multiple/underdark/mechtool + name = "random underdark mech equipment" + desc = "Random mech equipment loot for Underdark." + icon = 'icons/mecha/mecha_equipment.dmi' + icon_state = "mecha_clamp" + +/obj/random/multiple/underdark/mechtool/item_to_spawn() + return pick( + prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill), + prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp), + prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator), + prob(7);list(/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged), + prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid), + prob(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult), + prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser), + prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged), + prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill), + ) +//VOREStation Add End \ No newline at end of file diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm index ef1584fb57..ac7d045704 100644 --- a/code/game/objects/random/misc.dm +++ b/code/game/objects/random/misc.dm @@ -734,7 +734,7 @@ /obj/item/toy/snappop, /obj/item/toy/sword, /obj/item/toy/balloon, - /obj/item/toy/crossbow, + /obj/item/weapon/gun/projectile/revolver/toy/crossbow, /obj/item/toy/blink, /obj/item/weapon/reagent_containers/spray/waterflower, /obj/item/toy/eight_ball, diff --git a/code/game/objects/random/misc_vr.dm b/code/game/objects/random/misc_vr.dm index 0d3a17c23f..9030e874ac 100644 --- a/code/game/objects/random/misc_vr.dm +++ b/code/game/objects/random/misc_vr.dm @@ -23,6 +23,7 @@ prob(30);/obj/item/weapon/aliencoin/gold, prob(20);/obj/item/weapon/aliencoin/phoron, prob(10);/obj/item/device/denecrotizer, + prob(5);/obj/item/capture_crystal, prob(5);/obj/item/device/perfect_tele, prob(5);/obj/item/weapon/bluespace_harpoon, prob(1);/obj/item/weapon/cell/infinite, @@ -43,9 +44,59 @@ prob(3);/obj/fiftyspawner/silver, prob(1);/obj/fiftyspawner/diamond, prob(5);/obj/fiftyspawner/phoron, - prob(1);/obj/item/weapon/telecube/randomized + prob(1);/obj/item/weapon/telecube/randomized, + prob(1);/obj/item/capture_crystal/random ) /obj/random/awayloot/nofail name = "garunteed random away mission loot" spawn_nothing_percentage = 0 + +/obj/random/awayloot/looseloot +/obj/random/awayloot/looseloot/item_to_spawn() + return pick(prob(50);/obj/item/weapon/aliencoin, + prob(40);/obj/item/weapon/aliencoin/silver, + prob(30);/obj/item/weapon/aliencoin/gold, + prob(20);/obj/item/weapon/aliencoin/phoron, + prob(10);/obj/item/device/denecrotizer, + prob(5);/obj/item/capture_crystal, + prob(3);/obj/item/capture_crystal/great, + prob(1);/obj/item/capture_crystal/ultra, + prob(4);/obj/item/capture_crystal/random, + prob(5);/obj/item/device/perfect_tele, + prob(5);/obj/item/weapon/bluespace_harpoon, + prob(1);/obj/item/weapon/cell/infinite, + prob(1);/obj/item/weapon/cell/void, + prob(1);/obj/item/weapon/cell/device/weapon/recharge/alien, + prob(1);/obj/item/clothing/shoes/boots/speed, + prob(1);/obj/item/device/nif, + prob(1);/obj/item/device/paicard, + prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie, + prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, + prob(2);/obj/item/weapon/storage/backpack/dufflebag/syndie/med, + prob(2);/obj/item/clothing/mask/gas/voice, + prob(2);/obj/item/device/radio_jammer, + prob(1);/obj/item/toy/bosunwhistle, + prob(1);/obj/item/weapon/bananapeel, + prob(5);/obj/fiftyspawner/platinum, + prob(3);/obj/fiftyspawner/gold, + prob(3);/obj/fiftyspawner/silver, + prob(1);/obj/fiftyspawner/diamond, + prob(5);/obj/fiftyspawner/phoron, + prob(1);/obj/item/weapon/telecube/randomized, + prob(10);/obj/random/empty_or_lootable_crate, + prob(10);/obj/random/medical, + prob(5);/obj/random/firstaid, + prob(30);/obj/random/maintenance, + prob(10);/obj/random/mre, + prob(15);/obj/random/snack, + prob(10);/obj/random/tech_supply, + prob(15);/obj/random/tech_supply/component, + prob(10);/obj/random/tool, + prob(5);/obj/random/tool/power, + prob(1);/obj/random/tool/alien, + prob(5);/obj/random/weapon, + prob(5);/obj/random/ammo_all, + prob(3);/obj/random/projectile/random, + prob(5);/obj/random/multiple/voidsuit + ) diff --git a/code/game/objects/random/mob.dm b/code/game/objects/random/mob.dm index d0cee5dff0..be1222aabe 100644 --- a/code/game/objects/random/mob.dm +++ b/code/game/objects/random/mob.dm @@ -240,6 +240,7 @@ /obj/random/mob/mouse/item_to_spawn() return pick(prob(15);/mob/living/simple_mob/animal/passive/mouse/white, + prob(15);/mob/living/simple_mob/animal/passive/mouse/black, prob(30);/mob/living/simple_mob/animal/passive/mouse/brown, prob(30);/mob/living/simple_mob/animal/passive/mouse/gray, prob(30);/mob/living/simple_mob/animal/passive/mouse/rat) diff --git a/code/game/objects/random/spacesuits.dm b/code/game/objects/random/spacesuits.dm index 5db5bbb074..00416fa19a 100644 --- a/code/game/objects/random/spacesuits.dm +++ b/code/game/objects/random/spacesuits.dm @@ -227,6 +227,7 @@ /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot ), + prob(10);list( /obj/item/clothing/suit/space/void/refurb/pilot, /obj/item/clothing/head/helmet/space/void/refurb/pilot/alt @@ -239,6 +240,10 @@ /obj/item/clothing/suit/space/void/refurb/research, /obj/item/clothing/head/helmet/space/void/refurb/research/alt ), + prob(10);list( + /obj/item/clothing/suit/space/void/refurb/mining, + /obj/item/clothing/head/helmet/space/void/refurb/mining + ), prob(5);list( /obj/item/clothing/suit/space/void/refurb/mercenary, /obj/item/clothing/head/helmet/space/void/refurb/mercenary diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index cbb95e955f..8ec67cdf8f 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -112,7 +112,7 @@ user.visible_message("[user] smears paint on [src], covering the entire thing in paint.", "You smear paint on [src], changing the color of the entire thing.", runemessage = "smears paint") update_appearance() return - + if(user.a_intent == I_HELP) tgui_interact(user) else @@ -215,7 +215,7 @@ return canvas_color /obj/item/canvas/proc/try_rename(mob/user) - var/new_name = stripped_input(user,"What do you want to name the painting?") + var/new_name = stripped_input(user,"What do you want to name the painting?", max_length = 250) if(new_name != painting_name && new_name && CanUseTopic(user, GLOB.tgui_physical_state)) painting_name = new_name SStgui.update_uis(src) @@ -291,7 +291,7 @@ if(new_color) selected_color = new_color color_drop.color = new_color - + cut_overlays() if(hud_level) add_overlay(color_drop) @@ -316,21 +316,10 @@ name = "painting frame" desc = "The perfect showcase for your favorite deathtrap memories." icon = 'icons/obj/decals.dmi' - //custom_materials = list(/datum/material/wood = 2000) - //flags_1 = NONE + refund_amt = 5 + refund_type = /obj/item/stack/material/wood icon_state = "frame-empty" - -/obj/item/frame/painting/try_build(turf/on_wall, mob/user as mob) - if(get_dist(on_wall, user) > 1) - return - var/ndir = get_dir(on_wall, user) - if (!(ndir in cardinal)) - return - if(!istype(on_wall, /turf/simulated/wall)) - to_chat(user, "Frame cannot be placed on this spot.") - return - new /obj/structure/sign/painting(get_turf(user), ndir, TRUE) - qdel(src) + build_machine_type = /obj/structure/sign/painting /obj/structure/sign/painting name = "Painting" @@ -346,6 +335,7 @@ var/desc_with_canvas var/persistence_id var/loaded = FALSE + var/curator = "nobody! Report bug if you see this." //Presets for art gallery mapping, for paintings to be shared across stations /obj/structure/sign/painting/public @@ -356,10 +346,11 @@ /obj/structure/sign/painting/library_secure name = "\improper Curated Painting Exhibit mounting" - desc = "For masterpieces hand-picked by the curator." - desc_with_canvas = "A masterpiece hand-picked by the curator, supposedly." + desc = "For masterpieces hand-picked by the librarian." + desc_with_canvas = "A masterpiece hand-picked by the librarian, supposedly." persistence_id = "library" req_one_access = list(access_library) + curator = "Librarian" /obj/structure/sign/painting/chapel_secure name = "\improper Religious Painting Exhibit mounting" @@ -367,13 +358,15 @@ desc_with_canvas = "A masterpiece hand-picked by the chaplain, supposedly." persistence_id = "chapel" req_one_access = list(access_chapel_office) + curator = "Chaplain" /obj/structure/sign/painting/library_private // keep your smut away from prying eyes, or non-librarians at least name = "\improper Private Painting Exhibit mounting" - desc = "For art pieces deemed too subversive or too illegal to be shared outside of curators." + desc = "For art pieces deemed too subversive or too illegal to be shared outside of librarians." desc_with_canvas = "A painting hung away from lesser minds." persistence_id = "library_private" req_one_access = list(access_library) + curator = "Librarian" /obj/structure/sign/painting/away_areas // for very hard-to-get-to areas name = "\improper Remote Painting Exhibit mounting" @@ -423,7 +416,7 @@ /obj/structure/sign/painting/proc/frame_canvas(mob/user,obj/item/canvas/new_canvas) if(!allowed(user)) - to_chat(user, "You're not comfortable framing this canvas in such a prestigious spot!") + to_chat(user, "Access lock prevents you from putting a painting into this frame. Ask [curator] for help!") return if(user.drop_from_inventory(new_canvas, src)) current_canvas = new_canvas @@ -434,7 +427,7 @@ /obj/structure/sign/painting/proc/unframe_canvas(mob/living/user) if(!allowed(user)) - to_chat(user, "You're not comfortable removing this prestigious canvas!") + to_chat(user, "Access lock prevents you from removing paintings from this frame. Ask [curator] ((or admins)) for help!") return if(current_canvas) current_canvas.forceMove(drop_location()) @@ -483,12 +476,12 @@ /obj/structure/sign/painting/proc/load_persistent() if(!persistence_id || !LAZYLEN(SSpersistence.unpicked_paintings)) return - + var/list/painting_category = list() for (var/list/P in SSpersistence.unpicked_paintings) if(P["persistence_id"] == persistence_id) painting_category[++painting_category.len] = P - + var/list/painting while(!painting) if(!length(painting_category)) @@ -500,7 +493,7 @@ continue //and try again painting = chosen SSpersistence.unpicked_paintings -= list(chosen) - + var/title = painting["title"] var/author_name = painting["author"] var/author_ckey = painting["ckey"] @@ -509,7 +502,7 @@ var/obj/item/canvas/new_canvas var/w = I.Width() var/h = I.Height() - + for(var/T in typesof(/obj/item/canvas)) new_canvas = T if(initial(new_canvas.width) == w && initial(new_canvas.height) == h) @@ -519,7 +512,7 @@ if(!new_canvas) warning("Couldn't find a canvas to match [w]x[h] of painting") return - + new_canvas.fill_grid_from_icon(I) new_canvas.generated_icon = I new_canvas.icon_generated = TRUE @@ -540,7 +533,7 @@ return if(!current_canvas.painting_name) current_canvas.painting_name = "Untitled Artwork" - + var/data = current_canvas.get_data_string() var/md5 = md5(lowertext(data)) for(var/list/entry in SSpersistence.all_paintings) @@ -549,10 +542,10 @@ var/png_directory = "data/persistent/paintings/[persistence_id]/" var/png_path = png_directory + "[md5].png" var/result = rustg_dmi_create_png(png_path,"[current_canvas.width]","[current_canvas.height]",data) - + if(result) CRASH("Error saving persistent painting: [result]") - + SSpersistence.all_paintings += list(list( "persistence_id" = persistence_id, "title" = current_canvas.painting_name, diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm index 04a46fb124..c64593078f 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions.dm @@ -1444,6 +1444,13 @@ "stripes" = COLOR_OFF_WHITE, "glass" = COLOR_WHITE ) + +/decl/closet_appearance/wall_double/survival + color = COLOR_CYAN_BLUE + decals = null + extra_decals = list( + "stripe_outer" = COLOR_WHITE + ) // Carts /decl/closet_appearance/cart diff --git a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm index de02a4baf6..0f85ed63c8 100644 --- a/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm +++ b/code/game/objects/structures/crates_lockers/_closets_appearance_definitions_vr.dm @@ -32,6 +32,11 @@ "stripes_horizontal" = COLOR_SKY_BLUE ) +/decl/closet_appearance/secure_closet/talon/miner + extra_decals = list( + "stripes_horizontal" = COLOR_BEASTY_BROWN + ) + /decl/closet_appearance/secure_closet/talon/captain extra_decals = list( "stripes_horizontal" = COLOR_GOLD diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 3f9bda8537..2f6aaf5ce2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -47,6 +47,7 @@ /obj/item/clothing/head/soft, /obj/item/clothing/suit/storage/hooded/wintercoat/cargo, /obj/item/clothing/suit/storage/hooded/wintercoat/cargo/qm, + /obj/item/clothing/head/beret/qm, /obj/item/clothing/shoes/boots/winter/supply) /obj/structure/closet/secure_closet/quartermaster/Initialize() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 4608595ff4..eecfde21bc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -12,7 +12,7 @@ /obj/item/clothing/under/rank/chief_engineer/skirt, /obj/item/clothing/head/hardhat/white, /obj/item/clothing/head/welding, - /obj/item/clothing/gloves/yellow, + /obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit /obj/item/clothing/shoes/brown, /obj/item/weapon/cartridge/ce, /obj/item/device/radio/headset/heads/ce, @@ -28,6 +28,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/engineering, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering/ce, /obj/item/clothing/shoes/boots/winter/engineering, + /obj/item/clothing/head/beret/engineering/ce, + /obj/item/clothing/head/beret/engineering/ce/white, /obj/item/weapon/tank/emergency/oxygen/engi, /obj/item/weapon/reagent_containers/spray/windowsealant) //VOREStation Add diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm index 17d67f912c..af7092d9d6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm @@ -6,6 +6,7 @@ starts_with = list( /obj/item/weapon/storage/bag/plants, /obj/item/clothing/under/rank/hydroponics, + /obj/item/clothing/gloves/botanic_leather, /obj/item/device/analyzer/plant_analyzer, /obj/item/device/radio/headset/headset_service, /obj/item/clothing/head/greenbandana, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index d8013054c8..19fb96b2f5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -142,6 +142,8 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/medical, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/cmo, /obj/item/clothing/shoes/boots/winter/medical, + /obj/item/clothing/head/beret/medical/cmo, + /obj/item/clothing/head/beret/medical/cmo/blue, /obj/item/weapon/storage/box/freezer, /obj/item/clothing/mask/gas, /obj/item/taperoll/medical, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index c9cea196b3..a23147b0c5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -47,6 +47,7 @@ /obj/item/clothing/suit/storage/hooded/wintercoat/science, /obj/item/clothing/suit/storage/hooded/wintercoat/science/rd, /obj/item/clothing/shoes/boots/winter/science, + /obj/item/clothing/head/beret/science/rd, /obj/item/weapon/bluespace_harpoon) //VOREStation Add /obj/structure/closet/secure_closet/xenoarchaeologist diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 2a210ecb95..65ea14bb4d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -61,7 +61,9 @@ /obj/item/clothing/under/suit_jacket/teal, /obj/item/clothing/under/suit_jacket/teal/skirt, /obj/item/clothing/glasses/sunglasses, - /obj/item/clothing/suit/storage/hooded/wintercoat/hop) + /obj/item/clothing/suit/storage/hooded/wintercoat/hop, + /obj/item/clothing/head/caphat/hop/beret/, + /obj/item/clothing/head/caphat/hop/beret/white) /obj/structure/closet/secure_closet/hos diff --git a/code/game/objects/structures/crates_lockers/closets/walllocker.dm b/code/game/objects/structures/crates_lockers/closets/walllocker.dm index 0d27f86015..d699305639 100644 --- a/code/game/objects/structures/crates_lockers/closets/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/closets/walllocker.dm @@ -183,3 +183,44 @@ /obj/structure/closet/walllocker_double/hydrant/east pixel_x = 32 dir = EAST + +/obj/structure/closet/walllocker_double/survival + desc = "A wall mounted storage cabinet. It contains a small amount of emergency supplies for wilderness survival, but they probably won't last very long." + name = "Emergency Survival Wall Cabinet" + icon = 'icons/obj/closets/bases/wall_double.dmi' + closet_appearance = /decl/closet_appearance/wall_double/survival + density = FALSE + anchored = TRUE + store_mobs = 0 + wall_mounted = 1 + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + + starts_with = list( + /obj/item/clothing/suit/space/emergency, + /obj/item/clothing/head/helmet/space/emergency, + /obj/item/clothing/mask/breath, + /obj/item/weapon/tank/oxygen, + /obj/item/device/suit_cooling_unit/emergency, + /obj/item/device/gps, + /obj/item/weapon/material/knife/tacknife/survival, + /obj/random/mre, + /obj/item/device/flashlight/color/yellow, + /obj/item/device/flashlight/flare, + /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle) + +/obj/structure/closet/walllocker_double/survival/north + pixel_y = 32 + dir = SOUTH + +/obj/structure/closet/walllocker_double/survival/south + pixel_y = -32 + dir = NORTH + +/obj/structure/closet/walllocker_double/survival/west + pixel_x = -32 + dir = WEST + +/obj/structure/closet/walllocker_double/survival/east + pixel_x = 32 + dir = EAST \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 5076e8b034..21034b90e5 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -451,7 +451,9 @@ /obj/item/clothing/suit/captunic, /obj/item/clothing/suit/captunic/capjacket, /obj/item/clothing/head/caphat/cap, + /obj/item/clothing/head/caphat/beret, /obj/item/clothing/under/rank/captain, + /obj/item/clothing/under/dress/dress_cap/femformal, /obj/item/clothing/shoes/brown, /obj/item/clothing/gloves/captain, /obj/item/clothing/under/dress/dress_cap, diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 1ceded17fd..6b338895e3 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -32,7 +32,7 @@ if(AM.simulated) AM.forceMove(T) //VOREStation Add Start - if(isanimal(AM)) + if(isanimal(AM)) var/mob/living/simple_mob/AMBLINAL = AM if(!AMBLINAL.mind) AMBLINAL.ghostjoin = 1 @@ -65,6 +65,11 @@ ME.attach(H) ..() +/obj/structure/largecrate/donksoftvendor + name = "\improper Donk-Soft vendor crate" + desc = "A hefty wooden crate displaying the logo of Donk-Soft. It's rather heavy." + starts_with = list(/obj/machinery/vending/donksoft) + /obj/structure/largecrate/vehicle name = "vehicle crate" desc = "Wulf Aeronautics says it comes in a box for the consumer's sake... How is this so light?" @@ -121,3 +126,7 @@ /obj/structure/largecrate/animal/chick name = "chicken crate" starts_with = list(/mob/living/simple_mob/animal/passive/chick = 5) + +/obj/structure/largecrate/animal/catslug + name = "catslug carrier" + starts_with = list(/mob/living/simple_mob/vore/alienanimals/catslug) diff --git a/code/game/objects/structures/flora/flora.dm b/code/game/objects/structures/flora/flora.dm index 96795f446d..1f7e2d0ba9 100644 --- a/code/game/objects/structures/flora/flora.dm +++ b/code/game/objects/structures/flora/flora.dm @@ -13,6 +13,7 @@ var/min_x_scale = 0.9 var/min_y_scale = 0.9 + var/removal_tool = /obj/item/weapon/shovel var/harvest_tool = null // The type of item used to harvest the plant. var/harvest_count = 0 var/destroy_on_harvest = FALSE @@ -40,23 +41,34 @@ . = ..() if(harvest_count < max_harvests) . += get_harvestable_desc() + if(harvest_tool) + var/obj/item/tool = harvest_tool + . += SPAN_NOTICE("\The [src] can be harvested with \a [initial(tool.name)].") + + if(removal_tool) + var/obj/item/tool = removal_tool + . += SPAN_NOTICE("\The [src] can be removed with \a [initial(tool.name)].") /obj/structure/flora/proc/get_harvestable_desc() return "\The [src] seems to have something hanging from it." /obj/structure/flora/attackby(var/obj/item/weapon/W, var/mob/living/user) + if(can_harvest(W)) var/harvest_spawn = pickweight(harvest_loot) var/atom/movable/AM = spawn_harvest(harvest_spawn, user) - - if(!AM) - to_chat(user, "You fail to harvest anything from \the [src].") - + if(AM) + to_chat(user, SPAN_NOTICE("You harvest \the [AM] from \the [src].")) else - to_chat(user, "You harvest \the [AM] from \the [src].") - if(harvest_count >= max_harvests && destroy_on_harvest) - qdel(src) - return + to_chat(user, SPAN_NOTICE("You fail to harvest anything from \the [src].")) + return + + if(removal_tool && istype(W, removal_tool)) + to_chat(user, SPAN_WARNING("You start uprooting \the [src]...")) + if(do_after(user, 30)) + visible_message(SPAN_NOTICE("\The [user] uproots and discards \the [src]!")) + qdel(src) + return ..(W, user) @@ -450,19 +462,64 @@ desc = "This is a tiny well lit decorative christmas tree." icon_state = "plant-xmas" +/obj/structure/flora/mushroom + name = "mushroom" + desc = "Hey, this one seems like a fun guy." + icon_state = "mush1" + icon = 'icons/obj/flora/mushrooms.dmi' + harvest_loot = list(/obj/item/weapon/reagent_containers/food/snacks/mushroomslice = 1) + harvest_tool = /obj/item/weapon/material/knife + max_harvests = 2 + min_harvests = 0 + +/obj/structure/flora/mushroom/Initialize() + . = ..() + icon_state = "mush[rand(1,4)]" + if(prob(50)) + adjust_scale(-1, 1) + pixel_x = rand(-4, 4) + +/obj/random/pottedplant + name = "random potted plant" + desc = "This is a random potted plant." + +/obj/random/pottedplant/item_to_spawn() + return pick( + prob(10);/obj/structure/flora/pottedplant, + prob(10);/obj/structure/flora/pottedplant/large, + prob(10);/obj/structure/flora/pottedplant/fern, + prob(10);/obj/structure/flora/pottedplant/overgrown, + prob(10);/obj/structure/flora/pottedplant/bamboo, + prob(10);/obj/structure/flora/pottedplant/largebush, + prob(10);/obj/structure/flora/pottedplant/thinbush, + prob(10);/obj/structure/flora/pottedplant/mysterious, + prob(10);/obj/structure/flora/pottedplant/smalltree, + prob(10);/obj/structure/flora/pottedplant/unusual, + prob(10);/obj/structure/flora/pottedplant/orientaltree, + prob(10);/obj/structure/flora/pottedplant/smallcactus, + prob(10);/obj/structure/flora/pottedplant/tall, + prob(10);/obj/structure/flora/pottedplant/sticky, + prob(10);/obj/structure/flora/pottedplant/smelly, + prob(10);/obj/structure/flora/pottedplant/small, + prob(10);/obj/structure/flora/pottedplant/aquatic, + prob(10);/obj/structure/flora/pottedplant/shoot, + prob(10);/obj/structure/flora/pottedplant/flower, + prob(10);/obj/structure/flora/pottedplant/crystal, + prob(10);/obj/structure/flora/pottedplant/subterranean, + prob(10);/obj/structure/flora/pottedplant/minitree, + prob(10);/obj/structure/flora/pottedplant/stoutbush, + prob(10);/obj/structure/flora/pottedplant/drooping, + prob(10);/obj/structure/flora/pottedplant/tropical, + prob(10);/obj/structure/flora/pottedplant/dead, + prob(10);/obj/structure/flora/pottedplant/decorative, + prob(1);/obj/structure/flora/pottedplant/xmas + ) + /obj/structure/flora/sif icon = 'icons/obj/flora/sifflora.dmi' -/obj/structure/flora/sif/attack_hand(mob/user) - if (user.a_intent == I_HURT) - if(do_after(user, 5 SECONDS)) - user.visible_message("\The [user] digs up \the [src.name].", "You dig up \the [src.name].") - qdel(src) - else - user.visible_message("\The [user] pokes \the [src.name].", "You poke \the [src.name].") - /datum/category_item/catalogue/flora/subterranean_bulbs - name = "Sivian Flora - Subterranean Bulbs" + name = "Sivian Flora - Cavebulbs" desc = "A plant which is native to Sif, it continues the trend of being a bioluminescent specimen. These plants \ are generally suited for conditions experienced in caverns, which are generally dark and cold. It is not \ known why this plant evolved to be bioluminescent, however this property has, unintentionally, allowed for \ @@ -475,7 +532,7 @@ value = CATALOGUER_REWARD_EASY /obj/structure/flora/sif/subterranean - name = "subterranean plant" + name = "subterranean bulbs" desc = "This is a subterranean plant. It's bulbous ends glow faintly." icon_state = "glowplant" light_range = 2 @@ -483,12 +540,15 @@ light_color = "#FF6633" light_on = TRUE catalogue_data = list(/datum/category_item/catalogue/flora/subterranean_bulbs) + harvest_loot = list(/obj/item/weapon/reagent_containers/food/snacks/grown/sif/cavebulbs = 1) + harvest_tool = /obj/item/weapon/material/knife + max_harvests = 2 + min_harvests = 0 /obj/structure/flora/sif/subterranean/Initialize() icon_state = "[initial(icon_state)][rand(1,2)]" . = ..() - /datum/category_item/catalogue/flora/eyebulbs name = "Sivian Flora - Eyebulbs" desc = "A plant native to Sif. On the end of its stems are bulbs which visually resemble \ @@ -497,10 +557,14 @@ value = CATALOGUER_REWARD_EASY /obj/structure/flora/sif/eyes - name = "mysterious bulbs" - desc = "This is a mysterious looking plant. They kind of look like eyeballs. Creepy." + name = "eyebulbs" + desc = "This is a mysterious-looking plant. They kind of look like eyeballs. Creepy." icon_state = "eyeplant" catalogue_data = list(/datum/category_item/catalogue/flora/eyebulbs) + harvest_tool = /obj/item/weapon/material/knife + max_harvests = 2 + min_harvests = 0 + harvest_loot = list(/obj/item/weapon/reagent_containers/food/snacks/grown/sif/eyebulbs = 1) /obj/structure/flora/sif/eyes/Initialize() icon_state = "[initial(icon_state)][rand(1,3)]" @@ -514,20 +578,20 @@ value = CATALOGUER_REWARD_TRIVIAL /obj/structure/flora/sif/tendrils - name = "stocky tendrils" + name = "wabback tendrils" desc = "A 'plant' made up of hardened moss. It has tiny hairs that bunch together to look like snow." icon_state = "grass" randomize_size = TRUE catalogue_data = list(/datum/category_item/catalogue/flora/mosstendrils) harvest_tool = /obj/item/weapon/material/knife - max_harvests = 1 - min_harvests = -4 + max_harvests = 3 + min_harvests = 0 harvest_loot = list( - /obj/item/seeds/wabback = 15, - /obj/item/seeds/blackwabback = 1, - /obj/item/seeds/wildwabback = 30 - ) + /obj/item/weapon/reagent_containers/food/snacks/grown/sif/wabback = 15, + /obj/item/weapon/reagent_containers/food/snacks/grown/sif/blackwabback = 1, + /obj/item/weapon/reagent_containers/food/snacks/grown/sif/wildwabback = 30 + ) /obj/structure/flora/sif/tendrils/Initialize() icon_state = "[initial(icon_state)][rand(1,3)]" @@ -546,26 +610,24 @@ value = CATALOGUER_REWARD_HARD /obj/structure/flora/sif/frostbelle - name = "gnarly shrub" + name = "frostbelle shrub" desc = "A stocky plant with fins bearing luminescent veins along its branches." - icon_state = "grass" + icon_state = "frostbelle" randomize_size = TRUE catalogue_data = list(/datum/category_item/catalogue/flora/frostbelle) harvest_tool = /obj/item/weapon/material/knife max_harvests = 2 - min_harvests = -4 + min_harvests = 0 harvest_loot = list( /obj/item/weapon/reagent_containers/food/snacks/frostbelle = 1 - ) + ) var/variantnum = null /obj/structure/flora/sif/frostbelle/Initialize() . = ..() - variantnum = rand(1,3) - update_icon() /obj/structure/flora/sif/frostbelle/update_icon() @@ -573,7 +635,6 @@ if(max_harvests > 0 && harvest_count < max_harvests) icon_state = "[initial(icon_state)][variantnum]" - else icon_state = initial(icon_state) diff --git a/code/game/objects/structures/flora/trees.dm b/code/game/objects/structures/flora/trees.dm index e088a15ef8..4b4921a3e2 100644 --- a/code/game/objects/structures/flora/trees.dm +++ b/code/game/objects/structures/flora/trees.dm @@ -271,12 +271,12 @@ harvest_tool = /obj/item/weapon/material/knife max_harvests = 2 - min_harvests = -4 + min_harvests = 0 harvest_loot = list( /obj/item/weapon/reagent_containers/food/snacks/siffruit = 20, - /obj/item/weapon/reagent_containers/food/snacks/grown/sifpod = 5, + /obj/item/weapon/reagent_containers/food/snacks/grown/sif/sifpod = 5, /obj/item/seeds/sifbulb = 1 - ) + ) var/light_shift = 0 diff --git a/code/game/objects/structures/ghost_pods/event_vr.dm b/code/game/objects/structures/ghost_pods/event_vr.dm index 5a7f7fa6ba..cc7cf8379a 100644 --- a/code/game/objects/structures/ghost_pods/event_vr.dm +++ b/code/game/objects/structures/ghost_pods/event_vr.dm @@ -41,7 +41,8 @@ "Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost, "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless, "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless, - "Weretiger" = /mob/living/simple_mob/vore/weretiger + "Weretiger" = /mob/living/simple_mob/vore/weretiger, + "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug ) /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M) @@ -79,11 +80,6 @@ to_chat(M, "You may be a spooky space monster, but your role is to facilitate spooky space monster roleplay, not to fight the station and kill people. You can of course eat and/or digest people as you like if OOC prefs align, but this should be done as part of roleplay. If you intend to fight the station and kill people and such, you need permission from the staff team. GENERALLY, this role should avoid well populated areas. You’re a weird spooky space monster, so the bar is probably not where you’d want to go if you intend to survive. Of course, you’re welcome to try to make friends and roleplay how you will in this regard, but something to keep in mind.") newPred.ckey = M.ckey newPred.visible_message("[newPred] emerges from somewhere!") - - if(prob(announce_prob)) - spawn(2 MINUTES) - command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert") - qdel(src) /obj/structure/ghost_pod/ghost_activated/maintpred/no_announce @@ -118,11 +114,6 @@ newMorph.ckey = M.ckey newMorph.visible_message("A morph appears to crawl out of somewhere.") - - if(prob(announce_prob)) - spawn(2 MINUTES) - command_announcement.Announce("Unexpected biosignature detected in the maintenance tunnels of [station_name()].", "Lifesign Alert") - qdel(src) /obj/structure/ghost_pod/ghost_activated/morphspawn/no_announce diff --git a/code/game/objects/structures/low_wall.dm b/code/game/objects/structures/low_wall.dm index fe91be162b..f50ea247b5 100644 --- a/code/game/objects/structures/low_wall.dm +++ b/code/game/objects/structures/low_wall.dm @@ -21,9 +21,9 @@ var/stripe_color //rad_resistance_modifier = 0.5 - // blend_objects defined on subtypes + // blend_objects defined on subtypes noblend_objects = list(/obj/machinery/door/window, /obj/machinery/door/firedoor) - + var/default_material = DEFAULT_WALL_MATERIAL var/datum/material/material var/grille_type @@ -38,9 +38,9 @@ if(!materialtype) materialtype = default_material - + material = get_material_by_name(materialtype) - + health = material.integrity return INITIALIZE_HINT_LATELOAD @@ -79,12 +79,12 @@ if(istype(W, /obj/item/stack/rods)) handle_rod_use(user, W) return - + // Making windows, different per subtype else if(istype(W, /obj/item/stack/material/glass)) handle_glass_use(user, W) return - + // Dismantling the half wall if(W.is_wrench()) for(var/obj/structure/S in loc) @@ -99,6 +99,7 @@ if(do_after(user, 40, src)) to_chat(user, "You dissasembled the low wall!") dismantle() + return // Handle placing things if(isrobot(user)) @@ -110,7 +111,7 @@ if(can_place_items() && user.unEquip(W, 0, src.loc) && user.is_preference_enabled(/datum/client_preference/precision_placement)) auto_align(W, click_parameters) return 1 - + return ..() /obj/structure/low_wall/proc/can_place_items() @@ -121,7 +122,14 @@ return FALSE return TRUE -/obj/structure/low_wall/MouseDrop_T(obj/O, mob/user, src_location, over_location, src_control, over_control, params) +/obj/structure/low_wall/MouseDrop_T(atom/movable/AM, mob/user, src_location, over_location, src_control, over_control, params) + if(AM == user) + var/mob/living/H = user + if(istype(H) && can_climb(H)) + do_climb(AM) + var/obj/O = AM + if(!istype(O)) + return if(istype(O, /obj/structure/window)) var/obj/structure/window/W = O if(Adjacent(W) && !W.anchored) @@ -187,7 +195,7 @@ to_chat(user, "Assembling window...") if(!do_after(user, 4 SECONDS, G, exclusive = TASK_ALL_EXCLUSIVE)) return - if(!G.use(2)) + if(!G.use(4)) return new window_type(loc, null, TRUE) return @@ -415,7 +423,7 @@ other_connections = list("0","0","0","0") else update_connections() - + var/percent_damage = 0 // Used for icon state of damage layer var/damage_alpha = 0 // Used for alpha blending of damage layer if (maxhealth && health < maxhealth) @@ -506,7 +514,7 @@ other_connections = list("0","0","0","0") else update_connections() - + var/img_dir var/image/I for(var/i = 1 to 4) @@ -573,14 +581,14 @@ if(locate(/obj/effect/low_wall_spawner) in oview(0, src)) warning("Duplicate low wall spawners in [x],[y],[z]!") return INITIALIZE_HINT_QDEL - + if(low_wall_type) new low_wall_type(loc) if(grille_type) new grille_type(loc) if(window_type) new window_type(loc) - + return INITIALIZE_HINT_QDEL // Bay types diff --git a/code/game/objects/structures/simple_doors.dm b/code/game/objects/structures/simple_doors.dm index 05f8fdc824..ea70fa44a6 100644 --- a/code/game/objects/structures/simple_doors.dm +++ b/code/game/objects/structures/simple_doors.dm @@ -71,6 +71,7 @@ return TryToSwitchState(user) /obj/structure/simple_door/AltClick(mob/user as mob) + . = ..() user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(!Adjacent(user)) return @@ -78,7 +79,7 @@ src.visible_message("[user] hammers on \the [src]!", "Someone hammers loudly on \the [src]!") src.add_fingerprint(user) playsound(src, knock_hammer_sound, 50, 0, 3) - else + else if(user.a_intent == I_HELP) src.visible_message("[user] knocks on \the [src].", "Someone knocks on \the [src].") src.add_fingerprint(user) playsound(src, knock_sound, 50, 0, 3) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 690164e265..5466582125 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -334,7 +334,7 @@ corner_piece = TRUE //color variations - +//Middle sofas first /obj/structure/bed/chair/sofa sofa_material = "carpet" @@ -379,92 +379,92 @@ /obj/structure/bed/chair/sofa/corner icon_state = "sofacorner" -/obj/structure/bed/chair/sofa/brown/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/brown + sofa_material = "leather" -/obj/structure/bed/chair/sofa/brown/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/brown + sofa_material = "leather" -/obj/structure/bed/chair/sofa/brown/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/brown + sofa_material = "leather" -/obj/structure/bed/chair/sofa/teal/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/teal + sofa_material = "teal" -/obj/structure/bed/chair/sofa/teal/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/teal + sofa_material = "teal" -/obj/structure/bed/chair/sofa/teal/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/teal + sofa_material = "teal" -/obj/structure/bed/chair/sofa/black/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/black + sofa_material = "black" -/obj/structure/bed/chair/sofa/black/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/black + sofa_material = "black" -/obj/structure/bed/chair/sofa/black/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/black + sofa_material = "black" -/obj/structure/bed/chair/sofa/green/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/green + sofa_material = "green" -/obj/structure/bed/chair/sofa/green/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/green + sofa_material = "green" -/obj/structure/bed/chair/sofa/green/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/green + sofa_material = "green" -/obj/structure/bed/chair/sofa/purp/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/purp + sofa_material = "purple" -/obj/structure/bed/chair/sofa/purp/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/purp + sofa_material = "purple" -/obj/structure/bed/chair/sofa/purp/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/purp + sofa_material = "purple" -/obj/structure/bed/chair/sofa/blue/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/blue + sofa_material = "blue" -/obj/structure/bed/chair/sofa/blue/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/blue + sofa_material = "blue" -/obj/structure/bed/chair/sofa/blue/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/blue + sofa_material = "blue" -/obj/structure/bed/chair/sofa/beige/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/beige + sofa_material = "beige" -/obj/structure/bed/chair/sofa/beige/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/beige + sofa_material = "beige" -/obj/structure/bed/chair/sofa/beige/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/beige + sofa_material = "beige" -/obj/structure/bed/chair/sofa/lime/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/lime + sofa_material = "lime" -/obj/structure/bed/chair/sofa/lime/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/lime + sofa_material = "lime" -/obj/structure/bed/chair/sofa/lime/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/lime + sofa_material = "lime" -/obj/structure/bed/chair/sofa/yellow/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/yellow + sofa_material = "yellow" -/obj/structure/bed/chair/sofa/yellow/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/yellow + sofa_material = "yellow" -/obj/structure/bed/chair/sofa/yellow/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/yellow + sofa_material = "yellow" -/obj/structure/bed/chair/sofa/orange/left - icon_state = "sofaend_left" +/obj/structure/bed/chair/sofa/left/orange + sofa_material = "orange" -/obj/structure/bed/chair/sofa/orange/right - icon_state = "sofaend_right" +/obj/structure/bed/chair/sofa/right/orange + sofa_material = "orange" -/obj/structure/bed/chair/sofa/orange/corner - icon_state = "sofacorner" +/obj/structure/bed/chair/sofa/corner/orange + sofa_material = "orange" diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm index 85eab74a09..6202baa585 100644 --- a/code/game/objects/structures/trash_pile_vr.dm +++ b/code/game/objects/structures/trash_pile_vr.dm @@ -69,13 +69,13 @@ var/mob/living/L = user //They're in it, and want to get out. if(L.loc == src) - var/choice = tgui_alert(usr, "Do you want to exit \the [src]?","Un-Hide?",list("Exit","Stay")) + var/choice = tgui_alert(user, "Do you want to exit \the [src]?","Un-Hide?",list("Exit","Stay")) if(choice == "Exit") if(L == hider) hider = null L.forceMove(get_turf(src)) else if(!hider) - var/choice = tgui_alert(usr, "Do you want to hide in \the [src]?","Un-Hide?",list("Hide","Stay")) + var/choice = tgui_alert(user, "Do you want to hide in \the [src]?","Un-Hide?",list("Hide","Stay")) if(choice == "Hide" && !hider) //Check again because PROMPT L.forceMove(src) hider = L @@ -200,6 +200,7 @@ prob(2);/obj/item/toy/tennis/blue, prob(2);/obj/item/toy/tennis/purple, prob(1);/obj/item/clothing/glasses/sunglasses, + prob(1);/obj/item/clothing/glasses/sunglasses/bigshot, prob(1);/obj/item/clothing/glasses/welding, prob(1);/obj/item/clothing/gloves/yellow, prob(1);/obj/item/clothing/head/bio_hood/general, @@ -231,10 +232,11 @@ prob(4);/obj/item/weapon/storage/pill_bottle/happy, prob(4);/obj/item/weapon/storage/pill_bottle/zoom, prob(4);/obj/item/seeds/ambrosiavulgarisseed, - prob(4);/obj/item/weapon/gun/energy/sizegun, + prob(4);/obj/item/weapon/gun/energy/sizegun/old, prob(3);/obj/item/weapon/material/butterfly, prob(3);/obj/item/weapon/material/butterfly/switchblade, prob(3);/obj/item/clothing/gloves/knuckledusters, + prob(3);/obj/item/clothing/gloves/heavy_engineer, prob(3);/obj/item/weapon/reagent_containers/syringe/drugs, prob(2);/obj/item/weapon/implanter/sizecontrol, prob(2);/obj/item/weapon/handcuffs/fuzzy, @@ -255,7 +257,8 @@ prob(1);/obj/item/weapon/storage/box/survival/space, prob(1);/obj/item/weapon/storage/secure/briefcase/trashmoney, prob(1);/obj/item/device/survivalcapsule/popcabin, - prob(1);/obj/item/weapon/reagent_containers/syringe/steroid) + prob(1);/obj/item/weapon/reagent_containers/syringe/steroid, + prob(1);/obj/item/capture_crystal) var/obj/item/I = new path() return I diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm index 4f83f297c7..ba7429eec4 100644 --- a/code/game/turfs/flooring/flooring.dm +++ b/code/game/turfs/flooring/flooring.dm @@ -143,7 +143,7 @@ var/list/flooring_types /decl/flooring/grass/sif // Subtype for Sif's grass. name = "growth" desc = "A natural moss that has adapted to the sheer cold climate." - flags = TURF_REMOVE_SHOVEL + flags = 0 icon = 'icons/turf/outdoors.dmi' icon_base = "grass_sif" build_type = /obj/item/stack/tile/grass/sif @@ -152,7 +152,7 @@ var/list/flooring_types /decl/flooring/grass/sif/forest name = "thick growth" desc = "A natural moss that has adapted to the sheer cold climate." - flags = TURF_REMOVE_SHOVEL + flags = 0 icon = 'icons/turf/outdoors.dmi' icon_base = "grass_sif_dark" build_type = /obj/item/stack/tile/grass/sif/forest diff --git a/code/game/turfs/simulated/fancy_shuttles.dm b/code/game/turfs/simulated/fancy_shuttles.dm index 2de10aeb38..010dced63f 100644 --- a/code/game/turfs/simulated/fancy_shuttles.dm +++ b/code/game/turfs/simulated/fancy_shuttles.dm @@ -58,13 +58,10 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /turf/simulated/wall/fancy_shuttle/Initialize(mapload, materialtype, rmaterialtype, girdertype) . = ..(mapload, MAT_STEELHULL, MAT_STEELHULL, MAT_STEELHULL) -/turf/simulated/wall/fancy_shuttle/window +/turf/simulated/wall/fancy_shuttle/low //you can see over it and it doesn't block air but you still cant walk over it + blocks_air = FALSE opacity = FALSE - icon_state = "hull_transparent" - -/turf/simulated/wall/fancy_shuttle/window/attack_generic(mob/user, damage, attack_message) - take_damage(damage) - return damage + icon_state = "hull_low" /turf/simulated/wall/fancy_shuttle/nondense density = FALSE @@ -180,6 +177,41 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /obj/effect/floor_decal/fancy_shuttle/get_cache_key(var/turf/T) return "[alpha]-[color]-[dir]-[icon_state]-[T.layer]-[icon_file]" +/** + * Shuttle Glass + */ + //OLD GLASS - USE NEW GLASS +/turf/simulated/wall/fancy_shuttle/window + opacity = FALSE + icon_state = "hull_transparent" + +/turf/simulated/wall/fancy_shuttle/window/attack_generic(mob/user, damage, attack_message) + take_damage(damage) + return damage + +//NEW GLASS +/obj/structure/window/fancy_shuttle + name = "shuttle window" + desc = "It looks rather strong. Might take a few good hits to shatter it." + icon = 'icons/turf/fancy_shuttles/_fancy_helpers.dmi' + icon_state = "hull_window" + density = TRUE + fulltile = TRUE + maxhealth = 60 + reinf = 1 + force_threshold = 7 + var/fancy_shuttle_tag + +// Trust me, this is WAY faster than the normal wall overlays shenanigans, don't worry about performance +/obj/structure/window/fancy_shuttle/update_icon() + if(fancy_shuttle_tag) // after a shuttle jump it won't be set anymore, but the shuttle jump proc will set our icon and state + var/obj/effect/fancy_shuttle/F = GLOB.fancy_shuttles[fancy_shuttle_tag] + if(!F) + warning("Fancy shuttle wall at [x],[y],[z] couldn't locate a helper with tag [fancy_shuttle_tag]") + return + icon = F.split_icon + icon_state = "walls [x - F.x],[y - F.y]" + /** * Invisible ship equipment (otherwise the same as normal) */ @@ -252,24 +284,24 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) icon = 'icons/turf/fancy_shuttles/exploration_preview.dmi' /** - * Sec shuttle - * North facing: W:13, H:18 + * Secbus shuttle + * North facing: W:11, H:16 */ -/obj/effect/fancy_shuttle/security - icon = 'icons/turf/fancy_shuttles/security_preview.dmi' - split_file = 'icons/turf/fancy_shuttles/security.dmi' -/obj/effect/fancy_shuttle_floor_preview/security - icon = 'icons/turf/fancy_shuttles/security_preview.dmi' +/obj/effect/fancy_shuttle/secbus + icon = 'icons/turf/fancy_shuttles/secbus_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/secbus.dmi' +/obj/effect/fancy_shuttle_floor_preview/secbus + icon = 'icons/turf/fancy_shuttles/secbus_preview.dmi' /** - * Med shuttle - * North facing: W:13, H:18 + * Medbus shuttle + * North facing: W:11, H:16 */ -/obj/effect/fancy_shuttle/medical - icon = 'icons/turf/fancy_shuttles/medical_preview.dmi' - split_file = 'icons/turf/fancy_shuttles/medical.dmi' -/obj/effect/fancy_shuttle_floor_preview/medical - icon = 'icons/turf/fancy_shuttles/medical_preview.dmi' +/obj/effect/fancy_shuttle/medbus + icon = 'icons/turf/fancy_shuttles/medbus_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/medbus.dmi' +/obj/effect/fancy_shuttle_floor_preview/medbus + icon = 'icons/turf/fancy_shuttles/medbus_preview.dmi' /** * Orange line tram @@ -283,7 +315,7 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /** * Tour bus - * North facing: W:7, H:13 + * North facing: W:7, H:12 */ /obj/effect/fancy_shuttle/tourbus icon = 'icons/turf/fancy_shuttles/tourbus_preview.dmi' @@ -291,6 +323,16 @@ GLOBAL_LIST_EMPTY(fancy_shuttles) /obj/effect/fancy_shuttle_floor_preview/tourbus icon = 'icons/turf/fancy_shuttles/tourbus_preview.dmi' +/** + * Stellar Delight Shuttle + * North facing: W:9, H:14 + */ +/obj/effect/fancy_shuttle/sd_shuttle + icon = 'icons/turf/fancy_shuttles/sd_shuttle_preview.dmi' + split_file = 'icons/turf/fancy_shuttles/sd_shuttle.dmi' +/obj/effect/fancy_shuttle_floor_preview/sd_shuttle + icon = 'icons/turf/fancy_shuttles/sd_shuttle_preview.dmi' + /** * Delivery shuttle * North facing: W:8, H:10 diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 1d37f4b47a..a0caed0b98 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -175,3 +175,10 @@ to_chat(user, span("notice", "You deconstruct \the [src].")) ChangeTurf(get_base_turf_by_area(src), preserve_outdoors = TRUE) return TRUE + +/turf/simulated/floor/AltClick(mob/user) + if(isliving(user)) + var/mob/living/livingUser = user + if(try_graffiti(livingUser, livingUser.get_active_hand())) + return + . = ..() \ No newline at end of file diff --git a/code/game/turfs/simulated/floor_attackby.dm b/code/game/turfs/simulated/floor_attackby.dm index 1168f7a081..279cf8a5b1 100644 --- a/code/game/turfs/simulated/floor_attackby.dm +++ b/code/game/turfs/simulated/floor_attackby.dm @@ -9,8 +9,12 @@ attack_tile(C, L) // Be on help intent if you want to decon something. return - if(!(C.is_screwdriver() && flooring && (flooring.flags & TURF_REMOVE_SCREWDRIVER)) && try_graffiti(user, C)) - return + if(!(C.has_tool_quality(TOOL_SCREWDRIVER) && flooring && (flooring.flags & TURF_REMOVE_SCREWDRIVER))) + if(isliving(user)) + var/mob/living/L = user + if(L.a_intent == I_HELP) + if(try_graffiti(L, C)) // back by unpopular demand + return // Multi-z roof building if(istype(C, /obj/item/stack/tile/roofing)) diff --git a/code/game/turfs/simulated/outdoors/dirt.dm b/code/game/turfs/simulated/outdoors/dirt.dm index b02bbdd9f0..e4e97388f9 100644 --- a/code/game/turfs/simulated/outdoors/dirt.dm +++ b/code/game/turfs/simulated/outdoors/dirt.dm @@ -1,7 +1,8 @@ -/turf/simulated/floor/outdoors/dirt - name = "dirt" - desc = "Quite dirty!" - icon_state = "dirt-dark" - edge_blending_priority = 2 - turf_layers = list(/turf/simulated/floor/outdoors/rocks) - initial_flooring = /decl/flooring/dirt +/turf/simulated/floor/outdoors/dirt + name = "dirt" + desc = "Quite dirty!" + icon_state = "dirt-dark" + edge_blending_priority = 2 + turf_layers = list(/turf/simulated/floor/outdoors/rocks) + initial_flooring = /decl/flooring/dirt + can_dig = TRUE diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 65d0e472f1..41aa084773 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -7,6 +7,7 @@ var/list/grass_types = list( icon_state = "grass0" edge_blending_priority = 4 initial_flooring = /decl/flooring/grass/outdoors // VOREStation Edit + can_dig = TRUE turf_layers = list( /turf/simulated/floor/outdoors/rocks, /turf/simulated/floor/outdoors/dirt @@ -42,7 +43,6 @@ var/list/grass_types = list( var/tree_chance = 2 /* animal_chance = 0.5 - animal_types = list( /mob/living/simple_mob/animal/sif/diyaab = 10, /mob/living/simple_mob/animal/sif/glitterfly = 2, @@ -96,4 +96,3 @@ var/list/grass_types = list( /obj/structure/flora/sif/eyes = 5, /obj/structure/flora/sif/tendrils = 30 ) - diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 84c91366f1..07d382a161 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -24,6 +24,42 @@ var/list/turf_edge_cache = list() // When a turf gets demoted or promoted, this list gets adjusted. The top-most layer is the layer on the bottom of the list, due to how pop() works. var/list/turf_layers = list(/turf/simulated/floor/outdoors/rocks) + var/can_dig = FALSE + var/loot_count + +/turf/simulated/floor/outdoors/proc/get_loot_type() + if(loot_count && prob(60)) + return pick( \ + 12;/obj/item/weapon/reagent_containers/food/snacks/worm, \ + 1;/obj/item/weapon/material/knife/machete/hatchet/stone \ + ) + +/turf/simulated/floor/outdoors/Initialize(mapload) + . = ..() + if(can_dig && prob(33)) + loot_count = rand(1,3) + +/turf/simulated/floor/outdoors/attackby(obj/item/C, mob/user) + + if(can_dig && istype(C, /obj/item/weapon/shovel)) + to_chat(user, SPAN_NOTICE("\The [user] begins digging into \the [src] with \the [C].")) + var/delay = (3 SECONDS * C.toolspeed) + user.setClickCooldown(delay) + if(do_after(user, delay, src)) + if(!(locate(/obj/machinery/portable_atmospherics/hydroponics/soil) in contents)) + var/obj/machinery/portable_atmospherics/hydroponics/soil/soil = new(src) + user.visible_message(SPAN_NOTICE("\The [src] digs \a [soil] into \the [src].")) + else + var/loot_type = get_loot_type() + if(loot_type) + loot_count-- + var/obj/item/loot = new loot_type(src) + to_chat(user, SPAN_NOTICE("You dug up \a [loot]!")) + else + to_chat(user, SPAN_NOTICE("You didn't find anything of note in \the [src].")) + return + + . = ..() /turf/simulated/floor/Initialize(mapload) if(is_outdoors()) @@ -80,6 +116,7 @@ var/list/turf_edge_cache = list() icon_state = "mud_dark" edge_blending_priority = 3 initial_flooring = /decl/flooring/mud + can_dig = TRUE /turf/simulated/floor/outdoors/rocks name = "rocks" diff --git a/code/game/turfs/simulated/outdoors/outdoors_attackby.dm b/code/game/turfs/simulated/outdoors/outdoors_attackby.dm index a59676834f..1a969fee98 100644 --- a/code/game/turfs/simulated/outdoors/outdoors_attackby.dm +++ b/code/game/turfs/simulated/outdoors/outdoors_attackby.dm @@ -1,15 +1,7 @@ // this code here enables people to dig up worms from certain tiles. /turf/simulated/floor/outdoors/grass/attackby(obj/item/weapon/S as obj, mob/user as mob) - if(istype(S, /obj/item/weapon/shovel)) - to_chat(user, "You begin to dig in \the [src] with your [S].") - if(do_after(user, 4 SECONDS * S.toolspeed)) - to_chat(user, "\The [src] has been dug up, a worm pops from the ground.") - new /obj/item/weapon/reagent_containers/food/snacks/worm(src) - else - to_chat(user, "You decide to not finish digging in \the [src].") - else if(istype(S, /obj/item/stack/tile/floor)) + if(istype(S, /obj/item/stack/tile/floor)) ChangeTurf(/turf/simulated/floor, preserve_outdoors = TRUE) return - else - ..() \ No newline at end of file + . = ..() \ No newline at end of file diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index 036cfd5728..fb07754d1e 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -130,9 +130,10 @@ /turf/simulated/wall/attackby(var/obj/item/weapon/W, var/mob/user) user.setClickCooldown(user.get_attack_speed(W)) - - if(!construction_stage && try_graffiti(user, W)) - return + + if(!construction_stage && user.a_intent == I_HELP) + if(try_graffiti(user,W)) + return if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") @@ -239,6 +240,7 @@ return // Basic dismantling. + var/dismantle_toolspeed = 0 if(isnull(construction_stage) || !reinf_material) var/cut_delay = 60 - material.cut_delay @@ -258,6 +260,7 @@ else if(istype(W,/obj/item/weapon/melee/energy/blade)) dismantle_sound = "sparks" dismantle_verb = "slicing" + dismantle_toolspeed = 1 cut_delay *= 0.5 else if(istype(W,/obj/item/weapon/pickaxe)) var/obj/item/weapon/pickaxe/P = W @@ -271,7 +274,7 @@ if(dismantle_sound) playsound(src, dismantle_sound, 100, 1) - if(cut_delay<0) + if(cut_delay < 0) cut_delay = 0 if(!do_after(user,cut_delay * W.toolspeed)) @@ -385,7 +388,7 @@ construction_stage = 0 user.update_examine_panel(src) update_icon() - to_chat(user, "The slice through the support rods.") + to_chat(user, "You slice through the support rods.") return if(0) if(W.is_crowbar()) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index d0bb6d5640..f664e73b40 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -333,3 +333,10 @@ ChangeTurf(/turf/simulated/floor/airless, preserve_outdoors = TRUE) return TRUE return FALSE + +/turf/simulated/wall/AltClick(mob/user) + if(isliving(user)) + var/mob/living/livingUser = user + if(try_graffiti(livingUser, livingUser.get_active_hand())) + return + . = ..() \ No newline at end of file diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index bcd53322b8..9a4039cb1c 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -310,7 +310,7 @@ /turf/proc/try_graffiti(var/mob/vandal, var/obj/item/tool) - if(!tool.sharp || !can_engrave()) + if(!tool || !tool.sharp || !can_engrave()) return FALSE if(jobban_isbanned(vandal, "Graffiti")) @@ -407,4 +407,4 @@ return // We were the the B-side in a turf translation /turf/proc/post_translate_B(var/turf/A) - return \ No newline at end of file + return diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm index 492f3ef65b..5c51101c52 100644 --- a/code/game/turfs/turf_changing.dm +++ b/code/game/turfs/turf_changing.dm @@ -28,7 +28,7 @@ if(N == /turf/space) var/turf/below = GetBelow(src) - if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && (!istype(below, /turf/unsimulated/wall) && !istype(below, /turf/simulated/sky))) // VOREStation Edit: Weird open space + if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && !(src.z in using_map.below_blocked_levels) && (!istype(below, /turf/unsimulated/wall) && !istype(below, /turf/simulated/sky))) // VOREStation Edit: Weird open space N = /turf/simulated/open var/obj/fire/old_fire = fire diff --git a/code/game/turfs/weird_turfs_vr.dm b/code/game/turfs/weird_turfs_vr.dm new file mode 100644 index 0000000000..b1ef1fa4fb --- /dev/null +++ b/code/game/turfs/weird_turfs_vr.dm @@ -0,0 +1,131 @@ +/turf/simulated/floor/weird_things + icon = 'icons/turf/flooring/weird_vr.dmi' + +/turf/simulated/floor/weird_things/dark + name = "dark" + desc = "It's a strange, impenetrable darkness." + icon_state = "dark" + can_dirty = FALSE + +/turf/simulated/floor/weird_things/dark/Initialize(mapload) + . = ..() + if(prob(5)) + add_glow() + +/turf/simulated/floor/weird_things/dark/Crossed(O) + . = ..() + if(!isliving(O)) + return + cut_overlays() + if(prob(5)) + add_glow() + if(istype(O, /mob/living/carbon/human)) + var/mob/living/carbon/human/L = O + if(istype(L.species, /datum/species/crew_shadekin)) + L.halloss += 5 + if(prob(50)) + to_chat(L, "The more you move through this darkness, the more you can feel a throbbing, shooting ache in your bones.") + if(prob(5)) + L.visible_message("[L]'s body gives off a faint, sparking, haze...", "Your body gives off a faint, sparking, haze...", runemessage = "gives off a faint, sparking haze") + else if(istype(L.species, /datum/species/shadekin)) + var/obj/item/organ/internal/brain/shadekin/B = L.internal_organs_by_name["brain"] + B.dark_energy += 10 + if(prob(10)) + to_chat(L, "You can feel the energy flowing into you!") + else + if(prob(0.25)) + to_chat(L, "The darkness seethes under your feet...") + L.hallucination += 50 + +/turf/simulated/floor/weird_things/dark/proc/add_glow() + var/choice = "overlay-[rand(1,6)]" + var/image/i = image('icons/turf/flooring/weird_vr.dmi', choice) + i.plane = PLANE_LIGHTING_ABOVE + add_overlay(i) + +/turf/simulated/floor/weird_things/dark/ChangeTurf() + . = ..() + cut_overlays() + +/turf/unsimulated/wall/dark + name = "dark" + desc = "It's a strange, impenetrable darkness." + icon = 'icons/turf/flooring/weird_vr.dmi' + icon_state = "dark" + +/turf/unsimulated/wall/dark/Initialize(mapload) + . = ..() + if(prob(5)) + add_glow() + +/turf/unsimulated/wall/dark/proc/add_glow() + var/choice = "overlay-[rand(1,6)]" + var/image/i = image('icons/turf/flooring/weird_vr.dmi', choice) + i.plane = PLANE_LIGHTING_ABOVE + add_overlay(i) + +/turf/unsimulated/wall/dark/ChangeTurf() + . = ..() + cut_overlays() + + +/turf/unsimulated/floor/dark + name = "dark" + desc = "It's a strange, impenetrable darkness." + icon = 'icons/turf/flooring/weird_vr.dmi' + icon_state = "dark" + +/turf/unsimulated/floor/dark/Initialize(mapload) + . = ..() + if(prob(5)) + add_glow() + +/turf/unsimulated/floor/dark/Crossed(O) + . = ..() + if(!isliving(O)) + return + cut_overlays() + if(prob(5)) + add_glow() + if(istype(O, /mob/living/carbon/human)) + var/mob/living/carbon/human/L = O + if(istype(L.species, /datum/species/crew_shadekin)) + L.halloss += 5 + if(prob(50)) + to_chat(L, "The more you move through this darkness, the more you can feel a throbbing, shooting ache in your bones.") + if(prob(5)) + L.visible_message("[L]'s body gives off a faint, sparking, haze...", "Your body gives off a faint, sparking, haze...", runemessage = "gives off a faint, sparking haze") + else if(istype(L.species, /datum/species/shadekin)) + var/obj/item/organ/internal/brain/shadekin/B = L.internal_organs_by_name["brain"] + B.dark_energy += 10 + if(prob(10)) + to_chat(L, "You can feel the energy flowing into you!") + else + if(prob(0.25)) + to_chat(L, "The darkness seethes under your feet...") + L.hallucination += 50 + +/turf/unsimulated/floor/dark/proc/add_glow() + var/flip = rand(1,2) + var/choice + var/choiceb + if(flip == 1) + choice = "overlay-[rand(1,6)]" + if(flip == 2) + choice = "overlay-[rand(7,12)]" + var/image/i = image('icons/turf/flooring/weird_vr.dmi', choice) + i.plane = PLANE_LIGHTING_ABOVE + add_overlay(i) + if(prob(10)) + if(flip == 1) + choiceb = "overlay-[rand(7,12)]" + if(flip == 2) + choiceb = "overlay-[rand(1,6)]" + var/image/ii = image('icons/turf/flooring/weird_vr.dmi', choiceb) + add_overlay(ii) + + + +/turf/unsimulated/floor/dark/ChangeTurf() + . = ..() + cut_overlays() \ No newline at end of file diff --git a/code/global_vr.dm b/code/global_vr.dm index 1187b4a5dc..6ed3403aaf 100644 --- a/code/global_vr.dm +++ b/code/global_vr.dm @@ -1,3 +1,6 @@ +var/list/vinestart = list() +var/list/verminstart = list() + var/list/awayabductors = list() // List of scatter landmarks for Abductors in Gateways var/list/eventdestinations = list() // List of scatter landmarks for VOREStation event portals var/list/eventabductors = list() // List of scatter landmarks for VOREStation abductor portals diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 49d9e464b9..c7180d0a49 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -77,7 +77,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == "Engineering") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Engineer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Atmospheric Technician") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") @@ -96,7 +96,7 @@ var/savefile/Banlistjob AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Cyborg") return 1 if(rank == "CE_Station_Engineer") - AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Station Engineer") + AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Engineer") AddBanjob(ckey, computerid, reason, bannedby, temp, minutes, "Chief Engineer") return 1 if(rank == "CE_Atmospheric_Tech") diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm index 140ce75393..058955799e 100644 --- a/code/modules/admin/verbs/resize.dm +++ b/code/modules/admin/verbs/resize.dm @@ -9,7 +9,7 @@ if(!size_multiplier) return //cancelled - size_multiplier = clamp(size_multiplier, 0.01, 1000) + size_multiplier = clamp(size_multiplier, -50, 50) //VOREStation Edit - being able to make people upside down is fun. Also 1000 is way, WAY too big. Honestly 50 is too big but at least you can see 50 and it doesn't break the rendering. var/can_be_big = L.has_large_resize_bounds() var/very_big = is_extreme_size(size_multiplier) diff --git a/code/modules/admin/verbs/smite_vr.dm b/code/modules/admin/verbs/smite_vr.dm index 51e4411906..750a8c0bea 100644 --- a/code/modules/admin/verbs/smite_vr.dm +++ b/code/modules/admin/verbs/smite_vr.dm @@ -34,7 +34,7 @@ if(!Ts) return //Didn't find shadekin spawn turf - var/mob/living/simple_mob/shadekin/red/ai/shadekin = new(Ts) + var/mob/living/simple_mob/shadekin/red/shadekin = new(Ts) //Abuse of shadekin shadekin.real_name = shadekin.name shadekin.init_vore() diff --git a/code/modules/ai/ai_holder.dm b/code/modules/ai/ai_holder.dm index 86ab848733..8a101decd7 100644 --- a/code/modules/ai/ai_holder.dm +++ b/code/modules/ai/ai_holder.dm @@ -131,7 +131,7 @@ IF_VV_OPTION("mass_edit_finish") if(!check_rights(R_ADMIN)) return - + var/list/before = snapshot //This PROBABLY works, right? snapshot = null var/list/after = vars.Copy() //'vars' appears to be special in that vars.Copy produces a flat list of keys with no values. It seems that 'vars[key]' is handled somewhere in the byond engine differently than normal lists. @@ -183,7 +183,7 @@ found += M choices["[typechoice] ([found.len])"] = found // Prettified name for the user input below) searching = found // Now we only search the list we just made, because of the order of our types list, each subsequent list will be a subset of the one we just finished - + var/choice = tgui_input_list(usr,"Based on your AI holder's mob location, we'll edit mobs on Z [levels_working.Join(",")]. What types do you want to alter?", "Types", choices) if(!choice) href_list["datumrefresh"] = "\ref[src]" @@ -201,7 +201,7 @@ L.ai_holder.vars[newvar] = after[newvar] else to_chat(usr,"Skipping unavailable var '[newvar]' on: [L] [ADMIN_COORDJMP(L)]") - + to_chat(usr,"Mass AI edit done.") href_list["datumrefresh"] = "\ref[src]" @@ -291,6 +291,9 @@ // 'Tactical' processes such as moving a step, meleeing an enemy, firing a projectile, and other fairly cheap actions that need to happen quickly. /datum/ai_holder/proc/handle_tactics() + if(!istype(holder) || QDELETED(holder)) + qdel(src) + return if(holder.key && !autopilot) return handle_special_tactic() @@ -298,6 +301,9 @@ // 'Strategical' processes that are more expensive on the CPU and so don't get run as often as the above proc, such as A* pathfinding or robust targeting. /datum/ai_holder/proc/handle_strategicals() + if(!istype(holder) || QDELETED(holder)) + qdel(src) + return if(holder.key && !autopilot) return handle_special_strategical() diff --git a/code/modules/ai/ai_holder_combat.dm b/code/modules/ai/ai_holder_combat.dm index 29c58e5670..e21d8de5b2 100644 --- a/code/modules/ai/ai_holder_combat.dm +++ b/code/modules/ai/ai_holder_combat.dm @@ -310,15 +310,20 @@ // Kill common obstacle in the way like tables. var/obj/structure/obstacle = locate(/obj/structure, problem_turf) - if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille) || istype(obstacle, /obj/effect/weaversilk/wall)) //VOREStation Edit: spdr + if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille)) ai_log("destroy_surroundings() : Attacking generic structure.", AI_LOG_INFO) return melee_attack(obstacle) + var/obj/effect/weaversilk/web = locate(/obj/effect/weaversilk, problem_turf) + if(istype(web, /obj/effect/weaversilk/wall)) //VOREStation Edit: spdr + ai_log("destroy_surroundings() : Attacking weaversilk effect.", AI_LOG_INFO) + return melee_attack(web) + for(var/obj/machinery/door/D in problem_turf) // Required since firelocks take up the same turf. if(D.density) ai_log("destroy_surroundings() : Attacking closed door.", AI_LOG_INFO) return melee_attack(D) - + // Should always be last thing attempted if(!problem_turf.opacity) ai_log("destroy_surroundings() : Attacking a transparent (window?) turf.", AI_LOG_INFO) diff --git a/code/modules/ai/ai_holder_targeting.dm b/code/modules/ai/ai_holder_targeting.dm index 560ad61a06..e3d98f1620 100644 --- a/code/modules/ai/ai_holder_targeting.dm +++ b/code/modules/ai/ai_holder_targeting.dm @@ -4,7 +4,8 @@ var/hostile = FALSE // Do we try to hurt others? var/retaliate = FALSE // Attacks whatever struck it first. Mobs will still attack back if this is false but hostile is true. var/mauling = FALSE // Attacks unconscious mobs - var/handle_corpse = FALSE // Allows AI to acknowledge corpses (e.g. nurse spiders) + var/unconscious_vore = FALSE //VOREStation Add - allows a mob to go for unconcious targets IF their vore prefs align + var/handle_corpse = FALSE // Allows AI to acknowledge corpses (e.g. nurse spiders) var/atom/movable/target = null // The thing (mob or object) we're trying to kill. var/atom/movable/preferred_target = null// If set, and if given the chance, we will always prefer to target this over other options. @@ -129,6 +130,14 @@ if(L.stat == UNCONSCIOUS) // Do we have mauling? Yes? Then maul people who are sleeping but not SSD if(mauling) return TRUE + //VOREStation Add Start + else if(unconscious_vore && L.allowmobvore) + var/mob/living/simple_mob/vore/eater = holder + if(eater.will_eat(L)) + return TRUE + else + return FALSE + //VOREStation Add End else return FALSE if(holder.IIsAlly(L)) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index eecae83186..cf55eacec4 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -49,8 +49,6 @@ //TODO: insert cause of death handling/wound simulation here if(src.corpseuniform) M.equip_to_slot_or_del(new src.corpseuniform(M), slot_w_uniform) - if(src.corpsesuit) - M.equip_voidsuit_to_slot_or_del_with_refit(new src.corpsesuit(M), slot_wear_suit, src.species) if(src.corpseshoes) M.equip_to_slot_or_del(new src.corpseshoes(M), slot_shoes) if(src.corpsegloves) @@ -61,8 +59,6 @@ M.equip_to_slot_or_del(new src.corpseglasses(M), slot_glasses) if(src.corpsemask) M.equip_to_slot_or_del(new src.corpsemask(M), slot_wear_mask) - if(src.corpsehelmet) - M.equip_voidhelm_to_slot_or_del_with_refit(new src.corpsehelmet(M), slot_head, src.species) if(src.corpsebelt) M.equip_to_slot_or_del(new src.corpsebelt(M), slot_belt) if(src.corpsepocket1) @@ -90,6 +86,11 @@ W.assignment = corpseidjob M.set_id_info(W) M.equip_to_slot_or_del(W, slot_wear_id) + // Do suit last to avoid equipping issues + if(src.corpsehelmet) + M.equip_voidhelm_to_slot_or_del_with_refit(new src.corpsehelmet(M), slot_head, src.species) + if(src.corpsesuit) + M.equip_voidsuit_to_slot_or_del_with_refit(new src.corpsesuit(M), slot_wear_suit, src.species) @@ -169,8 +170,8 @@ corpsegloves = /obj/item/clothing/gloves/yellow corpsehelmet = /obj/item/clothing/head/hardhat corpseid = 1 - corpseidjob = "Station Engineer" - corpseidaccess = "Station Engineer" + corpseidjob = "Engineer" + corpseidaccess = "Engineer" /obj/effect/landmark/corpse/engineer/rig corpsesuit = /obj/item/clothing/suit/space/void/engineering diff --git a/code/modules/busy_space_vr/air_traffic.dm b/code/modules/busy_space_vr/air_traffic.dm index a71fb888df..8a3e5a1607 100644 --- a/code/modules/busy_space_vr/air_traffic.dm +++ b/code/modules/busy_space_vr/air_traffic.dm @@ -116,6 +116,9 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",30;"dockingrequestgeneric",30;"dockingrequestdenied",30;"dockingrequestdelayed",30;"dockingrequestsupply",30;"dockingrequestrepair",30;"dockingrequestmedical",30;"dockingrequestsecurity",30;"undockingrequest","normal",30;"undockingdenied",30;"undockingdelayed",300;"slogan") else if((org_type == "government" || org_type == "neutral" || org_type == "military")) chatter_type = pick(5;"emerg",25;"policescan",25;"traveladvisory",30;"pathwarning",30;"dockingrequestgeneric",30;"dockingrequestdenied",30;"dockingrequestdelayed",30;"dockingrequestsupply",30;"dockingrequestrepair",30;"dockingrequestmedical",30;"dockingrequestsecurity",30;"undockingrequest","normal",30;"undockingdenied",30;"undockingdelayed") + else if(org_type == "spacer") + chatter_type = pick(5;"emerg",15;"policescan",15;"traveladvisory",5;"pathwarning",10;"dockingrequestgeneric",30;"dockingrequestdenied",10;"dockingrequestdelayed",30;"dockingrequestsupplly",10;"dockingrequestrepair",20;"dockingrequestmedical",20;"dockingrequestsecurity",30;"undockingrequest","normal",10;"undockingdenied",30;"undockingdelayed") + //the following filters *always* fire their 'unique' event when they're tripped, simply because the conditions behind them are quite rare to begin with else if(org_type == "smuggler" && org_type2 != "system defense") //just straight up funnel smugglers into always being caught, otherwise we get them asking for traffic info and stuff chatter_type = "policeflee" @@ -141,7 +144,7 @@ var/datum/lore/atc_controller/atc = new/datum/lore/atc_controller //to_world("DEBUG OUTPUT 2: [secondowner], [secondprefix], [secondshipname], [org_type2]") //to_world("DEBUG OUTPUT 3: Chose [chatter_type]") //DEBUG BLOCK ENDS - + var/yes = prob(90) //Chance for them to say yes vs no var/request = pick(requests) diff --git a/code/modules/busy_space_vr/organizations.dm b/code/modules/busy_space_vr/organizations.dm index cd3a707a63..f2d719968a 100644 --- a/code/modules/busy_space_vr/organizations.dm +++ b/code/modules/busy_space_vr/organizations.dm @@ -2665,6 +2665,62 @@ "Expeditionary Fleet HQ" ) +/datum/lore/organization/gov/altevian_hegemony + name = "The Altevian Hegemony" + short_name = "Altevian Hegemony " + acronym = "AH" + desc = "The Altevians are a space-faring race of rodents that resemble Earth-like rats. \ + They do not have a place they call home in terms of a planet, and instead have massive multiple-kilometer-long colony-ships \ + that are constantly on the move and typically keep operations outside of known populated systems to not eat the resources from others. \ + Their primary focus is trade and slavage operations and can be expected to be seen around both densely populated and empty systems for their work." + history = "" + work = "salvage and trade operators" + headquarters = "AH-CV Migrant" + motto = "" + org_type = "spacer" + + ship_prefixes = list("AH-DV" = "a diplomatic", "AH-EV" = "an exploration", "AH-FV" = "a fueling", "AH-FV" = "a cargo", "AH-SV" = "a research", "AH-TV" = "a colony-transporter", "AH-RV" = "an emergency response", "AH-RV" = "a response", "AH-MV" = "a medical") + ship_names = list( + "Platinum", + "Warson", + "Mane", + "Holland", + "Arauz", + "Diamond", + "Gold", + "Steam", + "Boiler", + "Slip", + "Lavender", + "Wheel", + "Stuntson", + "Desto", + "Palos", + "Matterson", + "Mill", + "Smoke", + "Squeson", + "Rabion", + "Strikedown", + "Cluster", + "Raling", + "Archaeologist", + "Beaker" + ) + destination_names = list( + "the AH-CV Migrant flagship", + "one of our research colony-ships", + "the AH-CV Lotus", + "the AH-CV Anvil", + "the AH-CV Generations", + "the AH-CV Galley", + "the AH-CV Prosperity", + "the AH-CV Kitsap", + "the AH-CV Diamondback", + "one of our colony-ships", + "one of our production fleets" + ) + ////////////////////////////////////////////////////////////////////////////////// // Military @@ -3022,4 +3078,4 @@ i-- //ex: "Phalanx One-Niner", "Sledgehammer Actual" (CO/VIP), "Kodiak Seven-Four", "Tomahawk Two-Zero" - //probably a more elegant (read: fancier) way to do the second part but fuck it, this works just fine + //probably a more elegant (read: fancier) way to do the second part but fuck it, this works just fine \ No newline at end of file diff --git a/code/modules/catalogue/catalogue_data_vr.dm b/code/modules/catalogue/catalogue_data_vr.dm index 06c3f9c51a..52d00f4a74 100644 --- a/code/modules/catalogue/catalogue_data_vr.dm +++ b/code/modules/catalogue/catalogue_data_vr.dm @@ -60,8 +60,8 @@ desc = "The Vulpkanin are the remnants of an ancient precursor which resided in the Coreward Periphery \ 3000 to 4000 years ago, residing on a planet called “Altam”. Vulpkanin diverged from the precursors due \ to heavy isolation after the fall, presumably due to being a freshly found colony. A lack of material support \ - regressed their technology to pre-industrial standards until being found again by Humanity. At this point \ - they have formed an early spacefaring society and accession into the Diaspora went over relatively smoothly. \ + regressed their technology to pre-industrial standards, from which they had to recover from in long and hard years. At the point \ + of discovery by human explorers, they have formed an early interplanetary society and accession into the Diaspora went over relatively smoothly. \ Vulpkanin are the closest successor to the precursors, genetically, although genelocked devices still do not \ recognize them due to genetic drift." value = CATALOGUER_REWARD_TRIVIAL diff --git a/code/modules/client/preference_setup/antagonism/02_candidacy.dm b/code/modules/client/preference_setup/antagonism/02_candidacy.dm index fae7e35118..d922f10669 100644 --- a/code/modules/client/preference_setup/antagonism/02_candidacy.dm +++ b/code/modules/client/preference_setup/antagonism/02_candidacy.dm @@ -21,6 +21,8 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set "lost drone" = 1, // 16 "maint pred" = 1, // 17 "morph" = 1, // 18 + "corgi" = 1, // 19 + "cursed sword" = 1, // 20 //VOREStation Add End ) diff --git a/code/modules/client/preference_setup/general/03_body.dm b/code/modules/client/preference_setup/general/03_body.dm index 13128f55c7..6cdfa38f13 100644 --- a/code/modules/client/preference_setup/general/03_body.dm +++ b/code/modules/client/preference_setup/general/03_body.dm @@ -687,9 +687,9 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O reset_limbs() // Safety for species with incompatible manufacturers; easier than trying to do it case by case. pref.body_markings.Cut() // Basically same as above. - + pref.sanitize_body_styles() - + var/min_age = get_min_age() var/max_age = get_max_age() pref.age = max(min(pref.age, max_age), min_age) @@ -796,7 +796,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O var/list/valid_facialhairstyles = pref.get_valid_facialhairstyles() var/new_f_style = tgui_input_list(user, "Choose your character's facial-hair style:", "Character Preference", valid_facialhairstyles, pref.f_style) - if(new_f_style && has_flag(mob_species, HAS_HAIR_COLOR) && CanUseTopic(user)) + if(new_f_style && CanUseTopic(user)) pref.f_style = new_f_style return TOPIC_REFRESH_UPDATE_PREVIEW diff --git a/code/modules/client/preference_setup/general/06_flavor.dm b/code/modules/client/preference_setup/general/06_flavor.dm index f03281d0d6..ac1c42d5d0 100644 --- a/code/modules/client/preference_setup/general/06_flavor.dm +++ b/code/modules/client/preference_setup/general/06_flavor.dm @@ -88,7 +88,8 @@ /datum/category_item/player_setup_item/general/flavor/proc/SetFlavorText(mob/user) var/HTML = "" HTML += "
" - HTML += "Set Flavour Text
" + HTML += "Set Flavor Text
" + HTML += "Note: This is not *literal* flavor of your character. This is visual description of what they look like.
" HTML += "
" HTML += "General: " HTML += TextPreview(pref.flavor_texts["general"]) diff --git a/code/modules/client/preference_setup/loadout/loadout.dm b/code/modules/client/preference_setup/loadout/loadout.dm index 299e742cfd..61603361f5 100644 --- a/code/modules/client/preference_setup/loadout/loadout.dm +++ b/code/modules/client/preference_setup/loadout/loadout.dm @@ -65,10 +65,10 @@ var/list/gear_datums = list() for(var/gear_name in gear_datums) var/datum/gear/G = gear_datums[gear_name] - if(G.whitelisted && config.loadout_whitelist != LOADOUT_WHITELIST_OFF) + if(G.whitelisted && config.loadout_whitelist != LOADOUT_WHITELIST_OFF && pref.client) //VOREStation Edit. if(config.loadout_whitelist == LOADOUT_WHITELIST_STRICT && G.whitelisted != pref.species) continue - if(config.loadout_whitelist == LOADOUT_WHITELIST_LAX && !is_alien_whitelisted(preference_mob(), GLOB.all_species[G.whitelisted])) + if(config.loadout_whitelist == LOADOUT_WHITELIST_LAX && !is_alien_whitelisted(preference_mob(), GLOB.all_species[G.whitelisted])) continue if(max_cost && G.cost > max_cost) continue @@ -169,7 +169,7 @@ var/list/gear_datums = list() if(ticked) . += "" for(var/datum/gear_tweak/tweak in G.gear_tweaks) - . += " [tweak.get_contents(get_tweak_metadata(G, tweak))]" + . += " [tweak.get_contents(get_tweak_metadata(G, tweak))]" . += "" . += "" . = jointext(., null) @@ -205,7 +205,7 @@ var/list/gear_datums = list() pref.gear += TG.display_name return TOPIC_REFRESH_UPDATE_PREVIEW if(href_list["gear"] && href_list["tweak"]) - var/datum/gear/gear = gear_datums[href_list["gear"]] + var/datum/gear/gear = gear_datums[url_decode(href_list["gear"])] var/datum/gear_tweak/tweak = locate(href_list["tweak"]) if(!tweak || !istype(gear) || !(tweak in gear.gear_tweaks)) return TOPIC_NOACTION diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index f5a85304b9..c99eb25d22 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -138,32 +138,32 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor", "Search and Rescue") /datum/gear/accessory/fannypack display_name = "fannypack selection" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index 2a67109ca5..7013f969df 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -58,11 +58,11 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") /datum/gear/accessory/black_vest display_name = "webbing, black (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") /datum/gear/accessory/white_vest display_name = "webbing, white (Medical)" @@ -70,11 +70,11 @@ /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black (Eng, Sec, Med, Exploration, Miner)" - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white (Medical)" @@ -83,7 +83,7 @@ /datum/gear/accessory/bluespace display_name = "bluespace badge (Eng, Sec, Med, Exploration, Miner)" path = /obj/item/clothing/accessory/storage/bluespace - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Chemist","Field Medic","Explorer","Pathfinder","Shaft Miner","Talon Captain","Talon Doctor","Talon Engineer","Talon Guard", "Talon Miner") cost = 2 /datum/gear/accessory/webbing diff --git a/code/modules/client/preference_setup/loadout/loadout_cyberware.dm b/code/modules/client/preference_setup/loadout/loadout_cyberware.dm index 2540e86fc8..1fac24c862 100644 --- a/code/modules/client/preference_setup/loadout/loadout_cyberware.dm +++ b/code/modules/client/preference_setup/loadout/loadout_cyberware.dm @@ -12,19 +12,6 @@ path = /obj/item/weapon/implant/tracking/weak cost = 0 //VOREStation Edit. Changed cost to 0 -// Remove these after generic implant has been in for awhile and everyone has had a reasonable period to copy their old descs. -/datum/gear/utility/implant/dud1 - display_name = "implant, head" - description = "An implant with no obvious purpose (DEPRECATED, USE GENERIC IMPLANT)." - path = /obj/item/weapon/implant/dud - cost = 1 -/datum/gear/utility/implant/dud2 - display_name = "implant, torso" - description = "An implant with no obvious purpose (DEPRECATED, USE GENERIC IMPLANT)." - path = /obj/item/weapon/implant/dud/torso - cost = 1 -// End removal marker. - /datum/gear/utility/implant/generic display_name = "implant, generic, primary" description = "An implant with no obvious purpose." diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm index c8c6355ea2..4a70c788c7 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm @@ -104,7 +104,7 @@ /datum/gear/eyes/meson display_name = "Optical Meson Scanners (Engineering, Science, Mining)" path = /obj/item/clothing/glasses/meson - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Shaft Miner") /datum/gear/eyes/meson/prescription display_name = "Optical Meson Scanners, prescription (Engineering, Science, Mining)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index 9504678e06..9aae4969ef 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -3,7 +3,7 @@ /datum/gear/eyes/meson display_name = "Optical Meson Scanners (Eng, Sci, Explo)" - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician", "Scientist", "Research Director", "Explorer", "Pathfinder") /datum/gear/eyes/arglasses display_name = "AR glasses" @@ -33,7 +33,7 @@ /datum/gear/eyes/arglasses/eng display_name = "AR-E glasses (Eng)" path = /obj/item/clothing/glasses/omnihud/eng - allowed_roles = list("Station Engineer","Chief Engineer","Atmospheric Technician") + allowed_roles = list("Engineer","Chief Engineer","Atmospheric Technician") /datum/gear/eyes/arglasses/med display_name = "AR-M glasses (Medical)" @@ -65,3 +65,7 @@ /datum/gear/eyes/medical/medpatch display_name = "Health HUDpatch" path = /obj/item/clothing/glasses/hud/health/eyepatch + +/datum/gear/eyes/bigshot + display_name = "Big Shot's Glasses" + path = /obj/item/clothing/glasses/sunglasses/bigshot diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index cfca34e719..0f9060a1af 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -16,7 +16,7 @@ display_name = "Airhorn - Example Item" description = "An example item that you probably shouldn't see!" ckeywhitelist = list("mewchild") - allowed_roles = list("Station Engineer") + allowed_roles = list("Engineer") */ @@ -296,6 +296,12 @@ ckeywhitelist = list("chaleur") character_name = list("Hisako Arato") +/datum/gear/fluff/jade_stamp + path = /obj/item/weapon/stamp/fluff/jade_horror + display_name = "Official Council of Mid Horror rubber stamp" + ckeywhitelist = list("coolcrow420") + character_name = list("Jade Davis") + // D CKEYS /datum/gear/fluff/dhaeleena_medal path = /obj/item/clothing/accessory/medal/silver/security/fluff/dhael @@ -394,6 +400,7 @@ // G CKEYS // H CKEYS + /datum/gear/fluff/lauren_medal path = /obj/item/clothing/accessory/medal/conduct display_name = "Lauren's Medal" @@ -412,6 +419,12 @@ ckeywhitelist = list("hottokeeki") character_name = list("Belle Day") +/datum/gear/fluff/amaryll_claws + path = /obj/item/weapon/surgical/scalpel/amaryll_claws + display_name = "Amaryll's Claws" + ckeywhitelist = list("hunterbirk") + character_name = list("Amaryll") + // I CKEYS /datum/gear/fluff/ruda_badge path = /obj/item/clothing/accessory/badge/holo/detective/ruda @@ -651,12 +664,6 @@ ckeywhitelist = list("luminescentring") character_name = list("Briana Moore") -/datum/gear/fluff/entchtut_medal - path = /obj/item/clothing/accessory/medal/conduct - display_name = "Entchtut's Conduct Medal" - ckeywhitelist = list("littlebigkid2000") - character_name = list("Entchtut Cenein") - // M CKEYS /datum/gear/fluff/phi_box path = /obj/item/weapon/storage/box/fluff/phi @@ -826,11 +833,29 @@ ckeywhitelist = list("pastelprincedan") character_name = list("Kiyoshi Maki", "Masumi Maki") -/datum/gear/fluff/masumi_overalls - path = /obj/item/clothing/under/fluff/masumi_overalls - display_name = "white and blue overalls" +/datum/gear/fluff/entchtut_medal + path = /obj/item/clothing/accessory/medal/conduct + display_name = "Entchtut's Conduct Medal" + ckeywhitelist = list("positronicjune") + character_name = list("Entchtut Cenein") + +/datum/gear/fluff/mechanic_overalls + path = /obj/item/clothing/under/fluff/mechanic_overalls + display_name = "mechanic overalls" + ckeywhitelist = list("pastelprincedan", "hatterhat") + character_name = list("Masumi Maki", "Harold Robinson") + +/datum/gear/fluff/mechanic_coat + path = /obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic + display_name = "mechanic winter coat" + ckeywhitelist = list("pastelprincedan", "hatterhat") + character_name = list("Masumi Maki", "Harold Robinson") + +/datum/gear/fluff/slimecat_rd_plush + path = /obj/item/toy/plushie/fluff/slimeowshi + display_name = "slimecat RD plushie" ckeywhitelist = list("pastelprincedan") - character_name = list("Masumi Maki") + character_name = list("Kiyoshi Maki", "Masumi Maki") // Q CKEYS @@ -867,6 +892,12 @@ ckeywhitelist = list("residentcody") character_name = list("Pathfinder") +/datum/gear/fluff/revolver_claymore + path = /obj/item/weapon/sword/fluff/revolver + display_name = "Catnip" + ckeywhitelist = list("revolvereloise") + character_name = list("Revolver Eloise") + /datum/gear/fluff/nikki_dorky_outfit path = /obj/item/weapon/storage/box/fluff display_name = "Nikki's Witchy Outfit" @@ -903,14 +934,14 @@ display_name = "Kateryna's Voidsuit" ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician") + allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician") /datum/gear/fluff/katerina_spacesuit path = /obj/item/clothing/head/helmet/space/fluff/kate display_name = "Kateryna's Helmet" ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Station Engineer", "Chief Engineer", "Atmospheric Technician") + allowed_roles = list("Engineer", "Chief Engineer", "Atmospheric Technician") /datum/gear/fluff/kateryna_armorvest path = /obj/item/clothing/suit/armor/vest/wolftaur/kate @@ -939,6 +970,20 @@ ckeywhitelist = list("scree") character_name = list("Scree") +/datum/gear/fluff/avida_dress + path = /obj/item/clothing/under/skirt/outfit/fluff/avida + display_name = "Avida's Dress" + slot = slot_w_uniform + ckeywhitelist = list("scree") + character_name = list("Avida") + +/datum/gear/fluff/avida_hat + path = /obj/item/clothing/head/fluff/avida + display_name = "Avida's Hat" + slot = slot_head + ckeywhitelist = list("scree") + character_name = list("Avida") + /datum/gear/fluff/alfonso_sunglasses path = /obj/item/clothing/glasses/sunglasses/fluff/alfonso display_name = "Alfonso's Sunglasses" @@ -1090,6 +1135,11 @@ character_name = list("Konor Foxe") // U CKEYS +/datum/gear/fluff/brad_jordans + path = /obj/item/clothing/shoes/fluff/airjordans + display_name = "Bradley's Air Jordans" + ckeywhitelist = list("unclefruitvevo") + character_name = list("Bradley Khatibi") // V CKEYS /datum/gear/fluff/verie_suit @@ -1313,3 +1363,9 @@ display_name = "Nehi's Radio" ckeywhitelist = list("zodiacshadow") character_name = list("Nehi Maximus") + +/datum/gear/fluff/lucky_amour + path = /obj/item/device/modkit_conversion/crusader_luck + display_name = "Lucky's amour" + ckeywhitelist = list ("thedavestdave") + character_name = list("Lucky") \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm index 8b566fe3c9..615e16bf5d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_general.dm +++ b/code/modules/client/preference_setup/loadout/loadout_general.dm @@ -53,7 +53,11 @@ /datum/gear/plushie/New() ..() var/list/plushies = list() - for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie) - /obj/item/toy/plushie/therapy) + var/list/blacklisted_types = list() + // look if theres a better way to do this im all ears + blacklisted_types += subtypesof(/obj/item/toy/plushie/therapy) + blacklisted_types += subtypesof(/obj/item/toy/plushie/fluff) + for(var/obj/item/toy/plushie/plushie_type as anything in subtypesof(/obj/item/toy/plushie) - blacklisted_types) plushies[initial(plushie_type.name)] = plushie_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(plushies)) diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 35991ab667..65939198a0 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -349,7 +349,7 @@ display_name = "welding, normal (engineering/robotics)" path = /obj/item/clothing/head/welding cost = 2 - allowed_roles = list("Chief Engineer","Station Engineer","Atmospheric Technician","Research Director","Roboticist") + allowed_roles = list("Chief Engineer","Engineer","Atmospheric Technician","Research Director","Roboticist") /datum/gear/head/welding/demon display_name = "welding, demon (engineering/robotics)" diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index 2c89ce66cb..a313f3023d 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -46,13 +46,13 @@ /datum/gear/mask/gaiter display_name = "neck gaiter selection" - path = /obj/item/clothing/mask/gaiter + path = /obj/item/clothing/accessory/gaiter cost = 1 /datum/gear/mask/gaiter/New() ..() var/list/gaiters = list() - for(var/gaiter in typesof(/obj/item/clothing/mask/gaiter)) - var/obj/item/clothing/mask/gaiter_type = gaiter + for(var/gaiter in typesof(/obj/item/clothing/accessory/gaiter)) + var/obj/item/clothing/accessory/gaiter_type = gaiter gaiters[initial(gaiter_type.name)] = gaiter_type gear_tweaks += new/datum/gear_tweak/path(sortTim(gaiters, /proc/cmp_text_asc)) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 2faca44011..8c9efbd119 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -422,7 +422,7 @@ /datum/gear/suit/wintercoat/engineering display_name = "winter coat, engineering" path = /obj/item/clothing/suit/storage/hooded/wintercoat/engineering - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") /datum/gear/suit/wintercoat/engineering/atmos display_name = "winter coat, atmospherics" @@ -597,7 +597,7 @@ /datum/gear/suit/snowsuit/engineering display_name = "snowsuit, engineering" path = /obj/item/clothing/suit/storage/snowsuit/engineering - allowed_roles = list("Chief Engineer","Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician", "Engineer") /datum/gear/suit/snowsuit/cargo display_name = "snowsuit, supply" diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm index 0383f58f0a..b11905385a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm @@ -9,6 +9,30 @@ ..() gear_tweaks += gear_tweak_free_color_choice +/datum/gear/suit/labcoat_old + display_name = "labcoat, old-school" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old + +/datum/gear/suit/labcoat_cmo_old + display_name = "labcoat, CMO, oldschool" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old/cmo + allowed_roles = list("Chief Medical Officer") + +/datum/gear/suit/roles/labcoat_old + display_name = "labcoat selection, department, oldschool" + path = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox + cost = 2 + + +/datum/gear/suit/roles/labcoat_old/New() + ..() + var/list/labcoats = list( + "Oldschool Scientist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/tox, + "Oldschool Virologist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/vir, + "Oldschool Chemist's Labcoat" = /obj/item/clothing/suit/storage/toggle/labcoat/old/chem + ) + gear_tweaks += new/datum/gear_tweak/path(labcoats) + /datum/gear/suit/jacket_modular display_name = "jacket, modular" path = /obj/item/clothing/suit/storage/fluff/jacket @@ -83,4 +107,15 @@ Talon winter coat */ /datum/gear/suit/wintercoat/talon display_name = "winter coat, Talon" - path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon \ No newline at end of file + path = /obj/item/clothing/suit/storage/hooded/wintercoat/talon + + +/datum/gear/suit/armor/combat/crusader_explo + display_name = "knight, explo" + path = /obj/item/clothing/suit/armor/combat/crusader_explo + allowed_roles = list("Explorer","Field Medic","Pathfinder") + +/datum/gear/suit/armor/combat/crusader_explo/FM + display_name = "knight, Field Medic" + path = /obj/item/clothing/suit/armor/combat/crusader_explo/FM + allowed_roles = list ("Field Medic") diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 99747a717d..874501d108 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -119,7 +119,7 @@ /datum/gear/uniform/job_skirt/eng display_name = "skirt, engineer" path = /obj/item/clothing/under/rank/engineer/skirt - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/uniform/job_skirt/roboticist display_name = "skirt, roboticist" @@ -189,7 +189,7 @@ /datum/gear/uniform/job_turtle/engineering display_name = "turtleneck, engineering" path = /obj/item/clothing/under/rank/engineer/turtleneck - allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer") + allowed_roles = list("Chief Engineer", "Atmospheric Technician", "Engineer") /datum/gear/uniform/job_turtle/medical display_name = "turtleneck, medical" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 8fea6638cd..26caf70b2b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -37,7 +37,7 @@ /datum/gear/uniform/job_khi/eng display_name = "khi uniform, eng" path = /obj/item/clothing/under/rank/khi/eng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") /datum/gear/uniform/job_khi/sci display_name = "khi uniform, sci" @@ -67,7 +67,7 @@ /datum/gear/suit/job_fed/eng display_name = "fed uniform, eng" path = /obj/item/clothing/suit/storage/fluff/fedcoat/fedeng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") // Trekie things //TOS @@ -84,7 +84,7 @@ /datum/gear/uniform/job_trek/eng/tos display_name = "TOS uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") //TNG /datum/gear/uniform/job_trek/cmd/tng @@ -100,7 +100,7 @@ /datum/gear/uniform/job_trek/eng/tng display_name = "TNG uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/next - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") //VOY /datum/gear/uniform/job_trek/cmd/voy @@ -116,7 +116,7 @@ /datum/gear/uniform/job_trek/eng/voy display_name = "VOY uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/voy - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") //DS9 @@ -126,7 +126,7 @@ allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director", "Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Scientist","Roboticist","Xenobiologist","Xenobotanist","Atmospheric Technician", - "Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic") + "Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic") /datum/gear/uniform/job_trek/cmd/ds9 @@ -142,7 +142,7 @@ /datum/gear/uniform/job_trek/eng/ds9 display_name = "DS9 uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/ds9 - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") //ENT @@ -159,7 +159,7 @@ /datum/gear/uniform/job_trek/eng/ent display_name = "ENT uniform, eng/sec" path = /obj/item/clothing/under/rank/trek/engsec/ent - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer","Warden","Detective","Security Officer","Head of Security") /* Swimsuits */ diff --git a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm index 909ae31b87..61e204546f 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility_vr.dm @@ -49,7 +49,7 @@ /datum/gear/utility/dufflebag/eng display_name = "engineering dufflebag" path = /obj/item/weapon/storage/backpack/dufflebag/eng - allowed_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer") + allowed_roles = list("Chief Engineer","Atmospheric Technician","Engineer") /datum/gear/utility/dufflebag/sci display_name = "science dufflebag" @@ -69,3 +69,15 @@ display_name = "contractor identification card" path = /obj/item/weapon/card/id/event/polymorphic/altcard cost = 1 + +/datum/gear/utility/bs_bracelet + display_name = "bluespace bracelet" + path = /obj/item/clothing/gloves/bluespace + cost = 5 + + +/datum/gear/utility/satchel_strapless + display_name = "satchel strapless" + path = /obj/item/weapon/storage/backpack/satchel/strapless + slot = slot_back + cost = 1 \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno.dm b/code/modules/client/preference_setup/loadout/loadout_xeno.dm index c4dd57d681..59d2ab0002 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno.dm @@ -224,7 +224,7 @@ /datum/gear/uniform/dept/undercoat/engineer display_name = "engineering undercoat (Teshari)" path = /obj/item/clothing/under/teshari/undercoat/jobs/engineer - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/uniform/dept/undercoat/atmos display_name = "atmospherics undercoat (Teshari)" @@ -397,7 +397,7 @@ /datum/gear/suit/dept/cloak/engineer display_name = "engineering cloak (Teshari)" path = /obj/item/clothing/suit/storage/teshari/cloak/jobs/engineer - allowed_roles = list("Chief Engineer","Station Engineer") + allowed_roles = list("Chief Engineer","Engineer") /datum/gear/suit/dept/cloak/engineer/New() ..() diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 0e5b6a2420..c342fb9b3e 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -75,6 +75,13 @@ pref.starting_trait_points = STARTING_SPECIES_POINTS pref.max_traits = MAX_SPECIES_TRAITS + if(pref.organ_data[O_BRAIN]) //Checking if we have a synth on our hands, boys. + pref.dirty_synth = 1 + pref.gross_meatbag = 0 + else + pref.gross_meatbag = 1 + pref.dirty_synth = 0 + if(pref.species != SPECIES_CUSTOM) pref.pos_traits.Cut() pref.neg_traits.Cut() @@ -105,7 +112,7 @@ var/take_flags = initial(path.can_take) if((pref.dirty_synth && !(take_flags & SYNTHETICS)) || (pref.gross_meatbag && !(take_flags & ORGANICS))) pref.neg_traits -= path - + var/datum/species/selected_species = GLOB.all_species[pref.species] if(selected_species.selects_bodytype) // Allowed! diff --git a/code/modules/client/preference_setup/vore/08_nif.dm b/code/modules/client/preference_setup/vore/08_nif.dm index 62ebbdbeac..c618341344 100644 --- a/code/modules/client/preference_setup/vore/08_nif.dm +++ b/code/modules/client/preference_setup/vore/08_nif.dm @@ -38,11 +38,16 @@ if((character.type == /mob/living/carbon/human) && ispath(pref.nif_path) && pref.nif_durability) new pref.nif_path(character,pref.nif_durability,pref.nif_savedata) + /* //And now here's the trick. We wipe these so that if they die, they lose the NIF. //Backup implants will start saving this again periodically, and so will cryo'ing out. pref.nif_path = null pref.nif_durability = null pref.nif_savedata = null + */ + //No we do not, that's lame and admins have to re-NIF them later. + //If they leave round after they get their NIF extracted, it will save as 'gone' anyway + //The NIF will save automatically every time durability changes too now. var/savefile/S = new /savefile(pref.path) if(!S) WARNING ("Couldn't load NIF save savefile? [pref.real_name]") S.cd = "/character[pref.default_slot]" diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index 60a207bcc8..fff3bb6af4 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -8,6 +8,7 @@ S["directory_erptag"] >> pref.directory_erptag S["directory_ad"] >> pref.directory_ad S["sensorpref"] >> pref.sensorpref + S["capture_crystal"] >> pref.capture_crystal /datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S) S["show_in_directory"] << pref.show_in_directory @@ -15,17 +16,21 @@ S["directory_erptag"] << pref.directory_erptag S["directory_ad"] << pref.directory_ad S["sensorpref"] << pref.sensorpref + S["capture_crystal"] << pref.capture_crystal + /datum/category_item/player_setup_item/vore/misc/copy_to_mob(var/mob/living/carbon/human/character) if(pref.sensorpref > 5 || pref.sensorpref < 1) pref.sensorpref = 5 character.sensorpref = pref.sensorpref + character.capture_crystal = pref.capture_crystal /datum/category_item/player_setup_item/vore/misc/sanitize_character() pref.show_in_directory = sanitize_integer(pref.show_in_directory, 0, 1, initial(pref.show_in_directory)) pref.directory_tag = sanitize_inlist(pref.directory_tag, GLOB.char_directory_tags, initial(pref.directory_tag)) pref.directory_erptag = sanitize_inlist(pref.directory_erptag, GLOB.char_directory_erptags, initial(pref.directory_erptag)) pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) + pref.capture_crystal = sanitize_integer(pref.capture_crystal, 0, 1, initial(pref.capture_crystal)) /datum/category_item/player_setup_item/vore/misc/content(var/mob/user) . += "
" @@ -34,6 +39,7 @@ . += "Character Directory ERP Tag: [pref.directory_erptag]
" . += "Character Directory Advertisement: Set Directory Ad
" . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" + . += "Capture Crystal Preference [pref.capture_crystal ? "Yes" : "No"]
" /datum/category_item/player_setup_item/vore/misc/OnTopic(var/href, var/list/href_list, var/mob/user) if(href_list["toggle_show_in_directory"]) @@ -60,4 +66,8 @@ if (!isnull(new_sensorpref) && CanUseTopic(user)) pref.sensorpref = sensorpreflist.Find(new_sensorpref) return TOPIC_REFRESH + else if(href_list["toggle_capture_crystal"]) + pref.capture_crystal = pref.capture_crystal ? 0 : 1; + return TOPIC_REFRESH + return ..(); diff --git a/code/modules/client/preferences_spawnpoints.dm b/code/modules/client/preferences_spawnpoints.dm index 455be8a8b8..6078808c30 100644 --- a/code/modules/client/preferences_spawnpoints.dm +++ b/code/modules/client/preferences_spawnpoints.dm @@ -31,7 +31,7 @@ var/list/spawntypes = list() if(!(J.mob_type & allowed_mob_types)) return 0 - + return 1 /datum/spawnpoint/proc/get_spawn_position() @@ -77,4 +77,30 @@ var/list/spawntypes = list() /datum/spawnpoint/cyborg/New() ..() - turfs = latejoin_cyborg \ No newline at end of file + turfs = latejoin_cyborg + +/obj/effect/landmark/arrivals + name = "JoinLateShuttle" + delete_me = 1 + +/obj/effect/landmark/arrivals/New() + latejoin += loc + ..() + +var/global/list/latejoin_tram = list() + +/obj/effect/landmark/tram + name = "JoinLateTram" + delete_me = 1 + +/obj/effect/landmark/tram/New() + latejoin_tram += loc // There's no tram but you know whatever man! + ..() + +/datum/spawnpoint/tram + display_name = "Tram Station" + msg = "will arrive to the station shortly by shuttle" + +/datum/spawnpoint/tram/New() + ..() + turfs = latejoin_tram \ No newline at end of file diff --git a/code/modules/client/preferences_toggle_procs.dm b/code/modules/client/preferences_toggle_procs.dm index 188ae794a1..d928b39c2e 100644 --- a/code/modules/client/preferences_toggle_procs.dm +++ b/code/modules/client/preferences_toggle_procs.dm @@ -1,8 +1,8 @@ //Toggles for preferences, normal clients /client/verb/toggle_ghost_ears() - set name = "Show/Hide Ghost Ears" + set name = "Toggle Ghost Ears" set category = "Preferences" - set desc = "Toggles between seeing all mob speech and nearby mob speech." + set desc = "Toggles between seeing all mob speech and only nearby mob speech as an observer." var/pref_path = /datum/client_preference/ghost_ears @@ -15,9 +15,9 @@ feedback_add_details("admin_verb","TGEars") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_ghost_vision() - set name = "Show/Hide Ghost Vision" + set name = "Toggle Ghost Sight" set category = "Preferences" - set desc = "Toggles between seeing all mob emotes and nearby mob emotes." + set desc = "Toggles between seeing all mob emotes and only nearby mob emotes as an observer." var/pref_path = /datum/client_preference/ghost_sight @@ -30,9 +30,9 @@ feedback_add_details("admin_verb","TGVision") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_ghost_radio() - set name = "Show/Hide Radio Chatter" + set name = "Toggle Ghost Radio" set category = "Preferences" - set desc = "Toggles between seeing all radio chat and nearby radio chatter." + set desc = "Toggles between seeing all radio chat and only nearby radio chatter as an observer." var/pref_path = /datum/client_preference/ghost_radio @@ -45,9 +45,9 @@ feedback_add_details("admin_verb","TGRadio") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_deadchat() - set name = "Show/Hide Deadchat" + set name = "Toggle Deadchat" set category = "Preferences" - set desc = "Toggles the dead chat channel." + set desc = "Toggles visibility of dead chat." var/pref_path = /datum/client_preference/show_dsay @@ -60,9 +60,9 @@ feedback_add_details("admin_verb","TDeadChat") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_ooc() - set name = "Show/Hide OOC" + set name = "Toggle OOC" set category = "Preferences" - set desc = "Toggles global out of character chat." + set desc = "Toggles visibility of global out of character chat." var/pref_path = /datum/client_preference/show_ooc @@ -75,9 +75,9 @@ feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_looc() - set name = "Show/Hide LOOC" + set name = "Toggle LOOC" set category = "Preferences" - set desc = "Toggles local out of character chat." + set desc = "Toggles visibility of local out of character chat." var/pref_path = /datum/client_preference/show_looc @@ -90,9 +90,9 @@ feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_precision_placement() - set name = "Enable/Disable Precision Placement" + set name = "Toggle Precision Placement" set category = "Preferences" - set desc = "Toggles precise placement of objects on tables." + set desc = "Toggles whether objects placed on table will be on cursor position or centered." var/pref_path = /datum/client_preference/precision_placement @@ -105,9 +105,9 @@ feedback_add_details("admin_verb","TPIP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_typing() - set name = "Show/Hide Typing Indicator" + set name = "Toggle Typing Indicator" set category = "Preferences" - set desc = "Toggles the speech bubble typing indicator." + set desc = "Toggles you having the speech bubble typing indicator." var/pref_path = /datum/client_preference/show_typing_indicator @@ -137,7 +137,7 @@ /client/verb/toggle_lobby_music() set name = "Toggle Lobby Music" set category = "Preferences" - set desc = "Toggles the music in the lobby." + set desc = "Toggles the ability to hear the music in the lobby." var/pref_path = /datum/client_preference/play_lobby_music @@ -150,15 +150,15 @@ feedback_add_details("admin_verb","TLobMusic") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_admin_midis() - set name = "Toggle Admin MIDIs" + set name = "Toggle Admin Music" set category = "Preferences" - set desc = "Toggles the music in the lobby." + set desc = "Toggles the ability to hear music played by admins." var/pref_path = /datum/client_preference/play_admin_midis toggle_preference(pref_path) - to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear MIDIs from admins.") + to_chat(src,"You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear music from admins.") SScharacter_setup.queue_preferences_save(prefs) @@ -167,7 +167,7 @@ /client/verb/toggle_ambience() set name = "Toggle Ambience" set category = "Preferences" - set desc = "Toggles the playing of ambience." + set desc = "Toggles the ability to hear local ambience." var/pref_path = /datum/client_preference/play_ambiance @@ -212,7 +212,7 @@ /client/verb/toggle_jukebox() set name = "Toggle Jukebox" set category = "Preferences" - set desc = "Toggles the playing of jukebox music." + set desc = "Toggles the ability to hear jukebox music." var/pref_path = /datum/client_preference/play_jukebox @@ -225,7 +225,7 @@ feedback_add_details("admin_verb","TJukebox") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_be_special(role in be_special_flags) - set name = "Toggle SpecialRole Candidacy" + set name = "Toggle Special Role Candidacy" set category = "Preferences" set desc = "Toggles which special roles you would like to be a candidate for, during events." @@ -240,15 +240,15 @@ feedback_add_details("admin_verb","TBeSpecial") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_air_pump_hum() - set name = "Toggle Air Pump Noise" + set name = "Toggle Air Vent Noise" set category = "Preferences" - set desc = "Toggles Air Pumps humming" + set desc = "Toggles the ability to hear air vent humming." var/pref_path = /datum/client_preference/air_pump_noise toggle_preference(pref_path) - to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear air pumps hum, start, and stop.") + to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear air vents hum, start, and stop.") SScharacter_setup.queue_preferences_save(prefs) @@ -257,7 +257,7 @@ /client/verb/toggle_old_door_sounds() set name = "Toggle Old Door Sounds" set category = "Preferences" - set desc = "Toggles New/Old Door Sounds" + set desc = "Toggles door sounds between old and new." var/pref_path = /datum/client_preference/old_door_sounds @@ -272,7 +272,7 @@ /client/verb/toggle_department_door_sounds() set name = "Toggle Department Door Sounds" set category = "Preferences" - set desc = "Toggles Department-Specific Door Sounds" + set desc = "Toggles hearing of department-specific door sounds." var/pref_path = /datum/client_preference/department_door_sounds @@ -287,13 +287,13 @@ /client/verb/toggle_pickup_sounds() set name = "Toggle Picked Up Item Sounds" set category = "Preferences" - set desc = "Toggles sounds when items are picked up or thrown." + set desc = "Toggles the ability to hear sounds when items are picked up." var/pref_path = /datum/client_preference/pickup_sounds toggle_preference(pref_path) - to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear sounds when items are picked up or thrown.") + to_chat(src, "You will [ (is_preference_enabled(pref_path)) ? "now" : "no longer"] hear sounds when items are picked up.") SScharacter_setup.queue_preferences_save(prefs) @@ -302,7 +302,7 @@ /client/verb/toggle_drop_sounds() set name = "Toggle Dropped Item Sounds" set category = "Preferences" - set desc = "Toggles sounds when items are dropped or thrown." + set desc = "Toggles the ability to hear sounds when items are dropped or thrown." var/pref_path = /datum/client_preference/drop_sounds @@ -330,7 +330,7 @@ /client/verb/toggle_mob_tooltips() set name = "Toggle Mob Tooltips" set category = "Preferences" - set desc = "Toggles displaying name/species over mobs when moused over." + set desc = "Toggles displaying name/species over mobs when they are moused over." var/pref_path = /datum/client_preference/mob_tooltips toggle_preference(pref_path) @@ -343,7 +343,7 @@ /client/verb/toggle_inv_tooltips() set name = "Toggle Item Tooltips" set category = "Preferences" - set desc = "Toggles displaying name/desc over items when moused over (only applies in inventory)." + set desc = "Toggles displaying name/desc over items when they are moused over (only applies in inventory)." var/pref_path = /datum/client_preference/inv_tooltips toggle_preference(pref_path) @@ -356,7 +356,7 @@ /client/verb/toggle_hear_instruments() set name = "Toggle Hear/Ignore Instruments" set category = "Preferences" - set desc = "Hear In-game Instruments" + set desc = "Toggles the ability to hear instruments playing." var/pref_path = /datum/client_preference/instrument_toggle toggle_preference(pref_path) @@ -369,7 +369,7 @@ /client/verb/toggle_vchat() set name = "Toggle VChat" set category = "Preferences" - set desc = "Enable/Disable VChat. Reloading VChat and/or reconnecting required to affect changes." + set desc = "Toggles VChat. Reloading VChat and/or reconnecting required to affect changes." var/pref_path = /datum/client_preference/vchat_enable toggle_preference(pref_path) @@ -382,7 +382,7 @@ /client/verb/toggle_status_indicators() set name = "Toggle Status Indicators" set category = "Preferences" - set desc = "Enable/Disable seeing status indicators over peoples' heads." + set desc = "Toggles seeing status indicators over peoples' heads." var/pref_path = /datum/client_preference/status_indicators toggle_preference(pref_path) @@ -396,7 +396,7 @@ /client/verb/toggle_radio_sounds() set name = "Toggle Radio Sounds" set category = "Preferences" - set desc = "Enable/Disable hearing a sound when somebody speaks over your headset." + set desc = "Toggle hearing a sound when somebody speaks over your headset." var/pref_path = /datum/client_preference/radio_sounds toggle_preference(pref_path) @@ -410,7 +410,7 @@ /client/verb/toggle_examine_mode() set name = "Toggle Examine Mode" set category = "Preferences" - set desc = "Control the additional behaviour of examining things" + set desc = "Toggle the additional behaviour of examining things." prefs.examine_text_mode++ prefs.examine_text_mode %= EXAMINE_MODE_MAX // This cycles through them because if you're already specifically being routed to the examine panel, you probably don't need to have the extra text printed to chat @@ -427,7 +427,7 @@ /client/verb/toggle_multilingual_mode() set name = "Toggle Multilingual Mode" set category = "Preferences" - set desc = "Control the behaviour of multilingual speech parsing" + set desc = "Toggle the behaviour of multilingual speech parsing." prefs.multilingual_mode++ prefs.multilingual_mode %= MULTILINGUAL_MODE_MAX // Cycles through the various options @@ -448,7 +448,7 @@ /client/proc/toggle_debug_logs() set name = "Toggle Debug Logs" set category = "Preferences" - set desc = "Toggles debug logs." + set desc = "Toggles seeing debug logs." var/pref_path = /datum/client_preference/debug/show_debug_logs @@ -463,7 +463,7 @@ /client/proc/toggle_attack_logs() set name = "Toggle Attack Logs" set category = "Preferences" - set desc = "Toggles attack logs." + set desc = "Toggles seeing attack logs." var/pref_path = /datum/client_preference/mod/show_attack_logs diff --git a/code/modules/client/preferences_vr.dm b/code/modules/client/preferences_vr.dm index 6bba9fe31e..db77b0ba6e 100644 --- a/code/modules/client/preferences_vr.dm +++ b/code/modules/client/preferences_vr.dm @@ -4,6 +4,7 @@ var/directory_erptag = "Unset" //ditto, but for non-vore scenes var/directory_ad = "" //Advertisement stuff to show in character directory. var/sensorpref = 5 //Set character's suit sensor level + var/capture_crystal = 1 //Whether or not someone is able to be caught with capture crystals var/job_talon_high = 0 var/job_talon_med = 0 @@ -11,9 +12,9 @@ //Why weren't these in game toggles already? /client/verb/toggle_eating_noises() - set name = "Eating Noises" + set name = "Toggle Eating Noises" set category = "Preferences" - set desc = "Toggles Vore Eating noises." + set desc = "Toggles hearing Vore Eating noises." var/pref_path = /datum/client_preference/eating_noises @@ -27,9 +28,9 @@ /client/verb/toggle_digestion_noises() - set name = "Digestion Noises" + set name = "Toggle Digestion Noises" set category = "Preferences" - set desc = "Toggles Vore Digestion noises." + set desc = "Toggles hearing Vore Digestion noises." var/pref_path = /datum/client_preference/digestion_noises @@ -40,11 +41,11 @@ SScharacter_setup.queue_preferences_save(prefs) feedback_add_details("admin_verb","TDigestNoise") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - + /client/verb/toggle_belch_noises() - set name = "Audible belching" + set name = "Toggle Audible Belching" set category = "Preferences" - set desc = "Toggles audible belches." + set desc = "Toggles hearing audible belches." var/pref_path = /datum/client_preference/belch_noises @@ -57,9 +58,9 @@ feedback_add_details("admin_verb","TBelchNoise") /client/verb/toggle_emote_noises() - set name = "Emote Noises" + set name = "Toggle Emote Noises" set category = "Preferences" - set desc = "Toggles emote noises." + set desc = "Toggles hearing emote noises." var/pref_path = /datum/client_preference/emote_noises @@ -72,9 +73,9 @@ feedback_add_details("admin_verb","TEmoteNoise") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_ghost_quiets() - set name = "Toggle Whisper/Subtle Vis" + set name = "Toggle Ghost Privacy" set category = "Preferences" - set desc = "Toggle ghosts viewing your subtles/whispers." + set desc = "Toggles ghosts being able to see your subtles/whispers." var/pref_path = /datum/client_preference/whisubtle_vis @@ -85,3 +86,22 @@ SScharacter_setup.queue_preferences_save(prefs) feedback_add_details("admin_verb","TWhisubtleVis") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +/client/verb/toggle_capture_crystal() + set name = "Toggle Catchable" + set category = "Preferences" + set desc = "Toggles being catchable with capture crystals." + + var/mob/living/L = mob + + if(prefs.capture_crystal) + to_chat(src, "You are no longer catchable.") + prefs.capture_crystal = 0 + else + to_chat(src, "You are now catchable.") + prefs.capture_crystal = 1 + if(L) + L.capture_crystal = prefs.capture_crystal + SScharacter_setup.queue_preferences_save(prefs) + + feedback_add_details("admin_verb","TCaptureCrystal") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file diff --git a/code/modules/client/stored_item.dm b/code/modules/client/stored_item.dm new file mode 100644 index 0000000000..d2210b2245 --- /dev/null +++ b/code/modules/client/stored_item.dm @@ -0,0 +1,252 @@ +/obj/machinery/item_bank + name = "electronic lockbox" + desc = "A place to store things you might want later!" + icon = 'icons/obj/stationobjs_vr.dmi' + icon_state = "item_bank" + idle_power_usage = 1 + active_power_usage = 5 + anchored = TRUE + density = FALSE + var/busy_bank = FALSE + var/static/list/item_takers = list() + +/obj/machinery/item_bank/proc/persist_item_savefile_path(mob/user) + return "data/player_saves/[copytext(user.ckey, 1, 2)]/[user.ckey]/persist_item.sav" + +/obj/machinery/item_bank/proc/persist_item_savefile_save(mob/user, obj/item/O) + if(IsGuestKey(user.key)) + return 0 + + var/savefile/F = new /savefile(src.persist_item_savefile_path(user)) + + F["persist item"] << O.type + F["persist name"] << initial(O.name) + + return 1 + +/obj/machinery/item_bank/proc/persist_item_savefile_load(mob/user, thing) + if (IsGuestKey(user.key)) + return 0 + + var/path = src.persist_item_savefile_path(user) + + if (!fexists(path)) + return 0 + + var/savefile/F = new /savefile(path) + + if(!F) return 0 + + var/persist_item + F["persist item"] >> persist_item + + if (isnull(persist_item) || !ispath(persist_item)) + fdel(path) + tgui_alert_async(user, "An item could not be retrieved.") + return 0 + if(thing == "type") + return persist_item + if(thing == "name") + var/persist_name + F["persist name"] >> persist_name + return persist_name + + +/obj/machinery/item_bank/Initialize() + . = ..() + +/obj/machinery/item_bank/attack_hand(mob/living/user) + . = ..() + if(!ishuman(user)) + return + if(istype(user) && Adjacent(user)) + if(inoperable() || panel_open) + to_chat(user, "\The [src] seems to be nonfunctional...") + else + start_using(user) + +/obj/machinery/item_bank/proc/start_using(mob/living/user) + if(!ishuman(user)) + return + if(busy_bank) + to_chat(user, "\The [src] is already in use.") + return + busy_bank = TRUE + var/I = persist_item_savefile_load(user, "type") + var/Iname = persist_item_savefile_load(user, "name") + var/choice = tgui_alert(user, "What would you like to do [src]?", "[src]", list("Check contents", "Retrieve item", "Info", "Cancel"), timeout = 10 SECONDS) + if(!choice || choice == "Cancel" || !Adjacent(user) || inoperable() || panel_open) + busy_bank = FALSE + return + else if(choice == "Check contents" && I) + to_chat(user, "\The [src] has \the [Iname] for you!") + busy_bank = FALSE + else if(choice == "Retrieve item" && I) + if(user.hands_are_full()) + to_chat(user,"Your hands are full!") + busy_bank = FALSE + return + if(user.ckey in item_takers) + to_chat(user, "You have already taken something out of \the [src] this shift.") + busy_bank = FALSE + return + choice = tgui_alert(user, "If you remove this item from the bank, it will be unable to be stored again. Do you still want to remove it?", "[src]", list("No", "Yes"), timeout = 10 SECONDS) + icon_state = "item_bank_o" + if(!choice || choice == "No" || !Adjacent(user) || inoperable() || panel_open) + busy_bank = FALSE + icon_state = "item_bank" + return + else if(!do_after(user, 10 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) || inoperable()) + busy_bank = FALSE + icon_state = "item_bank" + return + var/obj/N = new I(get_turf(src)) + log_admin("[key_name_admin(user)] retrieved [N] from the item bank.") + visible_message("\The [src] dispenses the [N] to \the [user].") + user.put_in_hands(N) + N.persist_storable = FALSE + var/path = src.persist_item_savefile_path(user) + var/savefile/F = new /savefile(src.persist_item_savefile_path(user)) + F["persist item"] << null + F["persist name"] << null + fdel(path) + item_takers += user.ckey + busy_bank = FALSE + icon_state = "item_bank" + else if(choice == "Info") + to_chat(user, "\The [src] can store a single item for you between shifts! Anything that has been retrieved from the bank cannot be stored again in the same shift. Anyone can withdraw from the bank one time per shift. Some items are not able to be accepted by the bank.") + busy_bank = FALSE + return + else if(!I) + to_chat(user, "\The [src] doesn't seem to have anything for you...") + busy_bank = FALSE + +/obj/machinery/item_bank/attackby(obj/item/O, mob/living/user) + if(!ishuman(user)) + return + if(busy_bank) + to_chat(user, "\The [src] is already in use.") + return + busy_bank = TRUE + var/I = persist_item_savefile_load(user, "type") + if(!istool(O) && O.persist_storable) + if(ispath(I)) + to_chat(user, "You cannot store \the [O]. You already have something stored.") + busy_bank = FALSE + return + var/choice = tgui_alert(user, "If you store \the [O], anything it contains may be lost to \the [src]. Are you sure?", "[src]", list("Store", "Cancel"), timeout = 10 SECONDS) + if(!choice || choice == "Cancel" || !Adjacent(user) || inoperable() || panel_open) + busy_bank = FALSE + return + for(var/obj/check in O.contents) + if(!check.persist_storable) + to_chat(user, "\The [src] buzzes. \The [O] contains [check], which cannot be stored. Please remove this item before attempting to store \the [O]. As a reminder, any contents of \the [O] will be lost if you store it with contents.") + busy_bank = FALSE + return + user.visible_message("\The [user] begins storing \the [O] in \the [src].","You begin storing \the [O] in \the [src].") + icon_state = "item_bank_o" + if(!do_after(user, 10 SECONDS, src, exclusive = TASK_ALL_EXCLUSIVE) || inoperable()) + busy_bank = FALSE + icon_state = "item_bank" + return + src.persist_item_savefile_save(user, O) + user.visible_message("\The [user] stores \the [O] in \the [src].","You stored \the [O] in \the [src].") + log_admin("[key_name_admin(user)] stored [O] in the item bank.") + qdel(O) + busy_bank = FALSE + icon_state = "item_bank" + else + to_chat(user, "You cannot store \the [O]. \The [src] either does not accept that, or it has already been retrieved from storage this shift.") + busy_bank = FALSE + +/////STORABLE ITEMS AND ALL THAT JAZZ///// +//I am only really intending this to be used for single items. Mostly stuff you got right now, but can't/don't want to use right now. +//It is not at all intended to be a thing that just lets you hold on to stuff forever, but just until it's the right time to use it. + +/obj + + var/persist_storable = TRUE //If this is true, this item can be stored in the item bank. + //This is automatically set to false when an item is removed from storage + +/////LIST OF STUFF WE DON'T WANT PEOPLE STORING///// + +/obj/item/device/pda + persist_storable = FALSE +/obj/item/device/communicator + persist_storable = FALSE +/obj/item/weapon/card + persist_storable = FALSE +/obj/item/weapon/holder + persist_storable = FALSE +/obj/item/device/radio + persist_storable = FALSE +/obj/item/device/encryptionkey + persist_storable = FALSE +/obj/item/weapon/storage //There are lots of things that have stuff that we may not want people to just have. And this is mostly intended for a single thing. + persist_storable = FALSE //And it would be annoying to go through and consider all of them, so default to disabled. +/obj/item/weapon/storage/backpack //But we can enable some where it makes sense. Backpacks and their variants basically never start with anything in them, as an example. + persist_storable = TRUE +/obj/item/weapon/reagent_containers/hypospray/vial + persist_storable = FALSE +/obj/item/weapon/cmo_disk_holder + persist_storable = FALSE +/obj/item/device/defib_kit/compact/combat + persist_storable = FALSE +/obj/item/clothing/glasses/welding/superior + persist_storable = FALSE +/obj/item/clothing/shoes/magboots/adv + persist_storable = FALSE +/obj/item/weapon/rig + persist_storable = FALSE +/obj/item/clothing/head/helmet/space/void + persist_storable = FALSE +/obj/item/clothing/suit/space/void + persist_storable = FALSE +/obj/item/weapon/grab + persist_storable = FALSE +/obj/item/weapon/grenade + persist_storable = FALSE +/obj/item/weapon/hand_tele + persist_storable = FALSE +/obj/item/weapon/paper + persist_storable = FALSE +/obj/item/weapon/backup_implanter + persist_storable = FALSE +/obj/item/weapon/disk/nuclear + persist_storable = FALSE +/obj/item/weapon/gun/energy/locked //These are guns with security measures on them, so let's say the box won't let you put them in there. + persist_storable = FALSE //(otherwise explo will just put their locker/vendor guns into it every round) +/obj/item/device/retail_scanner + persist_storable = FALSE +/obj/item/weapon/telecube + persist_storable = FALSE +/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine + persist_storable = FALSE +/obj/item/weapon/gun/energy/sizegun/admin + persist_storable = FALSE +/obj/item/weapon/gun/energy/sizegun/abductor + persist_storable = FALSE +/obj/item/stack + persist_storable = FALSE +/obj/item/weapon/book + persist_storable = FALSE +/obj/item/weapon/melee/cursedblade + persist_storable = FALSE +/obj/item/device/paicard + persist_storable = FALSE +/obj/item/organ + persist_storable = FALSE +/obj/item/device/soulstone + persist_storable = FALSE +/obj/item/device/aicard + persist_storable = FALSE +/obj/item/device/mmi + persist_storable = FALSE +/obj/item/seeds + persist_storable = FALSE +/obj/item/weapon/reagent_containers/food/snacks/grown + persist_storable = FALSE +/obj/item/weapon/stock_parts + persist_storable = FALSE +/obj/item/weapon/rcd + persist_storable = FALSE \ No newline at end of file diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index dd88a75a76..cb595bd948 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -818,7 +818,9 @@ */ var/displays_id = 1 var/rolled_down = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled + var/rolled_down_icon_override = TRUE var/rolled_sleeves = -1 //0 = unrolled, 1 = rolled, -1 = cannot be toggled + var/rolled_sleeves_icon_override = TRUE sprite_sheets = list( SPECIES_TESHARI = 'icons/inventory/uniform/mob_teshari.dmi', SPECIES_VOX = 'icons/inventory/uniform/mob_vox.dmi' @@ -880,7 +882,7 @@ H = src.loc var/icon/under_icon - if(icon_override) + if(icon_override && rolled_down_icon_override) under_icon = icon_override else if(H && LAZYACCESS(sprite_sheets, H.species.get_bodytype(H))) under_icon = sprite_sheets[H.species.get_bodytype(H)] @@ -903,7 +905,7 @@ H = src.loc var/icon/under_icon - if(icon_override) + if(icon_override && rolled_sleeves_icon_override) under_icon = icon_override else if(H && LAZYACCESS(sprite_sheets, H.species.get_bodytype(H))) under_icon = sprite_sheets[H.species.get_bodytype(H)] diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 7f45fcfdb3..fa84a8c8ec 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -342,6 +342,11 @@ BLIND // can't see anything desc = "A pair of designer sunglasses." icon_state = "aviator" +/obj/item/clothing/glasses/sunglasses/bigshot + name = "big shot's glasses" + desc = "A pair of glasses to help you feel more like a \[BIG SHOT]." + icon_state = "bigshot" + /obj/item/clothing/glasses/welding name = "welding goggles" desc = "Protects the eyes from welders, approved by the mad scientist association." diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm index e280f985c6..b233b87a20 100644 --- a/code/modules/clothing/glasses/hud_vr.dm +++ b/code/modules/clothing/glasses/hud_vr.dm @@ -90,10 +90,12 @@ if(icon_state == "glasses") to_chat(usr, "You darken the electrochromic lenses of \the [src] to one-way transparency.") name = "[initial(name)] (shaded, pr)" + flags_inv |= HIDEEYES icon_state = "sun" else if(icon_state == "sun") to_chat(usr, "You restore the electrochromic lenses of \the [src] to standard two-way transparency.") name = "[initial(name)] (pr)" + flags_inv &= ~HIDEEYES icon_state = "glasses" else to_chat(usr, "The [src] don't seem to support this functionality.") @@ -101,10 +103,12 @@ if(icon_state == "glasses") to_chat(usr, "You darken the electrochromic lenses of \the [src] to one-way transparency.") name = "[initial(name)] (shaded)" + flags_inv |= HIDEEYES icon_state = "sun" else if(icon_state == "sun") to_chat(usr, "You restore the electrochromic lenses of \the [src] to standard two-way transparency.") name = "[initial(name)]" + flags_inv &= ~HIDEEYES icon_state = "glasses" else to_chat(usr, "The [src] don't seem to support this functionality.") @@ -222,7 +226,7 @@
Offers full protection against bright flashes/welders and full access to system alarm monitoring." mode = "best" flash_protection = FLASH_PROTECTION_MAJOR - enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED) + enables_planes = list(VIS_CH_ID,VIS_CH_HEALTH_VR,VIS_CH_STATUS_R,VIS_CH_BACKUP,VIS_CH_WANTED,VIS_AUGMENTED) action_button_name = "AR Console (All Alerts)" tgarscreen_path = /datum/tgui_module/alarm_monitor/all/glasses diff --git a/code/modules/clothing/gloves/miscellaneous_vr.dm b/code/modules/clothing/gloves/miscellaneous_vr.dm index 69de1b5414..4d83bbae5a 100644 --- a/code/modules/clothing/gloves/miscellaneous_vr.dm +++ b/code/modules/clothing/gloves/miscellaneous_vr.dm @@ -41,4 +41,25 @@ desc = "ye olde armored gauntlets" name = "knight gauntlets" icon_state = "brown" - item_state = "brown" \ No newline at end of file + item_state = "brown" + +/obj/item/clothing/gloves/heavy_engineer + desc = "Elbow-length insulated gloves, with added reinforcement. They'll keep your fingers and forearms just that little bit safer from things that might try to melt, mangle, or burn them. A tag on the inside of each glove reads \'PROPERTY OF ENGINEERING, RETURN IF FOUND\'." + name = "heavy-duty engineering gloves" + icon_state = "heavy_engi" + item_state = "heavy_engi" + siemens_coefficient = 0 + permeability_coefficient = 0.05 + flags = THICKMATERIAL + armor = list(melee = 10, bullet = 10, laser = 10, energy = 5, bomb = 0, bio = 30, rad = 30) + icon = 'icons/inventory/hands/item_vr.dmi' + default_worn_icon = 'icons/inventory/hands/mob_vr.dmi' + sprite_sheets = list( + SPECIES_TESHARI = 'icons/inventory/hands/mob_vr_teshari.dmi', + SPECIES_VOX = 'icons/inventory/hands/mob_vr_vox.dmi', + SPECIES_WEREBEAST = 'icons/inventory/hands/mob_vr_werebeast.dmi') + + cold_protection = HANDS + min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE + heat_protection = HANDS + max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE \ No newline at end of file diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 86ce792d4c..d8bfea2b1d 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -84,6 +84,9 @@ * Ranger Hats */ + //Missing onmob sprites. + +/* /obj/item/clothing/head/hardhat/ranger var/hatcolor = "white" name = "ranger helmet" @@ -116,4 +119,5 @@ hatcolor = "orange" /obj/item/clothing/head/hardhat/ranger/yellow - hatcolor = "yellow" \ No newline at end of file + hatcolor = "yellow" +*/ \ No newline at end of file diff --git a/code/modules/clothing/head/hood.dm b/code/modules/clothing/head/hood.dm index a6bef8b838..8f7f752ee0 100644 --- a/code/modules/clothing/head/hood.dm +++ b/code/modules/clothing/head/hood.dm @@ -164,6 +164,16 @@ desc = "A starry winter hood." icon_state = "winterhood_cosmic" +/obj/item/clothing/head/hood/winter/christmasred + name = "red christmas winter hood" + desc = "A red festive winter hood." + icon_state = "winterhood_christmasr" + +/obj/item/clothing/head/hood/winter/christmasgreen + name = "green christmas winter hood" + desc = "A green festive winter hood." + icon_state = "winterhood_christmasg" + // Explorer gear /obj/item/clothing/head/hood/explorer name = "explorer hood" diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 2e492aca03..44715c2576 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -22,12 +22,27 @@ desc = "No one in a commanding position should be without a perfect, white hat of ultimate authority." icon_state = "officercap" +/obj/item/clothing/head/caphat/beret + name = "captain's beret" + desc = "A beret fit for a leader." + icon_state = "beretcap" + //HOP /obj/item/clothing/head/caphat/hop name = "crew resource's hat" desc = "A stylish hat that both protects you from enraged former-crewmembers and gives you a false sense of authority." icon_state = "hopcap" +/obj/item/clothing/head/caphat/hop/beret + name = "head of personnel's beret" + desc = "The symbol of true bureaucratic micromanagement, although in a fancy form." + icon_state = "berethop" + +/obj/item/clothing/head/caphat/hop/beret/white + name = "head of personnel's white beret" + desc = "The symbol of true bureaucratic micromanagement, although in a fancy form." + icon_state = "berethopwhite" + //Chaplain /obj/item/clothing/head/chaplain_hood name = "chaplain's hood" @@ -207,3 +222,62 @@ desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is navy blue." icon_state = "surgcap_navyblue" item_state_slots = list(slot_r_hand_str = "beret_navy", slot_l_hand_str = "beret_navy") + +/obj/item/clothing/head/beret/medical + name = "medical officer's beret" + desc = "A fancy beret with a blue cross, smells sterile." + icon_state = "beretmed" + +/obj/item/clothing/head/beret/medical/chem + name = "chemist's beret" + desc = "A fancy beret with an orange beaker. You're not sure if you should smell it." + icon_state = "beretchem" + +/obj/item/clothing/head/beret/medical/viro + name = "virologist's beret" + desc = "A fancy beret with a green cross. Hopefully it's virus free!" + icon_state = "beretviro" + +/obj/item/clothing/head/beret/medical/cmo + name = "chief medical officer's beret" + desc = "A fancy beret with a green cross, signifying your status in the station's medbay." + icon_state = "beretcmo" + +/obj/item/clothing/head/beret/medical/cmo/blue + name = "chief medical officer's beret" + desc = "A fancy beret with a blue and white cross. Try not to be the chief malpractice officer in it!" + icon_state = "beretcmoblue" + +//Science + +/obj/item/clothing/head/beret/science + name = "scientist's beret" + desc = "A scientist's beret. Looks like it's covered in slime." + icon_state = "beretsci" + +/obj/item/clothing/head/beret/science/robotics + name = "roboticist's beret" + desc = "A roboticist's beret. It strongly smells of oil." + icon_state = "beretrobo" + +/obj/item/clothing/head/beret/science/rd + name = "research director's beret" + desc = "A beret worn only by highly intelligent people. Or so its wearers say." + icon_state = "beretrd" + +//Chief Engineer +/obj/item/clothing/head/beret/engineering/ce + name = "chief engineer's beret" + desc = "A beret that will surely make you look way cooler than a hard hat, although lack of protection is the price." + icon_state = "beretce" + +/obj/item/clothing/head/beret/engineering/ce/white + name = "chief engineer's white beret" + desc = "A beret that will surely make you look way cooler than a hard hat, although lack of protection is the price." + icon_state = "beretcewhite" + +//Quartermaster +/obj/item/clothing/head/beret/qm + name = "quartermaster's beret" + desc = "This headwear shows off your Cargonian leadership." + icon_state = "beretqm" \ No newline at end of file diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 0351e16fca..d299396f79 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -529,4 +529,27 @@ /obj/item/clothing/head/wheat name = "straw hat" desc = "It's a hat made from synthetic straw. Brought to you by \"Country Girls LLC.\" the choice brand for the galaxy's working class." - icon_state = "wheat" \ No newline at end of file + icon_state = "wheat" + +//Ruin Marine (Doom Marine) +/obj/item/clothing/head/marine + name = "marine helmet" + desc = "A marine helmet prop from the popular game 'Ruin'." + icon_state = "marine" + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR + body_parts_covered = HEAD|FACE|EYES + +//Laser Tag Helmets +/obj/item/clothing/head/bluetag + name = "blue laser tag helmet" + desc = "Blue Pride, Station Wide." + icon_state = "bluetag" + flags_inv = HIDEEARS|BLOCKHEADHAIR + body_parts_covered = HEAD|EYES + +/obj/item/clothing/head/redtag + name = "red laser tag helmet" + desc = "Reputed to go faster." + icon_state = "redtag" + flags_inv = HIDEEARS|BLOCKHEADHAIR + body_parts_covered = HEAD|EYES \ No newline at end of file diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 3a79b7177a..5971e072e8 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -302,43 +302,49 @@ w_class = ITEMSIZE_SMALL body_parts_covered = FACE icon_state = "papermask" + action_button_name = "Redraw Design" + action_button_is_hands_free = TRUE + var/list/papermask_designs = list() -/obj/item/clothing/mask/paper/attackby(obj/item/I as obj, mob/living/user as mob, proximity) - if(!proximity) return - if(istype(I, /obj/item/weapon/pen)) - var/drawtype = tgui_alert(user, "Choose what you'd like to draw.", "Faces", list("blank","neutral","eyes","sleeping", "heart", "core", "plus", "square", "bullseye", "vertical", "horizontal", "X", "bug eyes", "double", "mark" )) - switch(drawtype) - if("blank") - src.icon_state = "papermask" - if("neutral") - src.icon_state = "neutralmask" - if("eyes") - src.icon_state = "eyemask" - if("sleeping") - src.icon_state = "sleepingmask" - if("heart") - src.icon_state = "heartmask" - if("core") - src.icon_state = "coremask" - if("plus") - src.icon_state = "plusmask" - if("square") - src.icon_state = "squaremask" - if("bullseye") - src.icon_state = "bullseyemask" - if("vertical") - src.icon_state = "verticalmask" - if("horizontal") - src.icon_state = "horizontalmask" - if("X") - src.icon_state = "xmask" - if("bug eyes") - src.icon_state = "bugmask" - if("double") - src.icon_state = "doublemask" - if("mark") - src.icon_state = "markmask" - return +/obj/item/clothing/mask/paper/Initialize(mapload) + . = ..() + papermask_designs = list( + "Blank" = image(icon = src.icon, icon_state = "papermask"), + "Neutral" = image(icon = src.icon, icon_state = "neutralmask"), + "Eyes" = image(icon = src.icon, icon_state = "eyemask"), + "Sleeping" = image(icon = src.icon, icon_state = "sleepingmask"), + "Heart" = image(icon = src.icon, icon_state = "heartmask"), + "Core" = image(icon = src.icon, icon_state = "coremask"), + "Plus" = image(icon = src.icon, icon_state = "plusmask"), + "Square" = image(icon = src.icon, icon_state = "squaremask"), + "Bullseye" = image(icon = src.icon, icon_state = "bullseyemask"), + "Vertical" = image(icon = src.icon, icon_state = "verticalmask"), + "Horizontal" = image(icon = src.icon, icon_state = "horizontalmask"), + "X" = image(icon = src.icon, icon_state = "xmask"), + "Bugeyes" = image(icon = src.icon, icon_state = "bugmask"), + "Double" = image(icon = src.icon, icon_state = "doublemask"), + "Mark" = image(icon = src.icon, icon_state = "markmask") + ) + +/obj/item/clothing/mask/paper/attack_self(mob/user) + . = ..() + if(!istype(user) || user.incapacitated()) + return + + var/static/list/options = list("Blank" = "papermask", "Neutral" = "neutralmask", "Eyes" = "eyemask", + "Sleeping" ="sleepingmask", "Heart" = "heartmask", "Core" = "coremask", + "Plus" = "plusmask", "Square" ="squaremask", "Bullseye" = "bullseyemask", + "Vertical" = "verticalmask", "Horizontal" = "horizontalmask", "X" ="xmask", + "Bugeyes" = "bugmask", "Double" = "doublemask", "Mark" = "markmask") + + var/choice = show_radial_menu(user, src, papermask_designs, custom_check = FALSE, radius = 36, require_near = TRUE) + + if(src && choice && !user.incapacitated() && in_range(user,src)) + icon_state = options[choice] + user.update_inv_wear_mask() + user.update_action_buttons() + to_chat(user, "Your paper mask now is now [choice].") + return 1 /obj/item/clothing/mask/emotions name = "emotional mask" @@ -346,48 +352,35 @@ w_class = ITEMSIZE_SMALL body_parts_covered = FACE icon_state = "joy" + action_button_name = "Redraw Design" + action_button_is_hands_free = TRUE + var/static/list/joymask_designs = list() -/obj/item/clothing/mask/emotions/attackby(obj/item/I as obj, mob/living/user as mob, proximity) - if(!proximity) return - if(istype(I, /obj/item/weapon/pen)) - var/drawtype = tgui_alert(user, "Choose what emotions you'd like to display.", "Emotions", list("joy","pensive","angry","flushed" )) - switch(drawtype) - if("joy") - src.icon_state = "joy" - if("pensive") - src.icon_state = "pensive" - if("angry") - src.icon_state = "angry" - if("flushed") - src.icon_state = "flushed" - return -//Gaiter scarves -/obj/item/clothing/mask/gaiter - name = "red neck gaiter" - desc = "A slightly worn neck gaiter, it's loose enough to be worn comfortably like a scarf. Commonly used by outdoorsmen and mercenaries, both to keep warm and keep debris away from the face." - icon_state = "gaiter_red" +/obj/item/clothing/mask/emotions/Initialize(mapload) + . = ..() + joymask_designs = list( + "Joy" = image(icon = src.icon, icon_state = "joy"), + "Flushed" = image(icon = src.icon, icon_state = "flushed"), + "Pensive" = image(icon = src.icon, icon_state = "pensive"), + "Angry" = image(icon = src.icon, icon_state = "angry"), + ) -/obj/item/clothing/mask/gaiter/attack_self(mob/user as mob) - if(src.icon_state == initial(icon_state)) - src.icon_state = "[icon_state]_up" - to_chat(user, "You pull the gaiter up over your nose.") - else - src.icon_state = initial(icon_state) - to_chat(user, "You tug the gaiter down around your neck.") - update_clothing_icon() //so our mob-overlays update +/obj/item/clothing/mask/emotions/attack_self(mob/user) + . = ..() + if(!istype(user) || user.incapacitated()) + return -/obj/item/clothing/mask/gaiter/tan - name = "tan neck gaiter" - icon_state = "gaiter_tan" + var/static/list/options = list("Joy" = "joy", "Flushed" = "flushed", "Pensive" = "pensive","Angry" ="angry") -/obj/item/clothing/mask/gaiter/gray - name = "gray neck gaiter" - icon_state = "gaiter_gray" + var/choice = show_radial_menu(user, src, joymask_designs, custom_check = FALSE, radius = 36, require_near = TRUE) -/obj/item/clothing/mask/gaiter/green - name = "green neck gaiter" - icon_state = "gaiter_green" + if(src && choice && !user.incapacitated() && in_range(user,src)) + icon_state = options[choice] + user.update_inv_wear_mask() + user.update_action_buttons() + to_chat(user, "Your [src] now displays a [choice] emotion.") + return 1 /obj/item/clothing/mask/mouthwheat name = "mouth wheat" diff --git a/code/modules/clothing/rings/rings.dm b/code/modules/clothing/rings/rings.dm index b8313c5f97..f07d0ae674 100644 --- a/code/modules/clothing/rings/rings.dm +++ b/code/modules/clothing/rings/rings.dm @@ -63,6 +63,9 @@ ///////////////////////////////////////// //Seals and Signet Rings + +/obj/item/clothing/gloves/ring/seal + var/stamptext = null /obj/item/clothing/gloves/ring/seal/secgen name = "Secretary-General's official seal" desc = "The official seal of the Secretary-General of the Sol Central Government, featured prominently on a silver ring." diff --git a/code/modules/clothing/shoes/boots.dm b/code/modules/clothing/shoes/boots.dm index acdc9f84dd..4ee4395109 100644 --- a/code/modules/clothing/shoes/boots.dm +++ b/code/modules/clothing/shoes/boots.dm @@ -174,6 +174,16 @@ icon_state = "explorer" armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) +/obj/item/clothing/shoes/boots/winter/christmasred + name = "red christmas boots" + desc = "A pair of fluffy red christmas boots!" + icon_state = "winterboots_christmasr" + +/obj/item/clothing/shoes/boots/winter/christmasgreen + name = "green christmas boots" + desc = "A pair of fluffy green christmas boots!" + icon_state = "winterboots_christmasg" + // Allows the wearer to climb cliffs, which could allow for shortcuts or sequence-breaking. /obj/item/clothing/shoes/boots/winter/climbing name = "climbing winter boots" diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm b/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm index 3dff20284f..9d156a1361 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/crusher_gauntlets.dm @@ -13,7 +13,7 @@ usable = 0 toggleable = 1 use_power_cost = 0 - active_power_cost = 2.5 + active_power_cost = 0 passive_power_cost = 0 var/obj/item/weapon/kinetic_crusher/machete/gauntlets/rig/stored_gauntlets diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/passive_protection.dm b/code/modules/clothing/spacesuits/rig/modules/specific/passive_protection.dm new file mode 100644 index 0000000000..c27e0d9ce3 --- /dev/null +++ b/code/modules/clothing/spacesuits/rig/modules/specific/passive_protection.dm @@ -0,0 +1,166 @@ +// contains the Radiation Absorption Device (RAD) and Atmospheric Protective Equipment (APE) modules +// you shits ready for some COPY AND PASTE? +/obj/item/rig_module/rad_shield + name = "radiation absorption device" + desc = "The acronym of this device - R.A.D. - and its full name both convey the application of the module." + description_info = "Through the usage of powered radiation collectors optimized for absorption rather than power generation, it protects the suit's wearer \ + from incoming ionizing radiation and converts it into a significantly less harmful form. This comes at the cost of concerningly high power consumption, \ + and thus should only be used in short bursts." + icon_state = "radsoak" + toggleable = 1 + disruptable = 1 + disruptive = 0 + + use_power_cost = 25 + active_power_cost = 25 + passive_power_cost = 0 + module_cooldown = 30 + + activate_string = "Enable Supplemental Radiation Shielding" + deactivate_string = "Disable Supplemental Radiation Shielding" + + interface_name = "radiation absorption system" + interface_desc = "Provides passive protection against radiation, at the cost of power." + var/stored_rad_armor = 0 + +/obj/item/rig_module/rad_shield/activate() + + if(!..()) + return 0 + + var/mob/living/carbon/human/H = holder.wearer + var/obj/item/clothing/shoes/boots = holder.boots + var/obj/item/clothing/suit/space/rig/chest = holder.chest + var/obj/item/clothing/head/helmet/space/rig/helmet = holder.helmet + var/obj/item/clothing/gloves/gauntlets/rig/gloves = holder.gloves + + to_chat(H, "You activate your suit's powered radiation shielding.") + stored_rad_armor = holder.armor["rad"] + if(boots) + boots.armor["rad"] = 100 + if(chest) + chest.armor["rad"] = 100 + if(helmet) + helmet.armor["rad"] = 100 + if(gloves) + gloves.armor["rad"] = 100 + holder.armor["rad"] = 100 + +/obj/item/rig_module/rad_shield/deactivate() + + if(!..()) + return 0 + + var/mob/living/carbon/human/H = holder.wearer + var/obj/item/clothing/shoes/boots = holder.boots + var/obj/item/clothing/suit/space/rig/chest = holder.chest + var/obj/item/clothing/head/helmet/space/rig/helmet = holder.helmet + var/obj/item/clothing/gloves/gauntlets/rig/gloves = holder.gloves + + to_chat(H, "You deactivate your suit's powered radiation shielding.") + + if(boots) + boots.armor["rad"] = stored_rad_armor + if(chest) + chest.armor["rad"] = stored_rad_armor + if(helmet) + helmet.armor["rad"] = stored_rad_armor + if(gloves) + gloves.armor["rad"] = stored_rad_armor + holder.armor["rad"] = stored_rad_armor + + stored_rad_armor = 0 + +/obj/item/rig_module/rad_shield/advanced + name = "advanced radiation absorption device" + desc = "The acronym of this device - R.A.D. - and its full name both convey the application of the module. It has a changelog inscribed \ + on the underside of the casing." + use_power_cost = 5 + active_power_cost = 5 + +/obj/item/rig_module/atmos_shield + name = "atmospheric protection enhancement suite" + desc = "The acronym of this suite - A.P.E. - unlike its loosely related cousin, the R.A.D., is remarkably unintuitive." + description_info = "Through the usage of powered shielding optimized for protection against the elements rather than from external physical issues, \ + it protects the suit's wearer from atmospheric pressure and temperatures. This comes at the cost of concerningly high power consumption, \ + and thus should only be used in short bursts." + icon_state = "atmosoak" + + toggleable = 1 + disruptable = 1 + disruptive = 0 + + use_power_cost = 25 + active_power_cost = 25 + passive_power_cost = 0 + module_cooldown = 30 + + activate_string = "Enable Powered Atmospheric Shielding" + deactivate_string = "Disable Powered Atmospheric Shielding" + + interface_name = "atmospheric protection enhancements" + interface_desc = "Provides passive protection against the atmosphere, at the cost of power." + var/stored_max_pressure = 0 + var/stored_max_temp = 0 + +/obj/item/rig_module/atmos_shield/activate() + + if(!..()) + return 0 + + var/mob/living/carbon/human/H = holder.wearer + var/obj/item/clothing/shoes/boots = holder.boots + var/obj/item/clothing/suit/space/rig/chest = holder.chest + var/obj/item/clothing/head/helmet/space/rig/helmet = holder.helmet + var/obj/item/clothing/gloves/gauntlets/rig/gloves = holder.gloves + + stored_max_pressure = holder.max_pressure_protection + stored_max_temp = holder.max_heat_protection_temperature + + to_chat(H, "You activate your suit's powered atmospheric shielding.") + + if(boots) + boots.max_pressure_protection = INFINITY + boots.max_heat_protection_temperature = INFINITY + if(chest) + chest.max_pressure_protection = INFINITY + chest.max_heat_protection_temperature = INFINITY + if(helmet) + helmet.max_pressure_protection = INFINITY + helmet.max_heat_protection_temperature = INFINITY + if(gloves) + gloves.max_pressure_protection = INFINITY + gloves.max_heat_protection_temperature = INFINITY + holder.max_pressure_protection = INFINITY + holder.max_heat_protection_temperature = INFINITY + +/obj/item/rig_module/atmos_shield/deactivate() + + if(!..()) + return 0 + + var/mob/living/carbon/human/H = holder.wearer + var/obj/item/clothing/shoes/boots = holder.boots + var/obj/item/clothing/suit/space/rig/chest = holder.chest + var/obj/item/clothing/head/helmet/space/rig/helmet = holder.helmet + var/obj/item/clothing/gloves/gauntlets/rig/gloves = holder.gloves + + to_chat(H, "You deactivate your suit's powered atmospheric shielding.") + + if(boots) + boots.max_pressure_protection = stored_max_pressure + boots.max_heat_protection_temperature = stored_max_temp + if(chest) + chest.max_pressure_protection = stored_max_pressure + chest.max_heat_protection_temperature = stored_max_temp + if(helmet) + helmet.max_pressure_protection = stored_max_pressure + helmet.max_heat_protection_temperature = stored_max_temp + if(gloves) + gloves.max_pressure_protection = stored_max_pressure + gloves.max_heat_protection_temperature = stored_max_temp + holder.max_pressure_protection = stored_max_pressure + holder.max_heat_protection_temperature = stored_max_temp + + stored_max_pressure = 0 + stored_max_temp = 0 \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index a749d6824d..5292209807 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -183,7 +183,7 @@ . += "The access panel is [locked? "locked" : "unlocked"]." . += "The maintenance panel is [open ? "open" : "closed"]." . += "Hardsuit systems are [offline ? "offline" : "online"]." - . += "The cooling stystem is [cooling_on ? "active" : "inactive"]." + . += "The cooling system is [cooling_on ? "active" : "inactive"]." if(open) . += "It's equipped with [english_list(installed_modules)]." @@ -414,10 +414,10 @@ if(!cell) return if(cell.charge <= 0) - to_chat(user, "\The [src] has no power!.") + to_chat(user, "\The [src] has no power!") return if(!suit_is_deployed()) - to_chat(user, "The hardsuit needs to be deployed first!.") + to_chat(user, "The hardsuit needs to be deployed first!") return cooling_on = 1 diff --git a/code/modules/clothing/spacesuits/rig/rig_tgui.dm b/code/modules/clothing/spacesuits/rig/rig_tgui.dm index 0a493264e5..66c7266d3d 100644 --- a/code/modules/clothing/spacesuits/rig/rig_tgui.dm +++ b/code/modules/clothing/spacesuits/rig/rig_tgui.dm @@ -51,6 +51,7 @@ else data["ai"] = FALSE + data["cooling"] = cooling_on data["sealed"] = !canremove data["sealing"] = sealing data["helmet"] = (helmet ? "[helmet.name]" : "None.") @@ -130,6 +131,9 @@ if("toggle_seals") toggle_seals(usr) . = TRUE + if("toggle_cooling") + toggle_cooling(usr) // cooling toggles have its own to_chats, tbf + . = TRUE if("toggle_ai_control") ai_override_enabled = !ai_override_enabled notify_ai("Synthetic suit control has been [ai_override_enabled ? "enabled" : "disabled"].") diff --git a/code/modules/clothing/spacesuits/void/event.dm b/code/modules/clothing/spacesuits/void/event.dm index a80b3eb972..0fff3afcad 100644 --- a/code/modules/clothing/spacesuits/void/event.dm +++ b/code/modules/clothing/spacesuits/void/event.dm @@ -260,6 +260,32 @@ /obj/item/weapon/cell ) +//Miner's Crewsuit (BROWN) +//Basically just the basic suit, but with brown markings. If anyone wants to tweak this, go wild. +/obj/item/clothing/head/helmet/space/void/refurb/mining + name = "vintage miner's's voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. This one has brown markings, denoting it as a miner's helmet." + icon_state = "rig0-vintageminer" + item_state_slots = list(slot_r_hand_str = "syndicate-helm-black", slot_l_hand_str = "syndicate-helm-black") + armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) + light_overlay = "helmet_light" + +/obj/item/clothing/suit/space/void/refurb/mining + name = "vintage miner's voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. This one has brown markings, denoting it as a miner's suit." + icon_state = "rig-vintageminer" + item_state_slots = list(slot_r_hand_str = "sec_voidsuitTG", slot_l_hand_str = "sec_voidsuitTG") + armor = list(melee = 30, bullet = 15, laser = 15,energy = 5, bomb = 20, bio = 100, rad = 50) + allowed = list(/obj/item/device/flashlight, + /obj/item/weapon/tank, + /obj/item/device/suit_cooling_unit, + /obj/item/weapon/storage/briefcase/inflatable, + /obj/item/device/gps, + /obj/item/device/radio/beacon, + /obj/item/weapon/pickaxe, + /obj/item/weapon/shovel + ) + //Mercenary Crewsuit (RED, CROSS) //The best of the best, this should be ultra-rare /obj/item/clothing/head/helmet/space/void/refurb/mercenary diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index a786acfd51..dd8e8fce2c 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -55,6 +55,15 @@ /obj/item/clothing/suit/space/void/refurb/pilot/talon name = "talon pilot voidsuit" +/obj/item/clothing/head/helmet/space/void/refurb/mining/talon + name = "talon miner voidsuit helmet" + desc = "A refurbished early contact era voidsuit helmet of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. The visor has a bad habit of fogging up and collecting condensation, but it beats sucking hard vacuum. \"ITV TALON\" has been stamped onto the sides of the helmet." + camera_networks = list(NETWORK_TALON_HELMETS) + +/obj/item/clothing/suit/space/void/refurb/mining/talon + name = "talon miner voidsuit" + desc = "A refurbished early contact era voidsuit of human design. These things aren't especially good against modern weapons but they're sturdy, incredibly easy to come by, and there are lots of spare parts for repairs. Many old-timer spacers swear by these old things, even if new powered hardsuits have more features and better armor. \"ITV TALON\" is stamped across the left side of the breastplate in faded faux-gold." + /obj/item/clothing/head/helmet/space/void/refurb/research/talon name = "talon scientific voidsuit helmet" camera_networks = list(NETWORK_TALON_HELMETS) diff --git a/code/modules/clothing/suits/armor_vr.dm b/code/modules/clothing/suits/armor_vr.dm index c4a515d4f6..a55d6ff93d 100644 --- a/code/modules/clothing/suits/armor_vr.dm +++ b/code/modules/clothing/suits/armor_vr.dm @@ -114,6 +114,8 @@ icon_state = "bedevere" body_parts_covered = UPPER_TORSO|LOWER_TORSO + + //Deluxe explorer suit /obj/item/clothing/suit/armor/pcarrier/explorer/deluxe name = "modular explorer suit" @@ -123,7 +125,7 @@ /obj/item/clothing/suit/armor/crusader name = "crusader armor" desc = "God will protect those who defend his faith." - + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0) icon = 'icons/inventory/suit/item_vr.dmi' @@ -133,9 +135,37 @@ /obj/item/clothing/head/helmet/crusader name = "crusader helmet" desc = "God will protect those who defend his faith." - + armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 30, "bio" = 0, "rad" = 0) icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "crusader_head" + +/obj/item/clothing/suit/armor/combat/crusader_explo + name = "explorer low tech suit" + desc = "A low tech armoured suit for exploring harsh environments." + icon_state = "crusader_explo" + icon = 'icons/obj/clothing/knights_vr.dmi' + icon_override = 'icons/obj/clothing/knights_vr.dmi' + flags = THICKMATERIAL + body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE + cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS + slowdown=0 + siemens_coefficient = 0.9 + armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 35, bio = 75, rad = 35) // Inferior to sec vests in bullet/laser but better for environmental protection. + allowed = list( + /obj/item/device/flashlight, + /obj/item/weapon/gun, + /obj/item/ammo_magazine, + /obj/item/weapon/melee, + /obj/item/weapon/material/knife, + /obj/item/weapon/tank, + /obj/item/device/radio, + /obj/item/weapon/pickaxe + ) + +/obj/item/clothing/suit/armor/combat/crusader_explo/FM + name = "field medic low tech suit" + icon_state = "crusader_explo/FM" diff --git a/code/modules/clothing/suits/hooded.dm b/code/modules/clothing/suits/hooded.dm index cd5fb97d1f..f1eb67dc03 100644 --- a/code/modules/clothing/suits/hooded.dm +++ b/code/modules/clothing/suits/hooded.dm @@ -345,6 +345,18 @@ light_range = 1.2 light_on = TRUE +/obj/item/clothing/suit/storage/hooded/wintercoat/christmasred + name = "red christmas winter coat" + desc = "A festive red Christmas coat! Smells like Candy Cane!" + icon_state = "coatchristmasr" + hoodtype = /obj/item/clothing/head/hood/winter/christmasred + +/obj/item/clothing/suit/storage/hooded/wintercoat/christmasgreen + name = "green christmas winter coat" + desc = "A festive green Christmas coat! Smells like Candy Cane!" + icon_state = "coatchristmasg" + hoodtype = /obj/item/clothing/head/hood/winter/christmasgreen + // winter coats end here /obj/item/clothing/suit/storage/hooded/explorer diff --git a/code/modules/clothing/suits/labcoat_vr.dm b/code/modules/clothing/suits/labcoat_vr.dm index 4f82afd2e3..1e3f13a411 100644 --- a/code/modules/clothing/suits/labcoat_vr.dm +++ b/code/modules/clothing/suits/labcoat_vr.dm @@ -1,7 +1,7 @@ // 'Modern' labcoats /obj/item/clothing/suit/storage/toggle/labcoat/modern name = "modern labcoat" - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "labcoat_mod" @@ -25,3 +25,41 @@ icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "bio_mod" + +// Labcoat icons from before the fulpstation labcoats became default +// denoted "old" to avoid conflict + +/obj/item/clothing/suit/storage/toggle/labcoat/old + name = "old-school labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old" + +/obj/item/clothing/suit/storage/toggle/labcoat/old/tox + name = "old-school scientist's labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old_tox" + +/obj/item/clothing/suit/storage/toggle/labcoat/old/chem + name = "old-school chemist's labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old_chem" + +/obj/item/clothing/suit/storage/toggle/labcoat/old/vir + name = "old-school virologist's labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old_vir" + +/obj/item/clothing/suit/storage/toggle/labcoat/old/cmo + name = "old-school CMO's labcoat" + + icon = 'icons/inventory/suit/item_vr.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' + icon_state = "labcoat_old_cmo" \ No newline at end of file diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 3d44c893fe..61825a6e5d 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -13,7 +13,7 @@ */ /obj/item/clothing/suit/bluetag - name = "blue laser tag armour" + name = "blue laser tag armor" desc = "Blue Pride, Station Wide." icon_state = "bluetag" item_state_slots = list(slot_r_hand_str = "tdblue", slot_l_hand_str = "tdblue") @@ -22,8 +22,13 @@ allowed = list (/obj/item/weapon/gun/energy/lasertag/blue) siemens_coefficient = 3.0 +/obj/item/clothing/suit/bluetag/sub + name = "Brigader Armor" + desc = "Repilca rmor commonly worn by Spacer Union Brigade members from the hit series Spacer Trail. Modified for Laser Tag (Blue Team)." + icon_state = "bluetag2" + /obj/item/clothing/suit/redtag - name = "red laser tag armour" + name = "red laser tag armor" desc = "Reputed to go faster." icon_state = "redtag" item_state_slots = list(slot_r_hand_str = "tdred", slot_l_hand_str = "tdred") @@ -32,6 +37,11 @@ allowed = list (/obj/item/weapon/gun/energy/lasertag/red) siemens_coefficient = 3.0 +/obj/item/clothing/suit/redtag/dom + name = "Mu'tu'bi Armor" + desc = "Repilca rmor commonly worn by Dominion Of Mu'tu'bi soldiers from the hit series Spacer Trail. Modified for Laser Tag (Red Team)." + icon_state = "redtag2" + /* * Costume */ @@ -984,4 +994,13 @@ src.icon_state = "caution" src.item_state = "caution" usr.show_message("You turn the wet floor sign off.") - update_clothing_icon() \ No newline at end of file + update_clothing_icon() + +//Ruin Marine (Doom Marine) +/obj/item/clothing/suit/marine + name = "marine armor" + desc = "A set of marine prop armor from the popular game 'Ruin'." + icon_state = "marine" + body_parts_covered = FEET|LOWER_TORSO|UPPER_TORSO|LEGS + flags_inv = HIDESHOES|HIDEJUMPSUIT|HIDETIE|HIDEHOLSTER + item_state_slots = list(slot_r_hand_str = "green_labcoat", slot_l_hand_str = "green_labcoat") \ No newline at end of file diff --git a/code/modules/clothing/suits/utility_vr.dm b/code/modules/clothing/suits/utility_vr.dm index 19475fbe8c..9302fcf11b 100644 --- a/code/modules/clothing/suits/utility_vr.dm +++ b/code/modules/clothing/suits/utility_vr.dm @@ -29,3 +29,5 @@ SPECIES_VOX = 'icons/inventory/suit/mob_vox.dmi', SPECIES_WEREBEAST = 'icons/inventory/suit/mob_vr_werebeast.dmi' ) + + diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 2157f9ceec..a815ff3e4a 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -435,4 +435,73 @@ name = "sash" desc = "A plain, unadorned sash." icon_state = "sash" - slot = ACCESSORY_SLOT_OVER \ No newline at end of file + slot = ACCESSORY_SLOT_OVER + +//Gaiter scarves +/obj/item/clothing/accessory/gaiter + name = "red neck gaiter" + desc = "A slightly worn neck gaiter, it's loose enough to be worn comfortably like a scarf. Commonly used by outdoorsmen and mercenaries, both to keep warm and keep debris away from the face." + icon_state = "gaiter_red" + slot_flags = SLOT_MASK | SLOT_TIE + body_parts_covered = FACE + w_class = ITEMSIZE_SMALL + slot = ACCESSORY_SLOT_INSIGNIA // snowflakey, i know, shut up + item_flags = FLEXIBLEMATERIAL + var/breath_masked = FALSE + var/obj/item/clothing/mask/breath/breathmask + action_button_name = "Pull On Gaiter" + +/obj/item/clothing/accessory/gaiter/update_clothing_icon() + . = ..() + if(ismob(src.loc)) + var/mob/M = src.loc + M.update_inv_wear_mask() + +/obj/item/clothing/accessory/gaiter/attackby(obj/item/I, mob/user) + if(istype(I, /obj/item/clothing/mask/breath)) + to_chat(user, SPAN_NOTICE("You tuck [I] behind [src].")) + breathmask = I + breath_masked = TRUE + user.drop_from_inventory(I, drop_location()) + I.forceMove(src) + item_flags &= ~FLEXIBLEMATERIAL + . = ..() + +/obj/item/clothing/accessory/gaiter/AltClick(mob/user) + . = ..() + if(breath_masked && breathmask) + to_chat(user, SPAN_NOTICE("You pull [breathmask] out from behind [src], and it drops to your feet.")) + breathmask.forceMove(drop_location()) + breathmask = null + breath_masked = FALSE + item_flags &= ~AIRTIGHT + item_flags |= FLEXIBLEMATERIAL + +/obj/item/clothing/accessory/gaiter/attack_self(mob/user) + var/gaiterstring = "You pull [src] " + if(src.icon_state == initial(icon_state)) + src.icon_state = "[icon_state]_up" + gaiterstring += "up over your nose[breath_masked ? " and secure the mask tucked underneath." : "."]" + if(breath_masked) + item_flags |= AIRTIGHT + else + src.icon_state = initial(icon_state) + gaiterstring += "down around your neck[breath_masked ? " and dislodge the mask tucked underneath." : "."]" + body_parts_covered &= ~FACE + if(breath_masked) + item_flags &= ~AIRTIGHT + to_chat(user, SPAN_NOTICE(gaiterstring)) + qdel(mob_overlay) // we're gonna need to refresh these + update_clothing_icon() //so our mob-overlays update + +/obj/item/clothing/accessory/gaiter/tan + name = "tan neck gaiter" + icon_state = "gaiter_tan" + +/obj/item/clothing/accessory/gaiter/gray + name = "gray neck gaiter" + icon_state = "gaiter_gray" + +/obj/item/clothing/accessory/gaiter/green + name = "green neck gaiter" + icon_state = "gaiter_green" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index e358ed2574..8367a6e045 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -67,6 +67,36 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO rolled_sleeves = -1 //Please never +/obj/item/clothing/under/clown //i'm only putting it here to make subtypes of it, since the original suit is under/rank/clown + name = "clown suit" + desc = "Honk!" + icon_state = "clown" + rolled_sleeves = -1 + +/obj/item/clothing/under/clown/green + name = "green clown suit" + icon_state = "greenclown" + +/obj/item/clothing/under/clown/purple + name = "purple clown suit" + icon_state = "purpleclown" + +/obj/item/clothing/under/clown/yellow + name = "yellow clown suit" + icon_state = "yellowclown" + +/obj/item/clothing/under/clown/orange + name = "orange clown suit" + icon_state = "orangeclown" + +/obj/item/clothing/under/clown/blue + name = "blue clown suit" + icon_state = "blueclown" + +/obj/item/clothing/under/clown/rainbow + name = "rainbow clown suit" + icon_state = "rainbowclown" + /obj/item/clothing/under/rank/vice name = "vice officer's jumpsuit" desc = "It's the standard issue pretty-boy outfit, as seen on Holo-Vision." @@ -244,6 +274,11 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO rolled_sleeves = -1 //Please never +/obj/item/clothing/under/sexymime/dress //another style of dress closer to the jumpsuit than the sexy outfit + name = "mime's jumpskirt" + desc = "It's not very colourful." + icon_state = "mimedress" + /obj/item/clothing/under/gladiator name = "gladiator uniform" desc = "Are you not entertained? Is that not why you are here?" @@ -1420,4 +1455,25 @@ icon_state = "hedberg_tech" worn_state = "hedberg_tech" armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) // Equivalent to engineer's jumpsuit. - rolled_sleeves = 0 \ No newline at end of file + rolled_sleeves = 0 + +//christmas stuff +/obj/item/clothing/under/christmas/red + name = "red christmas suit" + desc = "A simple red christmas suit that looks close to Santa's!" + icon_state = "christmasred" + +/obj/item/clothing/under/christmas/green + name = "green christmas suit" + desc = "A simple green christmas suit. Smells minty!" + icon_state = "christmasgreen" + +/obj/item/clothing/under/christmas/croptop/red + name = "red crop-top christmas suit" + desc = "A simple red christmas suit that doesn't quite looks like Mrs Claus'." + icon_state = "christmascroppedred" + +/obj/item/clothing/under/christmas/croptop/green + name = "green crop-top christmas suit" + desc = "A simple green christmas suit that doesn't quite looks like Mrs Claus'. Smells minty!" + icon_state = "christmascroppedgreen" \ No newline at end of file diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index b0879f0222..eb53f9e138 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -102,7 +102,7 @@ if(new_size != H.size_multiplier) if(!original_size) original_size = H.size_multiplier - H.resize(new_size/100, ignore_prefs = TRUE) // Ignores prefs because you can only resize yourself + H.resize(new_size/100, uncapped = H.has_large_resize_bounds(), ignore_prefs = TRUE) // Ignores prefs because you can only resize yourself H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") else //They chose their current size. return @@ -115,6 +115,66 @@ original_size = null H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") +/obj/item/clothing/gloves/bluespace + name = "size standardization bracelet" + desc = "A somewhat bulky metal bracelet featuring a crystal, glowing blue. The outer side of the bracelet has an elongated case that one might imagine contains electronic components. This bracelet is used to standardize the size of crewmembers who may need a non-permanent size assist." + icon = 'icons/inventory/accessory/item_vr.dmi' + icon_state = "bs_bracelet" + w_class = ITEMSIZE_TINY + glove_level = 1 + var/original_size + var/last_activated + var/emagged = FALSE + var/target_size = 1 + +/obj/item/clothing/gloves/bluespace/mob_can_equip(mob/M, gloves, disable_warning = 0) + . = ..() + if(. && ishuman(M)) + var/mob/living/carbon/human/H = M + if(!H.resizable) + return + if(H.size_multiplier != target_size) + if(!(world.time - last_activated > 10 SECONDS)) + to_chat(M, "\The [src] flickers. It seems to be recharging.") + return + last_activated = world.time + original_size = H.size_multiplier + H.resize(target_size, uncapped = emagged, ignore_prefs = FALSE) //In case someone else tries to put it on you. + H.visible_message("The space around [H] distorts as they change size!","The space around you distorts as you change size!") + log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.") + +/obj/item/clothing/gloves/bluespace/mob_can_unequip(mob/M, gloves, disable_warning = 0) + . = ..() + if(. && ishuman(M) && original_size) + var/mob/living/carbon/human/H = M + if(!H.resizable) + return + last_activated = world.time + H.resize(original_size, uncapped = emagged, ignore_prefs = FALSE) + original_size = null + H.visible_message("The space around [H] distorts as they return to their original size!","The space around you distorts as you return to your original size!") + log_admin("Admin [key_name(M)]'s size was altered by a bluespace bracelet.") + to_chat(M, "\The [src] flickers. It is now recharging and will be ready again in thirty seconds.") + +/obj/item/clothing/gloves/bluespace/examine(var/mob/user) + . = ..() + var/cooldowntime = round((10 SECONDS - (world.time - last_activated)) * 0.1) + if(Adjacent(user)) + if(cooldowntime >= 0) + . += "It appears to be recharging." + if(emagged) + . += "The crystal is flickering." + +/obj/item/clothing/gloves/bluespace/emag_act(R_charges, var/mob/user, emag_source) + . = ..() + if(!emagged) + emagged = TRUE + target_size = (rand(1,300)) /100 + if(target_size < 0.1) + target_size = 0.1 + user.visible_message("\The [user] swipes the [emag_source] over the \the [src].","You swipes the [emag_source] over the \the [src].") + return 1 + //Same as Nanotrasen Security Uniforms /obj/item/clothing/under/ert armor = list(melee = 5, bullet = 10, laser = 10, energy = 5, bomb = 5, bio = 0, rad = 0) @@ -142,7 +202,9 @@ name = "pizza delivery uniform" desc = "A dedicated outfit for pizza delivery people, one of most dangerous occupations around these parts. Can be rolled up for extra show of skin." icon = 'icons/inventory/uniform/item_vr.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' rolled_down_icon = 'icons/inventory/uniform/mob_vr_rolled_down.dmi' + rolled_down_icon_override = FALSE icon_state = "pizzadelivery" item_state = "pizzadelivery" rolled_down = 0 @@ -158,6 +220,8 @@ icon_state = "talon_basic" item_state = "talon_basic" rolled_sleeves = 0 + rolled_down_icon_override = FALSE + rolled_sleeves_icon_override = FALSE /obj/item/clothing/under/rank/talon/proper name = "Talon proper jumpsuit" @@ -168,6 +232,8 @@ icon_state = "talon_jumpsuit" item_state = "talon_jumpsuit" rolled_sleeves = 0 + rolled_down_icon_override = FALSE + rolled_sleeves_icon_override = FALSE /obj/item/clothing/under/rank/talon/security name = "Talon security jumpsuit" @@ -178,6 +244,8 @@ icon_state = "talon_security" item_state = "talon_security" rolled_sleeves = 0 + rolled_down_icon_override = FALSE + rolled_sleeves_icon_override = FALSE /obj/item/clothing/under/rank/talon/pilot name = "Talon pilot jumpsuit" @@ -188,6 +256,8 @@ icon_state = "talon_pilot" item_state = "talon_pilot" rolled_sleeves = 0 + rolled_down_icon_override = FALSE + rolled_sleeves_icon_override = FALSE /obj/item/clothing/under/rank/talon/command name = "Talon command jumpsuit" @@ -198,6 +268,8 @@ icon_state = "talon_captain" item_state = "talon_captain" rolled_sleeves = 0 + rolled_down_icon_override = FALSE + rolled_sleeves_icon_override = FALSE // Excelsior uniforms /obj/item/clothing/under/excelsior @@ -226,3 +298,14 @@ icon_state = "summerdress3" /obj/item/clothing/under/summerdress/blue icon_state = "summerdress2" + +/obj/item/clothing/under/dress/dress_cap/femformal // formal in the loosest sense. because it's going to be taken off. or something. funnier in my head i swear + name = "site manager's feminine formalwear" + desc = "Essentially a skimpy...dress? Leotard? Whatever it is, it has the coloration and markings suitable for a site manager or rough equivalent." + icon = 'icons/inventory/uniform/item_vr.dmi' + default_worn_icon = 'icons/inventory/uniform/mob_vr.dmi' + icon_state = "lewdcap" + item_state = "lewdcap" + rolled_sleeves = -1 + rolled_down = -1 + body_parts_covered = UPPER_TORSO // frankly this thing's a fucking embarassment \ No newline at end of file diff --git a/code/modules/economy/vending.dm b/code/modules/economy/vending.dm index 09a9b480aa..f073f3f396 100644 --- a/code/modules/economy/vending.dm +++ b/code/modules/economy/vending.dm @@ -42,6 +42,10 @@ var/list/prices = list() // Prices for each item, list(/type/path = price), items not in the list don't have a price. /// Set automatically, enables pricing var/has_prices = FALSE + // This one is used for refill cartridge use. + var/list/refill = list() // For each, use the following pattern: + // Enables refilling with appropriate cartridges + var/refillable = TRUE // List of vending_product items available. var/list/product_records = list() @@ -126,12 +130,31 @@ GLOBAL_LIST_EMPTY(vending_products) if(LAZYLEN(premium)) has_premium = TRUE + + if(!LAZYLEN(refill) && refillable) // Manually setting refill list prevents the automatic population. By default filled with all entries from normal product. + refill += products + LAZYCLEARLIST(products) LAZYCLEARLIST(contraband) LAZYCLEARLIST(premium) LAZYCLEARLIST(prices) all_products.Cut() +/obj/machinery/vending/proc/refill_inventory() + if(!(LAZYLEN(refill))) //This shouldn't happen, but just in case... + return + + for(var/entry in refill) + var/datum/stored_item/vending_product/current_product + for(var/datum/stored_item/vending_product/product in product_records) + if(product.item_path == entry) + current_product = product + break + if(!current_product) + continue + else + current_product.refill_products(refill[entry]) + /obj/machinery/vending/Destroy() qdel(wires) wires = null @@ -170,6 +193,29 @@ GLOBAL_LIST_EMPTY(vending_products) if(I || istype(W, /obj/item/weapon/spacecash)) attack_hand(user) return + else if(istype(W, /obj/item/weapon/refill_cartridge)) + if(stat & (BROKEN|NOPOWER)) + to_chat(user, "You cannot refill [src] while it is not functioning.") + return + if(!anchored) + to_chat(user, "You cannot refill [src] while it is not secured.") + return + if(panel_open) + to_chat(user, "You cannot refill [src] while it's panel is open.") + return + if(!refillable) + to_chat(user, "\the [src] does not have a refill port.") + return + var/obj/item/weapon/refill_cartridge/RC = W + if(RC.can_refill(src)) + to_chat(user, "You refill [src] using [RC].") + user.drop_from_inventory(RC) + qdel(RC) + refill_inventory() + return + else + to_chat(user, "You cannot refill [src] with [RC].") + return else if(W.is_screwdriver()) panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index 3a4b912f16..dc0939fdf6 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -57,7 +57,7 @@ /obj/item/weapon/reagent_containers/food/drinks/bottle/bluecuracao = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/grenadine = 5, - /obj/item/weapon/reagent_containers/food/condiment/cornoil = 5, + /obj/item/weapon/reagent_containers/food/condiment/cookingoil = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/melonliquor = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/peppermintschnapps = 5, @@ -395,7 +395,8 @@ /obj/item/stack/medical/advanced/bruise_pack = 6, /obj/item/stack/medical/advanced/ointment = 6, /obj/item/stack/medical/splint = 4, - /obj/item/weapon/storage/pill_bottle/carbon = 2) + /obj/item/weapon/storage/pill_bottle/carbon = 2, + /obj/item/clothing/mask/chewable/candy/lolli = 15) contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3, /obj/item/weapon/reagent_containers/pill/stox = 4, /obj/item/weapon/reagent_containers/pill/antitox = 6) @@ -453,6 +454,9 @@ has_logs = 1 can_rotate = 0 +/obj/machinery/vending/wallmed1/public + products = list(/obj/item/stack/medical/bruise_pack = 8,/obj/item/stack/medical/ointment = 8,/obj/item/weapon/reagent_containers/hypospray/autoinjector = 16,/obj/item/device/healthanalyzer = 4) + /obj/machinery/vending/security name = "SecTech" desc = "A security equipment vendor." @@ -584,7 +588,7 @@ icon_state = "dinnerware" products = list( /obj/item/weapon/reagent_containers/food/condiment/yeast = 5, - /obj/item/weapon/reagent_containers/food/condiment/cornoil = 5, + /obj/item/weapon/reagent_containers/food/condiment/cookingoil = 5, /obj/item/weapon/tray = 8, /obj/item/weapon/material/kitchen/utensil/fork = 6, /obj/item/weapon/material/knife/plastic = 6, @@ -630,7 +634,7 @@ /obj/item/device/flashlight/glowstick/yellow = 3) contraband = list(/obj/item/weapon/weldingtool/hugetank = 2, /obj/item/clothing/gloves/fyellow = 2) - premium = list(/obj/item/clothing/gloves/yellow = 1) + premium = list(/obj/item/clothing/gloves/heavy_engineer = 1) //VOREStation Edit - yellow gloves are common in engineering, let's make "premium" actually mean something req_log_access = access_ce has_logs = 1 @@ -1128,6 +1132,46 @@ idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. vending_sound = "machines/vending/vending_cans.ogg" +///////////////////////Donk-Soft!/////////////////////////////////////// + +/obj/machinery/vending/donksoft + name = "Donk-Soft!" + desc = "A toy vendor owned by Donk-Soft, a NanoTrasen sub-company." + description_fluff = "Donk-Soft is a sub-company owned by NanoTrasen that distribute replica weapons that shoot squishy foam darts. \ + They've been a staple of personal entertainment for decades but their buisness has only just moved to the fringes of the galaxy." + icon_state = "donksoft" + product_slogans = "Get your cool toys today!;Quality toy weapons for cheap prices!" + product_ads = "Express your inner child today!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" + products = list(/obj/item/ammo_magazine/ammo_box/foam = 20, + /obj/item/weapon/storage/belt/dbandolier = 5, + /obj/item/ammo_magazine/mfoam_dart/pistol = 10, + /obj/item/ammo_magazine/mfoam_dart/smg = 10, + /obj/item/weapon/gun/projectile/shotgun/pump/toy = 5, + /obj/item/weapon/gun/projectile/revolver/toy/sawnoff = 5, + /obj/item/weapon/gun/projectile/pistol/toy = 5, + /obj/item/weapon/gun/projectile/pistol/toy/n99 = 5, + /obj/item/weapon/gun/projectile/shotgun/pump/toy/levergun = 5, + /obj/item/weapon/gun/projectile/revolver/toy = 5, + /obj/item/weapon/gun/projectile/revolver/toy/big_iron = 5, + /obj/item/weapon/gun/projectile/revolver/toy/crossbow = 5, + /obj/item/weapon/gun/projectile/automatic/toy = 5 + ) + contraband = list() + prices = list(/obj/item/ammo_magazine/ammo_box/foam = 50, + /obj/item/weapon/storage/belt/dbandolier = 100, + /obj/item/ammo_magazine/mfoam_dart/pistol = 25, + /obj/item/ammo_magazine/mfoam_dart/smg = 25, + /obj/item/weapon/gun/projectile/shotgun/pump/toy = 250, + /obj/item/weapon/gun/projectile/revolver/toy/sawnoff = 150, + /obj/item/weapon/gun/projectile/pistol/toy = 100, + /obj/item/weapon/gun/projectile/pistol/toy/n99 = 175, + /obj/item/weapon/gun/projectile/shotgun/pump/toy/levergun = 250, + /obj/item/weapon/gun/projectile/revolver/toy = 100, + /obj/item/weapon/gun/projectile/revolver/toy/big_iron = 175, + /obj/item/weapon/gun/projectile/revolver/toy/crossbow = 75, + /obj/item/weapon/gun/projectile/automatic/toy = 300) + vending_sound = "machines/vending/vending_cans.ogg" + /* * Department/job vendors to sit in place of lockers taking up space */ @@ -1221,10 +1265,12 @@ /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat = 5, /obj/item/clothing/suit/storage/toggle/labcoat/modern = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old = 5, //VoreStation edit, pre-fulp labcoat. /obj/item/clothing/mask/surgical = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/medical/alt = 5, - /obj/item/clothing/shoes/boots/winter/medical = 5 + /obj/item/clothing/shoes/boots/winter/medical = 5, + /obj/item/clothing/head/beret/medical = 5 ) req_log_access = access_hop has_logs = 1 @@ -1240,7 +1286,9 @@ /obj/item/clothing/under/rank/chemist/skirt = 5, /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat/chemist = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old/chem = 5, //VoreStation edit, pre-fulp labcoat. /obj/item/clothing/suit/storage/hooded/wintercoat/medical/chemist = 5, + /obj/item/clothing/head/beret/medical/chem = 5, /obj/item/weapon/storage/backpack/chemistry = 5, /obj/item/weapon/storage/backpack/satchel/chem = 5, /obj/item/weapon/storage/bag/chemistry = 5 @@ -1276,7 +1324,9 @@ /obj/item/clothing/under/rank/virologist/skirt = 5, /obj/item/clothing/shoes/white = 5, /obj/item/clothing/suit/storage/toggle/labcoat/virologist = 5, - /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old/vir = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/medical/viro = 5, //VoreStation edit, pre-fulp labcoat. + /obj/item/clothing/head/beret/medical/viro = 5, /obj/item/clothing/mask/surgical = 5, /obj/item/weapon/storage/backpack/virology = 5, /obj/item/weapon/storage/backpack/satchel/vir = 5 @@ -1295,11 +1345,13 @@ /obj/item/clothing/under/rank/scientist/skirt = 5, /obj/item/clothing/under/rank/scientist/turtleneck = 5, /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old = 5, //VoreStation edit, pre-fulp labcoat. /obj/item/clothing/suit/storage/toggle/labcoat/modern = 5, /obj/item/clothing/shoes/white = 5, /obj/item/clothing/shoes/slippers = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/science = 5, /obj/item/clothing/shoes/boots/winter/science = 5, + /obj/item/clothing/head/beret/science = 5, /obj/item/weapon/storage/backpack/toxins = 5, /obj/item/weapon/storage/backpack/satchel/tox = 5 ) @@ -1316,6 +1368,7 @@ /obj/item/clothing/under/rank/roboticist = 5, /obj/item/clothing/suit/storage/toggle/labcoat/roboticist = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/science/robotics = 5, + /obj/item/clothing/head/beret/science/robotics = 5, /obj/item/clothing/shoes/black = 5, /obj/item/clothing/gloves/black = 5, /obj/item/weapon/storage/backpack/toxins = 5, @@ -1522,4 +1575,51 @@ /obj/item/clothing/suit/storage/forensics/red = 5 ) req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/mimedrobe + name = "mime wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "..." + icon_state = "mimedrobe" + req_access = list(access_mime) + products = list( + /obj/item/clothing/under/mime = 1, + /obj/item/clothing/under/sexymime = 1, + /obj/item/clothing/under/sexymime/dress = 1, + /obj/item/clothing/mask/gas/mime = 1, + /obj/item/clothing/mask/gas/sexymime = 1, + /obj/item/clothing/head/soft/mime = 1, + /obj/item/clothing/head/collectable/beret = 1, + /obj/item/clothing/suit/suspenders = 1, + /obj/item/clothing/shoes/mime = 1 + ) + req_log_access = access_hop + has_logs = 1 + +/obj/machinery/vending/wardrobe/clowndrobe + name = "clown wardrobe vendor" + desc = "All the things you need to perform your job! Why didn't you already have them?" + product_slogans = "Honk!" + icon_state = "clowndrobe" + req_access = list(access_clown) + products = list( + /obj/item/clothing/under/rank/clown = 1, + /obj/item/clothing/under/sexyclown = 1, + /obj/item/clothing/under/clown/green = 1, + /obj/item/clothing/under/clown/purple = 1, + /obj/item/clothing/under/clown/yellow = 1, + /obj/item/clothing/under/clown/orange = 1, + /obj/item/clothing/under/clown/blue = 1, + /obj/item/clothing/mask/gas/clown_hat = 1, + /obj/item/clothing/mask/gas/sexyclown = 1, + /obj/item/clothing/mask/emotions = 1, + /obj/item/clothing/shoes/clown_shoes = 1, + /obj/item/weapon/reagent_containers/food/snacks/pie = 5, + /obj/item/weapon/bananapeel = 5 + ) + contraband = list( + /obj/item/clothing/under/clown/rainbow = 1 + ) + req_log_access = access_hop has_logs = 1 \ No newline at end of file diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index 774b2bc99e..756a17645f 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -23,6 +23,8 @@ /obj/item/clothing/glasses/omnihud/med = 4, /obj/item/device/glasses_kit = 1, /obj/item/weapon/storage/quickdraw/syringe_case = 4) ..() +// Food Machines (for event/away maps) + //I want this not just as part of the zoo. ;v /obj/machinery/vending/food name = "Food-O-Mat" @@ -234,20 +236,7 @@ contraband = list(/obj/item/weapon/reagent_containers/food/snacks/tofurkey = 10) vend_delay = 10 -//End of food event machines - -/* For later, then -/obj/machinery/vending/weapon_machine - name = "Frozen Star Guns&Ammo" - desc = "A self-defense equipment vending machine. When you need to take care of that clown." - product_slogans = "The best defense is good offense!;Buy for your whole family today!;Nobody can outsmart bullet!;God created man - Frozen Star made them EQUAL!;Nobody can outsmart bullet!;Stupidity can be cured! By LEAD.;Dead kids can't bully your children!" - product_ads = "Stunning!;Take justice in your own hands!;LEADearship!" - icon = 'icons/obj/vending_vr.dmi' - icon_state = "weapon" - products = list(/obj/item/device/flash = 6,/obj/item/weapon/reagent_containers/spray/pepper = 6, /obj/item/weapon/gun/projectile/olivaw = 5, /obj/item/weapon/gun/projectile/giskard = 5, /obj/item/ammo_magazine/mg/cl32/rubber = 20) - contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) - prices = list(/obj/item/device/flash = 600,/obj/item/weapon/reagent_containers/spray/pepper = 800, /obj/item/weapon/gun/projectile/olivaw = 1600, /obj/item/weapon/gun/projectile/giskard = 1200, /obj/item/ammo_magazine/mg/cl32/rubber = 200) -*/ +// Food Machines (for event/away maps) /obj/machinery/vending/fitness/New() products += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 8) @@ -271,6 +260,98 @@ req_log_access = access_cmo has_logs = 1 +//Airlock antitox vendor +/obj/machinery/vending/wallmed_airlock + name = "Airlock NanoMed" + desc = "Wall-mounted Medical Equipment dispenser. This limited-use version dispenses antitoxins with mild painkillers for surface EVAs." + icon_state = "wallmed" + density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude + products = list(/obj/item/weapon/reagent_containers/pill/airlock = 20) + contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 2) + req_log_access = access_cmo + has_logs = 1 + +/obj/machinery/seed_storage/brig + name = "Prisoners' food seed storage" + starting_seeds = list( + /obj/item/seeds/appleseed = 3, + /obj/item/seeds/bananaseed = 3, + /obj/item/seeds/berryseed = 3, + /obj/item/seeds/cabbageseed = 3, + /obj/item/seeds/carrotseed = 3, + /obj/item/seeds/celery = 3, + /obj/item/seeds/chantermycelium = 3, + /obj/item/seeds/cherryseed = 3, + /obj/item/seeds/chiliseed = 3, + /obj/item/seeds/cocoapodseed = 3, + /obj/item/seeds/cornseed = 3, + /obj/item/seeds/durian = 3, + /obj/item/seeds/eggplantseed = 3, + /obj/item/seeds/grapeseed = 3, + /obj/item/seeds/grassseed = 3, + /obj/item/seeds/replicapod = 3, + /obj/item/seeds/lavenderseed = 3, + /obj/item/seeds/lemonseed = 3, + /obj/item/seeds/lettuce = 3, + /obj/item/seeds/limeseed = 3, + /obj/item/seeds/mtearseed = 2, + /obj/item/seeds/orangeseed = 3, + /obj/item/seeds/onionseed = 3, + /obj/item/seeds/peanutseed = 3, + /obj/item/seeds/plumpmycelium = 3, + /obj/item/seeds/poppyseed = 3, + /obj/item/seeds/potatoseed = 3, + /obj/item/seeds/pumpkinseed = 3, + /obj/item/seeds/rhubarb = 3, + /obj/item/seeds/riceseed = 3, + /obj/item/seeds/rose = 3, + /obj/item/seeds/soyaseed = 3, + /obj/item/seeds/pineapple = 3, + /obj/item/seeds/sugarcaneseed = 3, + /obj/item/seeds/sunflowerseed = 3, + /obj/item/seeds/shandseed = 2, + /obj/item/seeds/tobaccoseed = 3, + /obj/item/seeds/tomatoseed = 3, + /obj/item/seeds/towermycelium = 3, + /obj/item/seeds/vanilla = 3, + /obj/item/seeds/watermelonseed = 3, + /obj/item/seeds/wheatseed = 3, + /obj/item/seeds/whitebeetseed = 3, + /obj/item/seeds/wabback = 2) + +/obj/machinery/vending/hydronutrients/brig + name = "Brig NutriMax" + desc = "A plant nutrients vendor. Seems some items aren't included." + products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,/obj/item/weapon/plantspray/pests = 20, + /obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5) + premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) + +/obj/machinery/vending/abductor + name = "Abduct-U" + desc = "A mysterious machine which can fabricate many tools for acquiring test subjects." + icon = 'icons/obj/abductor_vr.dmi' + icon_state = "dispenser_2way" + products = list(/obj/item/weapon/card/id/syndicate/station_access = 1, + /obj/item/weapon/storage/box/syndie_kit/chameleon = 1, + /obj/item/clothing/mask/bandana = 1, + /obj/item/clothing/glasses/sunglasses = 1, + /obj/item/device/radio/headset/syndicate/alt = 1, + /obj/item/device/pda = 1, + /obj/item/device/communicator = 1, + /obj/item/weapon/tape_roll = 2, + /obj/item/weapon/handcuffs = 4, + /obj/item/weapon/handcuffs/legcuffs = 4, + /obj/item/weapon/cell/device/weapon/recharge/alien = 2, + /obj/item/device/chameleon = 1, + /obj/item/weapon/storage/mre/menu11 = 2, + /obj/item/device/flash = 2, + /obj/item/weapon/pen/reagent/paralysis = 4, + /obj/item/device/perfect_tele/alien = 1 + ) + vend_delay = 15 + +// Loadout Vending Machines Start + /obj/machinery/vending/loadout name = "Fingers and Toes" desc = "A special vendor for gloves and shoes!" @@ -1012,7 +1093,367 @@ premium = list(/obj/item/clothing/under/color/rainbow = 1) contraband = list(/obj/item/clothing/under/rank/clown = 1) -//////////////////START OF CHIPS CO. VENDORS////////////////// +/obj/machinery/vending/loadout/loadout_misc + name = "Bits and Bobs" + desc = "A special vendor for things and also stuff!" + product_ads = "You never know when you might need an umbrella.;Hey kid... want some cardemon cards?;Miscellaneous for your miscellaneous heart.;Who's bob? Wouldn't you like to know.;I'm sorry there's no grappling hooks in our umbrellas.;We sell things AND stuff." + icon_state = "loadout_misc" + products = list(/obj/item/weapon/cane = 5, + /obj/item/weapon/pack/cardemon = 25, + /obj/item/weapon/deck/holder = 5, + /obj/item/weapon/deck/cah = 5, + /obj/item/weapon/deck/cah/black = 5, + /obj/item/weapon/deck/tarot = 5, + /obj/item/weapon/deck/cards = 5, + /obj/item/weapon/pack/spaceball = 10, + /obj/item/weapon/storage/pill_bottle/dice = 5, + /obj/item/weapon/storage/pill_bottle/dice_nerd = 5, + /obj/item/weapon/melee/umbrella/random = 10) + prices = list(/obj/item/weapon/cane = 100, + /obj/item/weapon/pack/cardemon = 100, + /obj/item/weapon/deck/holder = 100, + /obj/item/weapon/deck/cah = 100, + /obj/item/weapon/deck/cah/black = 100, + /obj/item/weapon/deck/tarot = 100, + /obj/item/weapon/deck/cards = 100, + /obj/item/weapon/pack/spaceball = 100, + /obj/item/weapon/storage/pill_bottle/dice = 100, + /obj/item/weapon/storage/pill_bottle/dice_nerd = 100, + /obj/item/weapon/melee/umbrella/random = 100) + premium = list(/obj/item/toy/bosunwhistle = 1) + contraband = list(/obj/item/toy/katana = 1) + +/obj/machinery/vending/loadout/overwear + name = "Big D's Best" + desc = "A special vendor using compressed matter cartridges to store large amounts of overwear!" + product_ads = "Dress your best! It's what big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Bid D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" + icon_state = "suit" + vend_delay = 16 + products = list(/obj/item/clothing/suit/storage/apron = 5, + /obj/item/clothing/suit/storage/flannel/aqua = 5, + /obj/item/clothing/suit/storage/toggle/bomber = 5, + /obj/item/clothing/suit/storage/bomber/alt = 5, + /obj/item/clothing/suit/storage/flannel/brown = 5, + /obj/item/clothing/suit/storage/toggle/cardigan = 5, + /obj/item/clothing/accessory/poncho/roles/cloak/custom = 5, + /obj/item/clothing/suit/storage/duster = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/fluff/gntop = 5, + /obj/item/clothing/suit/greatcoat = 5, + /obj/item/clothing/suit/storage/flannel = 5, + /obj/item/clothing/suit/storage/greyjacket = 5, + /obj/item/clothing/suit/storage/hazardvest = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/black = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/red = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/blue = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/green = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/orange = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/cti = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/mu = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/nt = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/smw = 5, + /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 5, + /obj/item/clothing/suit/storage/fluff/jacket/field = 5, + /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 5, + /obj/item/clothing/suit/storage/fluff/jacket/air_force = 5, + /obj/item/clothing/suit/storage/fluff/jacket/navy = 5, + /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 5, + /obj/item/clothing/suit/kamishimo = 5, + /obj/item/clothing/suit/kimono = 5, + /obj/item/clothing/suit/storage/toggle/labcoat = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/blue = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/green = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/orange = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/pink = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/red = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 5, + /obj/item/clothing/suit/storage/toggle/labcoat/old = 5, + /obj/item/clothing/suit/leathercoat = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket = 5, + /obj/item/clothing/suit/storage/leather_jacket_alt = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 5, + /obj/item/clothing/suit/storage/miljacket = 5, + /obj/item/clothing/suit/storage/miljacket/alt = 5, + /obj/item/clothing/suit/storage/miljacket/green = 5, + /obj/item/clothing/suit/storage/apron/overalls = 5, + /obj/item/clothing/suit/storage/toggle/peacoat = 5, + /obj/item/clothing/accessory/poncho = 5, + /obj/item/clothing/accessory/poncho/green = 5, + /obj/item/clothing/accessory/poncho/red = 5, + /obj/item/clothing/accessory/poncho/purple = 5, + /obj/item/clothing/accessory/poncho/blue = 5, + /obj/item/clothing/suit/jacket/puffer = 5, + /obj/item/clothing/suit/jacket/puffer/vest = 5, + /obj/item/clothing/suit/storage/flannel/red = 5, + /obj/item/clothing/suit/unathi/robe = 5, + /obj/item/clothing/suit/storage/snowsuit = 5, + /obj/item/clothing/suit/storage/toggle/internalaffairs = 5, + /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 5, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 5, + /obj/item/clothing/suit/suspenders = 5, + /obj/item/clothing/suit/storage/toggle/track = 5, + /obj/item/clothing/suit/storage/toggle/track/blue = 5, + /obj/item/clothing/suit/storage/toggle/track/green = 5, + /obj/item/clothing/suit/storage/toggle/track/red = 5, + /obj/item/clothing/suit/storage/toggle/track/white = 5, + /obj/item/clothing/suit/storage/trench = 5, + /obj/item/clothing/suit/storage/trench/grey = 5, + /obj/item/clothing/suit/varsity = 5, + /obj/item/clothing/suit/varsity/red = 5, + /obj/item/clothing/suit/varsity/purple = 5, + /obj/item/clothing/suit/varsity/green = 5, + /obj/item/clothing/suit/varsity/blue = 5, + /obj/item/clothing/suit/varsity/brown = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat = 5, + /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 5, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) + prices = list(/obj/item/clothing/suit/storage/apron = 100, + /obj/item/clothing/suit/storage/flannel/aqua = 100, + /obj/item/clothing/suit/storage/toggle/bomber = 100, + /obj/item/clothing/suit/storage/bomber/alt = 100, + /obj/item/clothing/suit/storage/flannel/brown = 100, + /obj/item/clothing/suit/storage/toggle/cardigan = 100, + /obj/item/clothing/accessory/poncho/roles/cloak/custom = 100, + /obj/item/clothing/suit/storage/duster = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/fluff/gntop = 100, + /obj/item/clothing/suit/greatcoat = 100, + /obj/item/clothing/suit/storage/flannel = 100, + /obj/item/clothing/suit/storage/greyjacket = 100, + /obj/item/clothing/suit/storage/hazardvest = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/black = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/red = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/blue = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/green = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/orange = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/cti = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/mu = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/nt = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/smw = 100, + /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 100, + /obj/item/clothing/suit/storage/fluff/jacket/field = 100, + /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 100, + /obj/item/clothing/suit/storage/fluff/jacket/air_force = 100, + /obj/item/clothing/suit/storage/fluff/jacket/navy = 100, + /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 100, + /obj/item/clothing/suit/kamishimo = 100, + /obj/item/clothing/suit/kimono = 100, + /obj/item/clothing/suit/storage/toggle/labcoat = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/blue = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/green = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/orange = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/pink = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/red = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 100, + /obj/item/clothing/suit/storage/toggle/labcoat/old = 100, + /obj/item/clothing/suit/leathercoat = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket = 100, + /obj/item/clothing/suit/storage/leather_jacket_alt = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 100, + /obj/item/clothing/suit/storage/miljacket = 100, + /obj/item/clothing/suit/storage/miljacket/alt = 100, + /obj/item/clothing/suit/storage/miljacket/green = 100, + /obj/item/clothing/suit/storage/apron/overalls = 100, + /obj/item/clothing/suit/storage/toggle/peacoat = 100, + /obj/item/clothing/accessory/poncho = 100, + /obj/item/clothing/accessory/poncho/green = 100, + /obj/item/clothing/accessory/poncho/red = 100, + /obj/item/clothing/accessory/poncho/purple = 100, + /obj/item/clothing/accessory/poncho/blue = 100, + /obj/item/clothing/suit/jacket/puffer = 100, + /obj/item/clothing/suit/jacket/puffer/vest = 100, + /obj/item/clothing/suit/storage/flannel/red = 100, + /obj/item/clothing/suit/unathi/robe = 100, + /obj/item/clothing/suit/storage/snowsuit = 100, + /obj/item/clothing/suit/storage/toggle/internalaffairs = 100, + /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 100, + /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 100, + /obj/item/clothing/suit/suspenders = 100, + /obj/item/clothing/suit/storage/toggle/track = 100, + /obj/item/clothing/suit/storage/toggle/track/blue = 100, + /obj/item/clothing/suit/storage/toggle/track/green = 100, + /obj/item/clothing/suit/storage/toggle/track/red = 100, + /obj/item/clothing/suit/storage/toggle/track/white = 100, + /obj/item/clothing/suit/storage/trench = 100, + /obj/item/clothing/suit/storage/trench/grey = 100, + /obj/item/clothing/suit/varsity = 100, + /obj/item/clothing/suit/varsity/red = 100, + /obj/item/clothing/suit/varsity/purple = 100, + /obj/item/clothing/suit/varsity/green = 100, + /obj/item/clothing/suit/varsity/blue = 100, + /obj/item/clothing/suit/varsity/brown = 100, + /obj/item/clothing/suit/storage/hooded/wintercoat = 100, + /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 100, + /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) + premium = list(/obj/item/clothing/suit/imperium_monk = 3, + /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic = 1) + contraband = list(/obj/item/toy/katana = 1) + +/obj/machinery/vending/loadout/costume + name = "Thespian's Delight" + desc = "Sometimes nerds need costumes!" + product_ads = "Don't let your art be stifled!;Remember, practice makes perfect!;Break a leg!;Don't make me get the cane!;Thespian's Delight entering stage right!;Costumes for your acting needs!" + icon = 'icons/obj/vending.dmi' + icon_state = "theater" + products = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 3, + /obj/item/clothing/suit/storage/hooded/costume/carp = 3, + /obj/item/clothing/suit/chickensuit = 3, + /obj/item/clothing/head/chicken = 3, + /obj/item/clothing/head/helmet/gladiator = 3, + /obj/item/clothing/under/gladiator = 3, + /obj/item/clothing/suit/storage/toggle/labcoat/mad = 3, + /obj/item/clothing/under/suit_jacket/green = 3, + /obj/item/clothing/glasses/gglasses = 3, + /obj/item/clothing/head/flatcap = 3, + /obj/item/clothing/shoes/boots/jackboots = 3, + /obj/item/clothing/under/schoolgirl = 3, + /obj/item/clothing/head/kitty = 3, + /obj/item/clothing/glasses/sunglasses/blindfold = 3, + /obj/item/clothing/head/beret = 3, + /obj/item/clothing/under/skirt = 3, + /obj/item/clothing/under/suit_jacket = 3, + /obj/item/clothing/head/that = 3, + /obj/item/clothing/accessory/wcoat = 3, + /obj/item/clothing/under/scratch = 3, + /obj/item/clothing/shoes/white = 3, + /obj/item/clothing/gloves/white = 3, + /obj/item/clothing/under/kilt = 3, + /obj/item/clothing/glasses/monocle = 3, + /obj/item/clothing/under/sl_suit = 3, + /obj/item/clothing/mask/fakemoustache = 3, + /obj/item/weapon/cane = 3, + /obj/item/clothing/head/bowler = 3, + /obj/item/clothing/head/plaguedoctorhat = 3, + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 3, + /obj/item/clothing/mask/gas/plaguedoctor/fluff = 3, + /obj/item/clothing/under/owl = 3, + /obj/item/clothing/mask/gas/owl_mask = 3, + /obj/item/clothing/under/waiter = 3, + /obj/item/clothing/suit/storage/apron = 3, + /obj/item/clothing/under/pirate = 3, + /obj/item/clothing/head/pirate = 3, + /obj/item/clothing/suit/pirate = 3, + /obj/item/clothing/glasses/eyepatch = 3, + /obj/item/clothing/head/ushanka = 3, + /obj/item/clothing/under/soviet = 3, + /obj/item/clothing/suit/imperium_monk = 1, + /obj/item/clothing/suit/holidaypriest = 3, + /obj/item/clothing/head/witchwig = 3, + /obj/item/clothing/under/sundress = 3, + /obj/item/weapon/staff/broom = 3, + /obj/item/clothing/suit/wizrobe/fake = 3, + /obj/item/clothing/head/wizard/fake = 3, + /obj/item/weapon/staff = 3, + /obj/item/clothing/mask/gas/sexyclown = 3, + /obj/item/clothing/under/sexyclown = 3, + /obj/item/clothing/mask/gas/sexymime = 3, + /obj/item/clothing/under/sexymime = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 3, + /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 3, + /obj/item/clothing/suit/armor/combat/crusader_costume = 3, + /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 3, + /obj/item/clothing/head/helmet/combat/crusader_costume = 3, + /obj/item/clothing/head/helmet/combat/bedevere_costume = 3, + /obj/item/clothing/gloves/combat/knight_costume = 3, + /obj/item/clothing/gloves/combat/knight_costume/brown = 3, + /obj/item/clothing/shoes/knight_costume = 3, + /obj/item/clothing/shoes/knight_costume/black = 3) + prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200, + /obj/item/clothing/suit/storage/hooded/costume/carp = 200, + /obj/item/clothing/suit/chickensuit = 200, + /obj/item/clothing/head/chicken = 200, + /obj/item/clothing/head/helmet/gladiator = 300, + /obj/item/clothing/under/gladiator = 500, + /obj/item/clothing/suit/storage/toggle/labcoat/mad = 200, + /obj/item/clothing/under/suit_jacket/green = 200, + /obj/item/clothing/glasses/gglasses = 200, + /obj/item/clothing/head/flatcap = 200, + /obj/item/clothing/shoes/boots/jackboots = 200, + /obj/item/clothing/under/schoolgirl = 200, + /obj/item/clothing/head/kitty = 200, + /obj/item/clothing/glasses/sunglasses/blindfold = 200, + /obj/item/clothing/head/beret = 200, + /obj/item/clothing/under/skirt = 200, + /obj/item/clothing/under/suit_jacket = 200, + /obj/item/clothing/head/that = 200, + /obj/item/clothing/accessory/wcoat = 200, + /obj/item/clothing/under/scratch = 200, + /obj/item/clothing/shoes/white = 200, + /obj/item/clothing/gloves/white = 200, + /obj/item/clothing/under/kilt = 200, + /obj/item/clothing/glasses/monocle = 400, + /obj/item/clothing/under/sl_suit = 200, + /obj/item/clothing/mask/fakemoustache = 200, + /obj/item/weapon/cane = 300, + /obj/item/clothing/head/bowler = 200, + /obj/item/clothing/head/plaguedoctorhat = 300, + /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 300, + /obj/item/clothing/mask/gas/plaguedoctor/fluff = 600, + /obj/item/clothing/under/owl = 400, + /obj/item/clothing/mask/gas/owl_mask = 400, + /obj/item/clothing/under/waiter = 100, + /obj/item/clothing/suit/storage/apron = 200, + /obj/item/clothing/under/pirate = 300, + /obj/item/clothing/head/pirate = 400, + /obj/item/clothing/suit/pirate = 600, + /obj/item/clothing/glasses/eyepatch = 200, + /obj/item/clothing/head/ushanka = 200, + /obj/item/clothing/under/soviet = 200, + /obj/item/clothing/suit/imperium_monk = 2000, + /obj/item/clothing/suit/holidaypriest = 200, + /obj/item/clothing/head/witchwig = 200, + /obj/item/clothing/under/sundress = 50, + /obj/item/weapon/staff/broom = 400, + /obj/item/clothing/suit/wizrobe/fake = 200, + /obj/item/clothing/head/wizard/fake = 200, + /obj/item/weapon/staff = 400, + /obj/item/clothing/mask/gas/sexyclown = 600, + /obj/item/clothing/under/sexyclown = 200, + /obj/item/clothing/mask/gas/sexymime = 600, + /obj/item/clothing/under/sexymime = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 200, + /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 200, + /obj/item/clothing/suit/armor/combat/crusader_costume = 200, + /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 200, + /obj/item/clothing/head/helmet/combat/crusader_costume = 200, + /obj/item/clothing/head/helmet/combat/bedevere_costume = 200, + /obj/item/clothing/gloves/combat/knight_costume = 200, + /obj/item/clothing/gloves/combat/knight_costume/brown = 200, + /obj/item/clothing/shoes/knight_costume = 200, + /obj/item/clothing/shoes/knight_costume/black = 200) + premium = list(/obj/item/clothing/suit/imperium_monk = 3, + /obj/item/clothing/suit/barding/agatha = 2, + /obj/item/clothing/suit/barding/alt_agatha = 2, + /obj/item/clothing/suit/barding/mason = 2, + /obj/item/clothing/suit/drake_cloak = 2) + contraband = list(/obj/item/clothing/head/syndicatefake = 1, + /obj/item/clothing/suit/syndicatefake = 1) /obj/machinery/vending/loadout/gadget name = "Chips Co." @@ -1043,7 +1484,8 @@ /obj/item/device/walkpod = 5, /obj/item/device/juke_remote = 1, /obj/item/instrument/piano_synth/headphones = 2, // You're making a subsystem do work, I don't want it TOO busy - /obj/item/instrument/piano_synth/headphones/spacepods = 2) + /obj/item/instrument/piano_synth/headphones/spacepods = 2, + /obj/item/clothing/gloves/bluespace = 5) prices = list(/obj/item/clothing/suit/circuitry = 100, /obj/item/clothing/head/circuitry = 100, /obj/item/clothing/shoes/circuitry = 100, @@ -1067,1581 +1509,12 @@ /obj/item/device/walkpod = 300, /obj/item/device/juke_remote = 1000, /obj/item/instrument/piano_synth/headphones = 200, - /obj/item/instrument/piano_synth/headphones/spacepods = 600) + /obj/item/instrument/piano_synth/headphones/spacepods = 600, + /obj/item/clothing/gloves/bluespace = 500) premium = list(/obj/item/device/perfect_tele/one_beacon = 1) contraband = list(/obj/item/weapon/disk/nifsoft/compliance = 1) -/obj/machinery/vending/event/gadget //FOR FACILITATING AND EQUIPPING EVENTS, DO NOT PLACE ON THE NORMAL MAP// - name = "Chips Co." - desc = "A special vendor for devices and gadgets." - product_ads = "You can't RESIST our great deals!;Feeling disconnected? We have a gadget for you!;You know you have the capacity to buy our capacitors!;FILL THAT HOLE IN YOUR HEART WITH OUR PLASTIC DISTRACTIONS!!!;Devices for everyone! Chips Co.!;ROBUST INVENTORY, GREAT PRICES! ;DON'T FORGET THE oyPAD 13s PRO! ON SALE NOW, ONLY ONE THOUSAND THALERS!" - icon_state = "gadgets" - vend_delay = 11 - products = list(/obj/item/clothing/suit/circuitry = 1, - /obj/item/clothing/head/circuitry = 1, - /obj/item/clothing/shoes/circuitry = 1, - /obj/item/clothing/gloves/circuitry = 1, - /obj/item/clothing/under/circuitry = 1, - /obj/item/clothing/glasses/circuitry = 1, - /obj/item/clothing/ears/circuitry = 1, - /obj/item/device/text_to_speech = 5, - /obj/item/device/paicard = 5, - /obj/item/device/communicator = 10, - /obj/item/device/communicator/watch = 10, - /obj/item/device/radio = 10, - /obj/item/device/camera = 5, - /obj/item/device/taperecorder = 5, - /obj/item/modular_computer/tablet/preset/custom_loadout/cheap = 5, - /obj/item/device/pda = 10, - /obj/item/device/radio/headset = 10, - /obj/item/device/flashlight = 5, - /obj/item/device/laser_pointer = 3, - /obj/item/clothing/glasses/omnihud = 10, - /obj/item/device/perfect_tele/one_beacon = 1, - /obj/item/weapon/disk/nifsoft/compliance = 1, - /obj/item/device/perfect_tele/alien = 10) - -//////////////////END OF CHIPS CO. VENDORS////////////////// - -/obj/machinery/vending/loadout/loadout_misc - name = "Bits and Bobs" - desc = "A special vendor for things and also stuff!" - product_ads = "You never know when you might need an umbrella.;Hey kid... want some cardemon cards?;Miscellaneous for your miscellaneous heart.;Who's bob? Wouldn't you like to know.;I'm sorry there's no grappling hooks in our umbrellas.;We sell things AND stuff." - icon_state = "loadout_misc" - products = list(/obj/item/weapon/cane = 5, - /obj/item/weapon/pack/cardemon = 25, - /obj/item/weapon/deck/holder = 5, - /obj/item/weapon/deck/cah = 5, - /obj/item/weapon/deck/cah/black = 5, - /obj/item/weapon/deck/tarot = 5, - /obj/item/weapon/deck/cards = 5, - /obj/item/weapon/pack/spaceball = 10, - /obj/item/weapon/storage/pill_bottle/dice = 5, - /obj/item/weapon/storage/pill_bottle/dice_nerd = 5, - /obj/item/weapon/melee/umbrella/random = 10) - prices = list(/obj/item/weapon/cane = 100, - /obj/item/weapon/pack/cardemon = 100, - /obj/item/weapon/deck/holder = 100, - /obj/item/weapon/deck/cah = 100, - /obj/item/weapon/deck/cah/black = 100, - /obj/item/weapon/deck/tarot = 100, - /obj/item/weapon/deck/cards = 100, - /obj/item/weapon/pack/spaceball = 100, - /obj/item/weapon/storage/pill_bottle/dice = 100, - /obj/item/weapon/storage/pill_bottle/dice_nerd = 100, - /obj/item/weapon/melee/umbrella/random = 100) - premium = list(/obj/item/toy/bosunwhistle = 1) - contraband = list(/obj/item/toy/katana = 1) - -/obj/machinery/vending/loadout/overwear - name = "Big D's Best" - desc = "A special vendor using compressed matter cartridges to store large amounts of overwear!" - product_ads = "Dress your best! It's what big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Bid D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" - icon_state = "suit" - vend_delay = 16 - products = list(/obj/item/clothing/suit/storage/apron = 5, - /obj/item/clothing/suit/storage/flannel/aqua = 5, - /obj/item/clothing/suit/storage/toggle/bomber = 5, - /obj/item/clothing/suit/storage/bomber/alt = 5, - /obj/item/clothing/suit/storage/flannel/brown = 5, - /obj/item/clothing/suit/storage/toggle/cardigan = 5, - /obj/item/clothing/accessory/poncho/roles/cloak/custom = 5, - /obj/item/clothing/suit/storage/duster = 5, - /obj/item/clothing/suit/storage/toggle/denim_jacket = 5, - /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 5, - /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 5, - /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 5, - /obj/item/clothing/suit/storage/fluff/gntop = 5, - /obj/item/clothing/suit/greatcoat = 5, - /obj/item/clothing/suit/storage/flannel = 5, - /obj/item/clothing/suit/storage/greyjacket = 5, - /obj/item/clothing/suit/storage/hazardvest = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/black = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/red = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/blue = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/green = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/orange = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/cti = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/mu = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/nt = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/smw = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 5, - /obj/item/clothing/suit/storage/fluff/jacket/field = 5, - /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 5, - /obj/item/clothing/suit/storage/fluff/jacket/air_force = 5, - /obj/item/clothing/suit/storage/fluff/jacket/navy = 5, - /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 5, - /obj/item/clothing/suit/kamishimo = 5, - /obj/item/clothing/suit/kimono = 5, - /obj/item/clothing/suit/storage/toggle/labcoat = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/blue = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/green = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/orange = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/pink = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/red = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 5, - /obj/item/clothing/suit/leathercoat = 5, - /obj/item/clothing/suit/storage/toggle/leather_jacket = 5, - /obj/item/clothing/suit/storage/leather_jacket_alt = 5, - /obj/item/clothing/suit/storage/toggle/brown_jacket = 5, - /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 5, - /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 5, - /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 5, - /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 5, - /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 5, - /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 5, - /obj/item/clothing/suit/storage/miljacket = 5, - /obj/item/clothing/suit/storage/miljacket/alt = 5, - /obj/item/clothing/suit/storage/miljacket/green = 5, - /obj/item/clothing/suit/storage/apron/overalls = 5, - /obj/item/clothing/suit/storage/toggle/peacoat = 5, - /obj/item/clothing/accessory/poncho = 5, - /obj/item/clothing/accessory/poncho/green = 5, - /obj/item/clothing/accessory/poncho/red = 5, - /obj/item/clothing/accessory/poncho/purple = 5, - /obj/item/clothing/accessory/poncho/blue = 5, - /obj/item/clothing/suit/jacket/puffer = 5, - /obj/item/clothing/suit/jacket/puffer/vest = 5, - /obj/item/clothing/suit/storage/flannel/red = 5, - /obj/item/clothing/suit/unathi/robe = 5, - /obj/item/clothing/suit/storage/snowsuit = 5, - /obj/item/clothing/suit/storage/toggle/internalaffairs = 5, - /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 5, - /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 5, - /obj/item/clothing/suit/suspenders = 5, - /obj/item/clothing/suit/storage/toggle/track = 5, - /obj/item/clothing/suit/storage/toggle/track/blue = 5, - /obj/item/clothing/suit/storage/toggle/track/green = 5, - /obj/item/clothing/suit/storage/toggle/track/red = 5, - /obj/item/clothing/suit/storage/toggle/track/white = 5, - /obj/item/clothing/suit/storage/trench = 5, - /obj/item/clothing/suit/storage/trench/grey = 5, - /obj/item/clothing/suit/varsity = 5, - /obj/item/clothing/suit/varsity/red = 5, - /obj/item/clothing/suit/varsity/purple = 5, - /obj/item/clothing/suit/varsity/green = 5, - /obj/item/clothing/suit/varsity/blue = 5, - /obj/item/clothing/suit/varsity/brown = 5, - /obj/item/clothing/suit/storage/hooded/wintercoat = 5, - /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 5, - /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) - prices = list(/obj/item/clothing/suit/storage/apron = 100, - /obj/item/clothing/suit/storage/flannel/aqua = 100, - /obj/item/clothing/suit/storage/toggle/bomber = 100, - /obj/item/clothing/suit/storage/bomber/alt = 100, - /obj/item/clothing/suit/storage/flannel/brown = 100, - /obj/item/clothing/suit/storage/toggle/cardigan = 100, - /obj/item/clothing/accessory/poncho/roles/cloak/custom = 100, - /obj/item/clothing/suit/storage/duster = 100, - /obj/item/clothing/suit/storage/toggle/denim_jacket = 100, - /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 100, - /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 100, - /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 100, - /obj/item/clothing/suit/storage/fluff/gntop = 100, - /obj/item/clothing/suit/greatcoat = 100, - /obj/item/clothing/suit/storage/flannel = 100, - /obj/item/clothing/suit/storage/greyjacket = 100, - /obj/item/clothing/suit/storage/hazardvest = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/black = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/red = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/blue = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/green = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/orange = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/cti = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/mu = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/nt = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/smw = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 100, - /obj/item/clothing/suit/storage/fluff/jacket/field = 100, - /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 100, - /obj/item/clothing/suit/storage/fluff/jacket/air_force = 100, - /obj/item/clothing/suit/storage/fluff/jacket/navy = 100, - /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 100, - /obj/item/clothing/suit/kamishimo = 100, - /obj/item/clothing/suit/kimono = 100, - /obj/item/clothing/suit/storage/toggle/labcoat = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/blue = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/green = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/orange = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/pink = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/red = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 100, - /obj/item/clothing/suit/leathercoat = 100, - /obj/item/clothing/suit/storage/toggle/leather_jacket = 100, - /obj/item/clothing/suit/storage/leather_jacket_alt = 100, - /obj/item/clothing/suit/storage/toggle/brown_jacket = 100, - /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 100, - /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 100, - /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 100, - /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 100, - /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 100, - /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 100, - /obj/item/clothing/suit/storage/miljacket = 100, - /obj/item/clothing/suit/storage/miljacket/alt = 100, - /obj/item/clothing/suit/storage/miljacket/green = 100, - /obj/item/clothing/suit/storage/apron/overalls = 100, - /obj/item/clothing/suit/storage/toggle/peacoat = 100, - /obj/item/clothing/accessory/poncho = 100, - /obj/item/clothing/accessory/poncho/green = 100, - /obj/item/clothing/accessory/poncho/red = 100, - /obj/item/clothing/accessory/poncho/purple = 100, - /obj/item/clothing/accessory/poncho/blue = 100, - /obj/item/clothing/suit/jacket/puffer = 100, - /obj/item/clothing/suit/jacket/puffer/vest = 100, - /obj/item/clothing/suit/storage/flannel/red = 100, - /obj/item/clothing/suit/unathi/robe = 100, - /obj/item/clothing/suit/storage/snowsuit = 100, - /obj/item/clothing/suit/storage/toggle/internalaffairs = 100, - /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 100, - /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 100, - /obj/item/clothing/suit/suspenders = 100, - /obj/item/clothing/suit/storage/toggle/track = 100, - /obj/item/clothing/suit/storage/toggle/track/blue = 100, - /obj/item/clothing/suit/storage/toggle/track/green = 100, - /obj/item/clothing/suit/storage/toggle/track/red = 100, - /obj/item/clothing/suit/storage/toggle/track/white = 100, - /obj/item/clothing/suit/storage/trench = 100, - /obj/item/clothing/suit/storage/trench/grey = 100, - /obj/item/clothing/suit/varsity = 100, - /obj/item/clothing/suit/varsity/red = 100, - /obj/item/clothing/suit/varsity/purple = 100, - /obj/item/clothing/suit/varsity/green = 100, - /obj/item/clothing/suit/varsity/blue = 100, - /obj/item/clothing/suit/varsity/brown = 100, - /obj/item/clothing/suit/storage/hooded/wintercoat = 100, - /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 100, - /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) - premium = list(/obj/item/clothing/suit/imperium_monk = 3, - /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic = 1) - contraband = list(/obj/item/toy/katana = 1) - -/obj/machinery/vending/loadout/costume - name = "Thespian's Delight" - desc = "Sometimes nerds need costumes!" - product_ads = "Don't let your art be stifled!;Remember, practice makes perfect!;Break a leg!;Don't make me get the cane!;Thespian's Delight entering stage right!;Costumes for your acting needs!" - icon = 'icons/obj/vending.dmi' - icon_state = "theater" - products = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 3, - /obj/item/clothing/suit/storage/hooded/costume/carp = 3, - /obj/item/clothing/suit/chickensuit = 3, - /obj/item/clothing/head/chicken = 3, - /obj/item/clothing/head/helmet/gladiator = 3, - /obj/item/clothing/under/gladiator = 3, - /obj/item/clothing/suit/storage/toggle/labcoat/mad = 3, - /obj/item/clothing/under/suit_jacket/green = 3, - /obj/item/clothing/glasses/gglasses = 3, - /obj/item/clothing/head/flatcap = 3, - /obj/item/clothing/shoes/boots/jackboots = 3, - /obj/item/clothing/under/schoolgirl = 3, - /obj/item/clothing/head/kitty = 3, - /obj/item/clothing/glasses/sunglasses/blindfold = 3, - /obj/item/clothing/head/beret = 3, - /obj/item/clothing/under/skirt = 3, - /obj/item/clothing/under/suit_jacket = 3, - /obj/item/clothing/head/that = 3, - /obj/item/clothing/accessory/wcoat = 3, - /obj/item/clothing/under/scratch = 3, - /obj/item/clothing/shoes/white = 3, - /obj/item/clothing/gloves/white = 3, - /obj/item/clothing/under/kilt = 3, - /obj/item/clothing/glasses/monocle = 3, - /obj/item/clothing/under/sl_suit = 3, - /obj/item/clothing/mask/fakemoustache = 3, - /obj/item/weapon/cane = 3, - /obj/item/clothing/head/bowler = 3, - /obj/item/clothing/head/plaguedoctorhat = 3, - /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 3, - /obj/item/clothing/mask/gas/plaguedoctor/fluff = 3, - /obj/item/clothing/under/owl = 3, - /obj/item/clothing/mask/gas/owl_mask = 3, - /obj/item/clothing/under/waiter = 3, - /obj/item/clothing/suit/storage/apron = 3, - /obj/item/clothing/under/pirate = 3, - /obj/item/clothing/head/pirate = 3, - /obj/item/clothing/suit/pirate = 3, - /obj/item/clothing/glasses/eyepatch = 3, - /obj/item/clothing/head/ushanka = 3, - /obj/item/clothing/under/soviet = 3, - /obj/item/clothing/suit/imperium_monk = 1, - /obj/item/clothing/suit/holidaypriest = 3, - /obj/item/clothing/head/witchwig = 3, - /obj/item/clothing/under/sundress = 3, - /obj/item/weapon/staff/broom = 3, - /obj/item/clothing/suit/wizrobe/fake = 3, - /obj/item/clothing/head/wizard/fake = 3, - /obj/item/weapon/staff = 3, - /obj/item/clothing/mask/gas/sexyclown = 3, - /obj/item/clothing/under/sexyclown = 3, - /obj/item/clothing/mask/gas/sexymime = 3, - /obj/item/clothing/under/sexymime = 3, - /obj/item/clothing/suit/storage/hooded/knight_costume = 3, - /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 3, - /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 3, - /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 3, - /obj/item/clothing/suit/armor/combat/crusader_costume = 3, - /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 3, - /obj/item/clothing/head/helmet/combat/crusader_costume = 3, - /obj/item/clothing/head/helmet/combat/bedevere_costume = 3, - /obj/item/clothing/gloves/combat/knight_costume = 3, - /obj/item/clothing/gloves/combat/knight_costume/brown = 3, - /obj/item/clothing/shoes/knight_costume = 3, - /obj/item/clothing/shoes/knight_costume/black = 3) - prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200, - /obj/item/clothing/suit/storage/hooded/costume/carp = 200, - /obj/item/clothing/suit/chickensuit = 200, - /obj/item/clothing/head/chicken = 200, - /obj/item/clothing/head/helmet/gladiator = 300, - /obj/item/clothing/under/gladiator = 500, - /obj/item/clothing/suit/storage/toggle/labcoat/mad = 200, - /obj/item/clothing/under/suit_jacket/green = 200, - /obj/item/clothing/glasses/gglasses = 200, - /obj/item/clothing/head/flatcap = 200, - /obj/item/clothing/shoes/boots/jackboots = 200, - /obj/item/clothing/under/schoolgirl = 200, - /obj/item/clothing/head/kitty = 200, - /obj/item/clothing/glasses/sunglasses/blindfold = 200, - /obj/item/clothing/head/beret = 200, - /obj/item/clothing/under/skirt = 200, - /obj/item/clothing/under/suit_jacket = 200, - /obj/item/clothing/head/that = 200, - /obj/item/clothing/accessory/wcoat = 200, - /obj/item/clothing/under/scratch = 200, - /obj/item/clothing/shoes/white = 200, - /obj/item/clothing/gloves/white = 200, - /obj/item/clothing/under/kilt = 200, - /obj/item/clothing/glasses/monocle = 400, - /obj/item/clothing/under/sl_suit = 200, - /obj/item/clothing/mask/fakemoustache = 200, - /obj/item/weapon/cane = 300, - /obj/item/clothing/head/bowler = 200, - /obj/item/clothing/head/plaguedoctorhat = 300, - /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 300, - /obj/item/clothing/mask/gas/plaguedoctor/fluff = 600, - /obj/item/clothing/under/owl = 400, - /obj/item/clothing/mask/gas/owl_mask = 400, - /obj/item/clothing/under/waiter = 100, - /obj/item/clothing/suit/storage/apron = 200, - /obj/item/clothing/under/pirate = 300, - /obj/item/clothing/head/pirate = 400, - /obj/item/clothing/suit/pirate = 600, - /obj/item/clothing/glasses/eyepatch = 200, - /obj/item/clothing/head/ushanka = 200, - /obj/item/clothing/under/soviet = 200, - /obj/item/clothing/suit/imperium_monk = 2000, - /obj/item/clothing/suit/holidaypriest = 200, - /obj/item/clothing/head/witchwig = 200, - /obj/item/clothing/under/sundress = 50, - /obj/item/weapon/staff/broom = 400, - /obj/item/clothing/suit/wizrobe/fake = 200, - /obj/item/clothing/head/wizard/fake = 200, - /obj/item/weapon/staff = 400, - /obj/item/clothing/mask/gas/sexyclown = 600, - /obj/item/clothing/under/sexyclown = 200, - /obj/item/clothing/mask/gas/sexymime = 600, - /obj/item/clothing/under/sexymime = 200, - /obj/item/clothing/suit/storage/hooded/knight_costume = 200, - /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 200, - /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 200, - /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 200, - /obj/item/clothing/suit/armor/combat/crusader_costume = 200, - /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 200, - /obj/item/clothing/head/helmet/combat/crusader_costume = 200, - /obj/item/clothing/head/helmet/combat/bedevere_costume = 200, - /obj/item/clothing/gloves/combat/knight_costume = 200, - /obj/item/clothing/gloves/combat/knight_costume/brown = 200, - /obj/item/clothing/shoes/knight_costume = 200, - /obj/item/clothing/shoes/knight_costume/black = 200) - premium = list(/obj/item/clothing/suit/imperium_monk = 3, - /obj/item/clothing/suit/barding/agatha = 2, - /obj/item/clothing/suit/barding/alt_agatha = 2, - /obj/item/clothing/suit/barding/mason = 2, - /obj/item/clothing/suit/drake_cloak = 2) - contraband = list(/obj/item/clothing/head/syndicatefake = 1, - /obj/item/clothing/suit/syndicatefake = 1) - -/obj/machinery/seed_storage/brig - name = "Prisoners' food seed storage" - starting_seeds = list( - /obj/item/seeds/appleseed = 3, - /obj/item/seeds/bananaseed = 3, - /obj/item/seeds/berryseed = 3, - /obj/item/seeds/cabbageseed = 3, - /obj/item/seeds/carrotseed = 3, - /obj/item/seeds/celery = 3, - /obj/item/seeds/chantermycelium = 3, - /obj/item/seeds/cherryseed = 3, - /obj/item/seeds/chiliseed = 3, - /obj/item/seeds/cocoapodseed = 3, - /obj/item/seeds/cornseed = 3, - /obj/item/seeds/durian = 3, - /obj/item/seeds/eggplantseed = 3, - /obj/item/seeds/grapeseed = 3, - /obj/item/seeds/grassseed = 3, - /obj/item/seeds/replicapod = 3, - /obj/item/seeds/lavenderseed = 3, - /obj/item/seeds/lemonseed = 3, - /obj/item/seeds/lettuce = 3, - /obj/item/seeds/limeseed = 3, - /obj/item/seeds/mtearseed = 2, - /obj/item/seeds/orangeseed = 3, - /obj/item/seeds/onionseed = 3, - /obj/item/seeds/peanutseed = 3, - /obj/item/seeds/plumpmycelium = 3, - /obj/item/seeds/poppyseed = 3, - /obj/item/seeds/potatoseed = 3, - /obj/item/seeds/pumpkinseed = 3, - /obj/item/seeds/rhubarb = 3, - /obj/item/seeds/riceseed = 3, - /obj/item/seeds/rose = 3, - /obj/item/seeds/soyaseed = 3, - /obj/item/seeds/pineapple = 3, - /obj/item/seeds/sugarcaneseed = 3, - /obj/item/seeds/sunflowerseed = 3, - /obj/item/seeds/shandseed = 2, - /obj/item/seeds/tobaccoseed = 3, - /obj/item/seeds/tomatoseed = 3, - /obj/item/seeds/towermycelium = 3, - /obj/item/seeds/vanilla = 3, - /obj/item/seeds/watermelonseed = 3, - /obj/item/seeds/wheatseed = 3, - /obj/item/seeds/whitebeetseed = 3, - /obj/item/seeds/wabback = 2) - -/obj/machinery/vending/hydronutrients/brig - name = "Brig NutriMax" - desc = "A plant nutrients vendor. Seems some items aren't included." - products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,/obj/item/weapon/plantspray/pests = 20, - /obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5) - premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) - -/obj/machinery/vending/abductor - name = "Abduct-U" - desc = "A mysterious machine which can fabricate many tools for acquiring test subjects." - icon = 'icons/obj/abductor_vr.dmi' - icon_state = "dispenser_2way" - products = list(/obj/item/weapon/card/id/syndicate/station_access = 1, - /obj/item/weapon/storage/box/syndie_kit/chameleon = 1, - /obj/item/clothing/mask/bandana = 1, - /obj/item/clothing/glasses/sunglasses = 1, - /obj/item/device/radio/headset/syndicate/alt = 1, - /obj/item/device/pda = 1, - /obj/item/device/communicator = 1, - /obj/item/weapon/tape_roll = 2, - /obj/item/weapon/handcuffs = 4, - /obj/item/weapon/handcuffs/legcuffs = 4, - /obj/item/weapon/cell/device/weapon/recharge/alien = 2, - /obj/item/device/chameleon = 1, - /obj/item/weapon/storage/mre/menu11 = 2, - /obj/item/device/flash = 2, - /obj/item/weapon/pen/reagent/paralysis = 4, - /obj/item/device/perfect_tele/alien = 1 - ) - vend_delay = 15 - -/obj/machinery/vending/loadout - name = "Fingers and Toes" - desc = "A special vendor for gloves and shoes!" - product_ads = "Do you have fingers and toes? COVER THEM UP!;Show me your toes! Wait. NO DON'T! BUY NEW SHOES!;Don't leave prints, BUY SOME GLOVES!;Remember to check your shoes for micros! You don't have to let them out, but just check for them!;Fingers and Toes is not liable for micro entrapment or abuse under the feet of our patrons.!;This little piggy went WE WE WE all the way down to FINGERS AND TOES to pick up some sweet new gloves and shoes." - icon = 'icons/obj/vending_vr.dmi' - icon_state = "glovesnshoes" - products = list(/obj/item/clothing/gloves/evening = 5, - /obj/item/clothing/gloves/fingerless = 5, - /obj/item/clothing/gloves/black = 5, - /obj/item/clothing/gloves/blue = 5, - /obj/item/clothing/gloves/brown = 5, - /obj/item/clothing/gloves/color = 5, - /obj/item/clothing/gloves/green = 5, - /obj/item/clothing/gloves/grey = 5, - /obj/item/clothing/gloves/sterile/latex = 5, - /obj/item/clothing/gloves/light_brown = 5, - /obj/item/clothing/gloves/sterile/nitrile = 5, - /obj/item/clothing/gloves/orange = 5, - /obj/item/clothing/gloves/purple = 5, - /obj/item/clothing/gloves/red = 5, - /obj/item/clothing/gloves/fluff/siren = 5, - /obj/item/clothing/gloves/white = 5, - /obj/item/clothing/gloves/duty = 5, - /obj/item/clothing/shoes/athletic = 5, - /obj/item/clothing/shoes/boots/fluff/siren = 5, - /obj/item/clothing/shoes/slippers = 5, - /obj/item/clothing/shoes/boots/cowboy/classic = 5, - /obj/item/clothing/shoes/boots/cowboy = 5, - /obj/item/clothing/shoes/boots/duty = 5, - /obj/item/clothing/shoes/flats/white/color = 5, - /obj/item/clothing/shoes/flipflop = 5, - /obj/item/clothing/shoes/heels = 5, - /obj/item/clothing/shoes/hitops/black = 5, - /obj/item/clothing/shoes/hitops/blue = 5, - /obj/item/clothing/shoes/hitops/green = 5, - /obj/item/clothing/shoes/hitops/orange = 5, - /obj/item/clothing/shoes/hitops/purple = 5, - /obj/item/clothing/shoes/hitops/red = 5, - /obj/item/clothing/shoes/flats/white/color = 5, - /obj/item/clothing/shoes/hitops/yellow = 5, - /obj/item/clothing/shoes/boots/jackboots = 5, - /obj/item/clothing/shoes/boots/jungle = 5, - /obj/item/clothing/shoes/black/cuffs = 5, - /obj/item/clothing/shoes/black/cuffs/blue = 5, - /obj/item/clothing/shoes/black/cuffs/red = 5, - /obj/item/clothing/shoes/sandal = 5, - /obj/item/clothing/shoes/black = 5, - /obj/item/clothing/shoes/blue = 5, - /obj/item/clothing/shoes/brown = 5, - /obj/item/clothing/shoes/laceup = 5, - /obj/item/clothing/shoes/green = 5, - /obj/item/clothing/shoes/laceup/brown = 5, - /obj/item/clothing/shoes/orange = 5, - /obj/item/clothing/shoes/purple = 5, - /obj/item/clothing/shoes/red = 5, - /obj/item/clothing/shoes/white = 5, - /obj/item/clothing/shoes/yellow = 5, - /obj/item/clothing/shoes/skater = 5, - /obj/item/clothing/shoes/boots/cowboy/snakeskin = 5, - /obj/item/clothing/shoes/boots/jackboots/toeless = 5, - /obj/item/clothing/shoes/boots/workboots/toeless = 5, - /obj/item/clothing/shoes/boots/winter = 5, - /obj/item/clothing/shoes/boots/workboots = 5, - /obj/item/clothing/shoes/footwraps = 5) - prices = list(/obj/item/clothing/gloves/evening = 50, - /obj/item/clothing/gloves/fingerless = 50, - /obj/item/clothing/gloves/black = 50, - /obj/item/clothing/gloves/blue = 50, - /obj/item/clothing/gloves/brown = 50, - /obj/item/clothing/gloves/color = 50, - /obj/item/clothing/gloves/green = 50, - /obj/item/clothing/gloves/grey = 50, - /obj/item/clothing/gloves/sterile/latex = 100, - /obj/item/clothing/gloves/light_brown = 50, - /obj/item/clothing/gloves/sterile/nitrile = 100, - /obj/item/clothing/gloves/orange = 50, - /obj/item/clothing/gloves/purple = 50, - /obj/item/clothing/gloves/red = 50, - /obj/item/clothing/gloves/fluff/siren = 50, - /obj/item/clothing/gloves/white = 50, - /obj/item/clothing/gloves/duty = 150, - /obj/item/clothing/shoes/athletic = 50, - /obj/item/clothing/shoes/boots/fluff/siren = 50, - /obj/item/clothing/shoes/slippers = 50, - /obj/item/clothing/shoes/boots/cowboy/classic = 50, - /obj/item/clothing/shoes/boots/cowboy = 50, - /obj/item/clothing/shoes/boots/duty = 100, - /obj/item/clothing/shoes/flats/white/color = 50, - /obj/item/clothing/shoes/flipflop = 50, - /obj/item/clothing/shoes/heels = 50, - /obj/item/clothing/shoes/hitops/black = 50, - /obj/item/clothing/shoes/hitops/blue = 50, - /obj/item/clothing/shoes/hitops/green = 50, - /obj/item/clothing/shoes/hitops/orange = 50, - /obj/item/clothing/shoes/hitops/purple = 50, - /obj/item/clothing/shoes/hitops/red = 50, - /obj/item/clothing/shoes/flats/white/color = 50, - /obj/item/clothing/shoes/hitops/yellow = 50, - /obj/item/clothing/shoes/boots/jackboots = 50, - /obj/item/clothing/shoes/boots/jungle = 100, - /obj/item/clothing/shoes/black/cuffs = 50, - /obj/item/clothing/shoes/black/cuffs/blue = 50, - /obj/item/clothing/shoes/black/cuffs/red = 50, - /obj/item/clothing/shoes/sandal = 50, - /obj/item/clothing/shoes/black = 50, - /obj/item/clothing/shoes/blue = 50, - /obj/item/clothing/shoes/brown = 50, - /obj/item/clothing/shoes/laceup = 50, - /obj/item/clothing/shoes/green = 50, - /obj/item/clothing/shoes/laceup/brown = 50, - /obj/item/clothing/shoes/orange = 50, - /obj/item/clothing/shoes/purple = 50, - /obj/item/clothing/shoes/red = 50, - /obj/item/clothing/shoes/white = 50, - /obj/item/clothing/shoes/yellow = 50, - /obj/item/clothing/shoes/skater = 50, - /obj/item/clothing/shoes/boots/cowboy/snakeskin = 50, - /obj/item/clothing/shoes/boots/jackboots/toeless = 50, - /obj/item/clothing/shoes/boots/workboots/toeless = 50, - /obj/item/clothing/shoes/boots/winter = 50, - /obj/item/clothing/shoes/boots/workboots = 50, - /obj/item/clothing/shoes/footwraps = 50) - premium = list(/obj/item/clothing/gloves/rainbow = 1, - /obj/item/clothing/shoes/rainbow = 1,) - contraband = list(/obj/item/clothing/shoes/syndigaloshes = 1, - /obj/item/clothing/shoes/clown_shoes = 1) - -/obj/machinery/vending/loadout/uniform - name = "The Basics" - desc = "A vendor using compressed matter cartridges to store large amounts of basic station uniforms." - product_ads = "Don't get caught naked!;Pick up your uniform!;Using compressed matter cartridges and VERY ETHICAL labor practices, we bring you the uniforms you need!;No uniform? No problem!;We've got your covered!;The Basics is not responsible for being crushed under the amount of things inside our machines. DO NOT VEND IN EXCESS!!" - icon_state = "loadout" - vend_delay = 16 - products = list(/obj/item/device/pda = 50, - /obj/item/device/radio/headset = 50, - /obj/item/weapon/storage/backpack/ = 10, - /obj/item/weapon/storage/backpack/messenger = 10, - /obj/item/weapon/storage/backpack/satchel = 10, - /obj/item/clothing/under/color = 5, - /obj/item/clothing/under/color/aqua = 5, - /obj/item/clothing/under/color/black = 5, - /obj/item/clothing/under/color/blackjumpskirt = 5, - /obj/item/clothing/under/color/blue = 5, - /obj/item/clothing/under/color/brown = 5, - /obj/item/clothing/under/color/green = 5, - /obj/item/clothing/under/color/grey = 5, - /obj/item/clothing/under/color/orange = 5, - /obj/item/clothing/under/color/pink = 5, - /obj/item/clothing/under/color/red = 5, - /obj/item/clothing/under/color/white = 5, - /obj/item/clothing/under/color/yellow = 5, - /obj/item/clothing/shoes/black = 20, - /obj/item/clothing/shoes/white = 20) - prices = list() - -/obj/machinery/vending/loadout/accessory - name = "Looty Inc." - desc = "A special vendor for accessories." - product_ads = "Want shinies? We have the shinies.;Need that special something to complete your outfit? We have what you need!;Ditch that old dull dangly something you've got and pick up one of our shinies!;Bracelets, collars, scarfs rings and more! We have the fancy things you need!;Does your pet need a collar? We don't judge! Keep them in line with one of one of ours!;Top of the line materials! 'Hand crafted' goods!" - icon_state = "accessory" - vend_delay = 6 - products = list(/obj/item/clothing/accessory = 5, - /obj/item/clothing/accessory/armband/med/color = 10, - /obj/item/clothing/accessory/asymmetric = 5, - /obj/item/clothing/accessory/asymmetric/purple = 5, - /obj/item/clothing/accessory/asymmetric/green = 5, - /obj/item/clothing/accessory/bracelet = 5, - /obj/item/clothing/accessory/bracelet/material = 5, - /obj/item/clothing/accessory/bracelet/friendship = 5, - /obj/item/clothing/accessory/chaps = 5, - /obj/item/clothing/accessory/chaps/black = 5, - /obj/item/weapon/storage/briefcase/clutch = 1, - /obj/item/clothing/accessory/collar = 5, - /obj/item/clothing/accessory/collar/bell = 5, - /obj/item/clothing/accessory/collar/spike = 5, - /obj/item/clothing/accessory/collar/pink = 5, - /obj/item/clothing/accessory/collar/holo = 5, - /obj/item/clothing/accessory/collar/shock = 5, - /obj/item/weapon/storage/belt/fannypack = 1, - /obj/item/weapon/storage/belt/fannypack/white = 5, - /obj/item/clothing/accessory/fullcape = 5, - /obj/item/clothing/accessory/halfcape = 5, - /obj/item/clothing/accessory/hawaiian = 5, - /obj/item/clothing/accessory/hawaiian/blue = 5, - /obj/item/clothing/accessory/hawaiian/pink = 5, - /obj/item/clothing/accessory/hawaiian/red = 5, - /obj/item/clothing/accessory/hawaiian/yellow = 5, - /obj/item/clothing/accessory/locket = 5, - /obj/item/weapon/storage/backpack/purse = 1, - /obj/item/clothing/accessory/sash = 5, - /obj/item/clothing/accessory/scarf = 5, - /obj/item/clothing/accessory/scarf/red = 5, - /obj/item/clothing/accessory/scarf/darkblue = 5, - /obj/item/clothing/accessory/scarf/purple = 5, - /obj/item/clothing/accessory/scarf/yellow = 5, - /obj/item/clothing/accessory/scarf/orange = 5, - /obj/item/clothing/accessory/scarf/lightblue = 5, - /obj/item/clothing/accessory/scarf/white = 5, - /obj/item/clothing/accessory/scarf/black = 5, - /obj/item/clothing/accessory/scarf/zebra = 5, - /obj/item/clothing/accessory/scarf/christmas = 5, - /obj/item/clothing/accessory/scarf/stripedred = 5, - /obj/item/clothing/accessory/scarf/stripedgreen = 5, - /obj/item/clothing/accessory/scarf/stripedblue = 5, - /obj/item/clothing/accessory/jacket = 5, - /obj/item/clothing/accessory/jacket/checkered = 5, - /obj/item/clothing/accessory/jacket/burgundy = 5, - /obj/item/clothing/accessory/jacket/navy = 5, - /obj/item/clothing/accessory/jacket/charcoal = 5, - /obj/item/clothing/accessory/vest = 5, - /obj/item/clothing/accessory/sweater = 5, - /obj/item/clothing/accessory/sweater/pink = 5, - /obj/item/clothing/accessory/sweater/mint = 5, - /obj/item/clothing/accessory/sweater/blue = 5, - /obj/item/clothing/accessory/sweater/heart = 5, - /obj/item/clothing/accessory/sweater/nt = 5, - /obj/item/clothing/accessory/sweater/keyhole = 5, - /obj/item/clothing/accessory/sweater/winterneck = 5, - /obj/item/clothing/accessory/sweater/uglyxmas = 5, - /obj/item/clothing/accessory/sweater/flowersweater = 5, - /obj/item/clothing/accessory/sweater/redneck = 5, - /obj/item/clothing/accessory/tie = 5, - /obj/item/clothing/accessory/tie/horrible = 5, - /obj/item/clothing/accessory/tie/white = 5, - /obj/item/clothing/accessory/tie/navy = 5, - /obj/item/clothing/accessory/tie/yellow = 5, - /obj/item/clothing/accessory/tie/darkgreen = 5, - /obj/item/clothing/accessory/tie/black = 5, - /obj/item/clothing/accessory/tie/red_long = 5, - /obj/item/clothing/accessory/tie/red_clip = 5, - /obj/item/clothing/accessory/tie/blue_long = 5, - /obj/item/clothing/accessory/tie/blue_clip = 5, - /obj/item/clothing/accessory/tie/red = 5, - /obj/item/clothing/accessory/wcoat = 5, - /obj/item/clothing/accessory/wcoat/red = 5, - /obj/item/clothing/accessory/wcoat/grey = 5, - /obj/item/clothing/accessory/wcoat/brown = 5, - /obj/item/clothing/accessory/wcoat/gentleman = 5, - /obj/item/clothing/accessory/wcoat/swvest = 5, - /obj/item/clothing/accessory/wcoat/swvest/blue = 5, - /obj/item/clothing/accessory/wcoat/swvest/red = 5, - /obj/item/weapon/storage/wallet = 5, - /obj/item/weapon/storage/wallet/poly = 5, - /obj/item/weapon/storage/wallet/womens = 5, - /obj/item/weapon/lipstick = 5, - /obj/item/weapon/lipstick/purple = 5, - /obj/item/weapon/lipstick/jade = 5, - /obj/item/weapon/lipstick/black = 5, - /obj/item/clothing/ears/earmuffs = 5, - /obj/item/clothing/ears/earmuffs/headphones = 5, - /obj/item/clothing/ears/earring/stud = 5, - /obj/item/clothing/ears/earring/dangle = 5, - /obj/item/clothing/gloves/ring/mariner = 5, - /obj/item/clothing/gloves/ring/engagement = 5, - /obj/item/clothing/gloves/ring/seal/signet = 5, - /obj/item/clothing/gloves/ring/seal/mason = 5, - /obj/item/clothing/gloves/ring/material/plastic = 5, - /obj/item/clothing/gloves/ring/material/steel = 5, - /obj/item/clothing/gloves/ring/material/gold = 5, - /obj/item/clothing/glasses/eyepatch = 5, - /obj/item/clothing/glasses/gglasses = 5, - /obj/item/clothing/glasses/regular/hipster = 5, - /obj/item/clothing/glasses/rimless = 5, - /obj/item/clothing/glasses/thin = 5, - /obj/item/clothing/glasses/monocle = 5, - /obj/item/clothing/glasses/goggles = 5, - /obj/item/clothing/glasses/fluff/spiffygogs = 5, - /obj/item/clothing/glasses/fakesunglasses = 5, - /obj/item/clothing/glasses/fakesunglasses/aviator = 5, - /obj/item/clothing/mask/bandana/blue = 5, - /obj/item/clothing/mask/bandana/gold = 5, - /obj/item/clothing/mask/bandana/green = 5, - /obj/item/clothing/mask/bandana/red = 5, - /obj/item/clothing/mask/surgical = 5) - prices = list(/obj/item/clothing/accessory = 50, - /obj/item/clothing/accessory/armband/med/color = 50, - /obj/item/clothing/accessory/asymmetric = 50, - /obj/item/clothing/accessory/asymmetric/purple = 50, - /obj/item/clothing/accessory/asymmetric/green = 50, - /obj/item/clothing/accessory/bracelet = 50, - /obj/item/clothing/accessory/bracelet/material = 50, - /obj/item/clothing/accessory/bracelet/friendship = 50, - /obj/item/clothing/accessory/chaps = 50, - /obj/item/clothing/accessory/chaps/black = 50, - /obj/item/weapon/storage/briefcase/clutch = 50, - /obj/item/clothing/accessory/collar = 50, - /obj/item/clothing/accessory/collar/bell = 50, - /obj/item/clothing/accessory/collar/spike = 50, - /obj/item/clothing/accessory/collar/pink = 50, - /obj/item/clothing/accessory/collar/holo = 50, - /obj/item/clothing/accessory/collar/shock = 50, - /obj/item/weapon/storage/belt/fannypack = 50, - /obj/item/weapon/storage/belt/fannypack/white = 50, - /obj/item/clothing/accessory/fullcape = 50, - /obj/item/clothing/accessory/halfcape = 50, - /obj/item/clothing/accessory/hawaiian = 5, - /obj/item/clothing/accessory/hawaiian/blue = 5, - /obj/item/clothing/accessory/hawaiian/pink = 5, - /obj/item/clothing/accessory/hawaiian/red = 5, - /obj/item/clothing/accessory/hawaiian/yellow = 5, - /obj/item/clothing/accessory/locket = 50, - /obj/item/weapon/storage/backpack/purse = 50, - /obj/item/clothing/accessory/sash = 50, - /obj/item/clothing/accessory/scarf = 5, - /obj/item/clothing/accessory/scarf/red = 50, - /obj/item/clothing/accessory/scarf/darkblue = 50, - /obj/item/clothing/accessory/scarf/purple = 50, - /obj/item/clothing/accessory/scarf/yellow = 100, - /obj/item/clothing/accessory/scarf/orange = 50, - /obj/item/clothing/accessory/scarf/lightblue = 50, - /obj/item/clothing/accessory/scarf/white = 50, - /obj/item/clothing/accessory/scarf/black = 50, - /obj/item/clothing/accessory/scarf/zebra = 50, - /obj/item/clothing/accessory/scarf/christmas = 50, - /obj/item/clothing/accessory/scarf/stripedred = 50, - /obj/item/clothing/accessory/scarf/stripedgreen = 50, - /obj/item/clothing/accessory/scarf/stripedblue = 50, - /obj/item/clothing/accessory/jacket = 50, - /obj/item/clothing/accessory/jacket/checkered = 50, - /obj/item/clothing/accessory/jacket/burgundy = 50, - /obj/item/clothing/accessory/jacket/navy = 50, - /obj/item/clothing/accessory/jacket/charcoal = 50, - /obj/item/clothing/accessory/vest = 50, - /obj/item/clothing/accessory/sweater = 50, - /obj/item/clothing/accessory/sweater/pink = 50, - /obj/item/clothing/accessory/sweater/mint = 50, - /obj/item/clothing/accessory/sweater/blue = 50, - /obj/item/clothing/accessory/sweater/heart = 50, - /obj/item/clothing/accessory/sweater/nt = 5, - /obj/item/clothing/accessory/sweater/keyhole = 50, - /obj/item/clothing/accessory/sweater/winterneck = 50, - /obj/item/clothing/accessory/sweater/uglyxmas = 5, - /obj/item/clothing/accessory/sweater/flowersweater = 50, - /obj/item/clothing/accessory/sweater/redneck = 50, - /obj/item/clothing/accessory/tie = 50, - /obj/item/clothing/accessory/tie/horrible = 50, - /obj/item/clothing/accessory/tie/white = 50, - /obj/item/clothing/accessory/tie/navy = 50, - /obj/item/clothing/accessory/tie/yellow = 50, - /obj/item/clothing/accessory/tie/darkgreen = 50, - /obj/item/clothing/accessory/tie/black = 50, - /obj/item/clothing/accessory/tie/red_long = 50, - /obj/item/clothing/accessory/tie/red_clip = 50, - /obj/item/clothing/accessory/tie/blue_long = 50, - /obj/item/clothing/accessory/tie/blue_clip = 50, - /obj/item/clothing/accessory/tie/red = 50, - /obj/item/clothing/accessory/wcoat = 50, - /obj/item/clothing/accessory/wcoat/red = 50, - /obj/item/clothing/accessory/wcoat/grey = 50, - /obj/item/clothing/accessory/wcoat/brown = 50, - /obj/item/clothing/accessory/wcoat/gentleman = 50, - /obj/item/clothing/accessory/wcoat/swvest = 50, - /obj/item/clothing/accessory/wcoat/swvest/blue = 50, - /obj/item/clothing/accessory/wcoat/swvest/red = 50, - /obj/item/weapon/storage/wallet = 50, - /obj/item/weapon/storage/wallet/poly = 50, - /obj/item/weapon/storage/wallet/womens = 50, - /obj/item/weapon/lipstick = 50, - /obj/item/weapon/lipstick/purple = 50, - /obj/item/weapon/lipstick/jade = 50, - /obj/item/weapon/lipstick/black = 50, - /obj/item/clothing/ears/earmuffs = 50, - /obj/item/clothing/ears/earmuffs/headphones = 50, - /obj/item/clothing/ears/earring/stud = 50, - /obj/item/clothing/ears/earring/dangle = 50, - /obj/item/clothing/gloves/ring/mariner = 50, - /obj/item/clothing/gloves/ring/engagement = 50, - /obj/item/clothing/gloves/ring/seal/signet = 50, - /obj/item/clothing/gloves/ring/seal/mason = 50, - /obj/item/clothing/gloves/ring/material/plastic = 50, - /obj/item/clothing/gloves/ring/material/steel = 50, - /obj/item/clothing/gloves/ring/material/gold = 100, - /obj/item/clothing/glasses/eyepatch = 50, - /obj/item/clothing/glasses/gglasses = 50, - /obj/item/clothing/glasses/regular/hipster = 50, - /obj/item/clothing/glasses/rimless = 50, - /obj/item/clothing/glasses/thin = 50, - /obj/item/clothing/glasses/monocle = 50, - /obj/item/clothing/glasses/goggles = 50, - /obj/item/clothing/glasses/fluff/spiffygogs = 50, - /obj/item/clothing/glasses/fakesunglasses = 50, - /obj/item/clothing/glasses/fakesunglasses/aviator = 50, - /obj/item/clothing/mask/bandana/blue = 50, - /obj/item/clothing/mask/bandana/gold = 50, - /obj/item/clothing/mask/bandana/green = 50, - /obj/item/clothing/mask/bandana/red = 50, - /obj/item/clothing/mask/surgical = 50) - premium = list(/obj/item/weapon/bedsheet/rainbow = 1) - contraband = list(/obj/item/clothing/mask/gas/clown_hat = 1) - -/obj/machinery/vending/loadout/clothing - name = "General Jump" - desc = "A special vendor using compressed matter cartridges to store large amounts of clothing." - product_ads = "Tired of your grey jumpsuit? Spruce yourself up!;We have the outfit for you!;Don't let that grey jumpsuit get you down, get a ROBUST outfit right now!;Using compressed matter catridges and VERY ETHICAL labor practices to bring YOU the clothing you crave!;Are you sure you want to go to work in THAT?;All of our wares have a whole TWO pockets!" - icon_state = "clothing" - vend_delay = 16 - products = list(/obj/item/clothing/under/bathrobe = 5, - /obj/item/clothing/under/dress/black_corset = 5, - /obj/item/clothing/under/blazer = 5, - /obj/item/clothing/under/blazer/skirt = 5, - /obj/item/clothing/under/cheongsam = 5, - /obj/item/clothing/under/cheongsam/red = 5, - /obj/item/clothing/under/cheongsam/blue = 5, - /obj/item/clothing/under/cheongsam/black = 5, - /obj/item/clothing/under/cheongsam/darkred = 5, - /obj/item/clothing/under/cheongsam/green = 5, - /obj/item/clothing/under/cheongsam/purple = 5, - /obj/item/clothing/under/cheongsam/darkblue = 5, - /obj/item/clothing/under/croptop = 5, - /obj/item/clothing/under/croptop/red = 5, - /obj/item/clothing/under/croptop/grey = 5, - /obj/item/clothing/under/cuttop = 5, - /obj/item/clothing/under/cuttop/red = 5, - /obj/item/clothing/under/suit_jacket/female/skirt = 5, - /obj/item/clothing/under/dress/dress_fire = 5, - /obj/item/clothing/under/dress/flamenco = 5, - /obj/item/clothing/under/dress/flower_dress = 5, - /obj/item/clothing/under/fluff/gnshorts = 5, - /obj/item/clothing/under/color = 5, - /obj/item/clothing/under/color/aqua = 5, - /obj/item/clothing/under/color/black = 5, - /obj/item/clothing/under/color/blackf = 5, - /obj/item/clothing/under/color/blackjumpskirt = 5, - /obj/item/clothing/under/color/blue = 5, - /obj/item/clothing/under/color/brown = 5, - /obj/item/clothing/under/color/darkblue = 5, - /obj/item/clothing/under/color/darkred = 5, - /obj/item/clothing/under/color/green = 5, - /obj/item/clothing/under/color/grey = 5, - /obj/item/clothing/under/color/lightblue = 5, - /obj/item/clothing/under/color/lightbrown = 5, - /obj/item/clothing/under/color/lightgreen = 5, - /obj/item/clothing/under/color/lightpurple = 5, - /obj/item/clothing/under/color/lightred = 5, - /obj/item/clothing/under/color/orange = 5, - /obj/item/clothing/under/color/pink = 5, - /obj/item/clothing/under/color/prison = 5, - /obj/item/clothing/under/color/ranger = 5, - /obj/item/clothing/under/color/red = 5, - /obj/item/clothing/under/color/white = 5, - /obj/item/clothing/under/color/yellow = 5, - /obj/item/clothing/under/color/yellowgreen = 5, - /obj/item/clothing/under/corp/aether = 5, - /obj/item/clothing/under/corp/focal = 5, - /obj/item/clothing/under/corp/hephaestus = 5, - /obj/item/clothing/under/corp/wardt = 5, - /obj/item/clothing/under/kilt = 5, - /obj/item/clothing/under/fluff/latexmaid = 5, - /obj/item/clothing/under/dress/lilacdress = 5, - /obj/item/clothing/under/dress/white2 = 5, - /obj/item/clothing/under/dress/white4 = 5, - /obj/item/clothing/under/dress/maid = 5, - /obj/item/clothing/under/dress/maid/sexy = 5, - /obj/item/clothing/under/dress/maid/janitor = 5, - /obj/item/clothing/under/moderncoat = 5, - /obj/item/clothing/under/permit = 5, - /obj/item/clothing/under/oldwoman = 5, - /obj/item/clothing/under/frontier = 5, - /obj/item/clothing/under/mbill = 5, - /obj/item/clothing/under/pants/baggy/ = 5, - /obj/item/clothing/under/pants/baggy/classicjeans = 5, - /obj/item/clothing/under/pants/baggy/mustangjeans = 5, - /obj/item/clothing/under/pants/baggy/blackjeans = 5, - /obj/item/clothing/under/pants/baggy/greyjeans = 5, - /obj/item/clothing/under/pants/baggy/youngfolksjeans = 5, - /obj/item/clothing/under/pants/baggy/white = 5, - /obj/item/clothing/under/pants/baggy/red = 5, - /obj/item/clothing/under/pants/baggy/black = 5, - /obj/item/clothing/under/pants/baggy/tan = 5, - /obj/item/clothing/under/pants/baggy/track = 5, - /obj/item/clothing/under/pants/baggy/khaki = 5, - /obj/item/clothing/under/pants/baggy/camo = 5, - /obj/item/clothing/under/pants/utility/ = 5, - /obj/item/clothing/under/pants/utility/orange = 5, - /obj/item/clothing/under/pants/utility/blue = 5, - /obj/item/clothing/under/pants/utility/white = 5, - /obj/item/clothing/under/pants/utility/red = 5, - /obj/item/clothing/under/pants/chaps = 5, - /obj/item/clothing/under/pants/chaps/black = 5, - /obj/item/clothing/under/pants/track = 5, - /obj/item/clothing/under/pants/track/red = 5, - /obj/item/clothing/under/pants/track/white = 5, - /obj/item/clothing/under/pants/track/green = 5, - /obj/item/clothing/under/pants/track/blue = 5, - /obj/item/clothing/under/pants/yogapants = 5, - /obj/item/clothing/under/ascetic = 5, - /obj/item/clothing/under/dress/white3 = 5, - /obj/item/clothing/under/skirt/pleated = 5, - /obj/item/clothing/under/dress/darkred = 5, - /obj/item/clothing/under/dress/redeveninggown = 5, - /obj/item/clothing/under/dress/red_swept_dress = 5, - /obj/item/clothing/under/dress/sailordress = 5, - /obj/item/clothing/under/dress/sari = 5, - /obj/item/clothing/under/dress/sari/green = 5, - /obj/item/clothing/under/qipao = 5, - /obj/item/clothing/under/qipao/red = 5, - /obj/item/clothing/under/qipao/white = 5, - /obj/item/clothing/under/shorts/red = 5, - /obj/item/clothing/under/shorts/green = 5, - /obj/item/clothing/under/shorts/blue = 5, - /obj/item/clothing/under/shorts/black = 5, - /obj/item/clothing/under/shorts/grey = 5, - /obj/item/clothing/under/shorts/white = 5, - /obj/item/clothing/under/shorts/jeans = 5, - /obj/item/clothing/under/shorts/jeans/ = 5, - /obj/item/clothing/under/shorts/jeans/classic = 5, - /obj/item/clothing/under/shorts/jeans/mustang = 5, - /obj/item/clothing/under/shorts/jeans/youngfolks = 5, - /obj/item/clothing/under/shorts/jeans/black = 5, - /obj/item/clothing/under/shorts/jeans/grey = 5, - /obj/item/clothing/under/shorts/khaki/ = 5, - /obj/item/clothing/under/skirt/loincloth = 5, - /obj/item/clothing/under/skirt/khaki = 5, - /obj/item/clothing/under/skirt/blue = 5, - /obj/item/clothing/under/skirt/red = 5, - /obj/item/clothing/under/skirt/denim = 5, - /obj/item/clothing/under/skirt/pleated = 5, - /obj/item/clothing/under/skirt/outfit/plaid_blue = 5, - /obj/item/clothing/under/skirt/outfit/plaid_red = 5, - /obj/item/clothing/under/skirt/outfit/plaid_purple = 5, - /obj/item/clothing/under/overalls/sleek = 5, - /obj/item/clothing/under/sl_suit = 5, - /obj/item/clothing/under/gentlesuit = 5, - /obj/item/clothing/under/gentlesuit/skirt = 5, - /obj/item/clothing/under/suit_jacket = 5, - /obj/item/clothing/under/suit_jacket/really_black/skirt = 5, - /obj/item/clothing/under/suit_jacket/really_black = 5, - /obj/item/clothing/under/suit_jacket/female/skirt = 5, - /obj/item/clothing/under/suit_jacket/female/ = 5, - /obj/item/clothing/under/suit_jacket/red = 5, - /obj/item/clothing/under/suit_jacket/red/skirt = 5, - /obj/item/clothing/under/suit_jacket/charcoal = 5, - /obj/item/clothing/under/suit_jacket/charcoal/skirt = 5, - /obj/item/clothing/under/suit_jacket/navy = 5, - /obj/item/clothing/under/suit_jacket/navy/skirt = 5, - /obj/item/clothing/under/suit_jacket/burgundy = 5, - /obj/item/clothing/under/suit_jacket/burgundy/skirt = 5, - /obj/item/clothing/under/suit_jacket/checkered = 5, - /obj/item/clothing/under/suit_jacket/checkered/skirt = 5, - /obj/item/clothing/under/suit_jacket/tan = 5, - /obj/item/clothing/under/suit_jacket/tan/skirt = 5, - /obj/item/clothing/under/scratch = 5, - /obj/item/clothing/under/scratch/skirt = 5, - /obj/item/clothing/under/sundress = 5, - /obj/item/clothing/under/sundress_white = 5, - /obj/item/clothing/under/rank/psych/turtleneck/sweater = 5, - /obj/item/weapon/storage/box/fluff/swimsuit = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/blue = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/purple = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/green = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/red = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/white = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/earth = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/engineering = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/science = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/security = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/medical = 5, - /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 5, - /obj/item/clothing/under/utility = 5, - /obj/item/clothing/under/utility/grey = 5, - /obj/item/clothing/under/utility/blue = 5, - /obj/item/clothing/under/fluff/v_nanovest = 5, - /obj/item/clothing/under/dress/westernbustle = 5, - /obj/item/clothing/under/wedding/bride_white = 5, - /obj/item/weapon/storage/backpack/ = 5, - /obj/item/weapon/storage/backpack/messenger = 5, - /obj/item/weapon/storage/backpack/satchel = 5) - prices = list(/obj/item/clothing/under/bathrobe = 50, - /obj/item/clothing/under/dress/black_corset = 50, - /obj/item/clothing/under/blazer = 50, - /obj/item/clothing/under/blazer/skirt = 50, - /obj/item/clothing/under/cheongsam = 50, - /obj/item/clothing/under/cheongsam/red = 50, - /obj/item/clothing/under/cheongsam/blue = 50, - /obj/item/clothing/under/cheongsam/black = 50, - /obj/item/clothing/under/cheongsam/darkred = 50, - /obj/item/clothing/under/cheongsam/green = 50, - /obj/item/clothing/under/cheongsam/purple = 50, - /obj/item/clothing/under/cheongsam/darkblue = 50, - /obj/item/clothing/under/croptop = 50, - /obj/item/clothing/under/croptop/red = 50, - /obj/item/clothing/under/croptop/grey = 50, - /obj/item/clothing/under/cuttop = 50, - /obj/item/clothing/under/cuttop/red = 50, - /obj/item/clothing/under/suit_jacket/female/skirt = 50, - /obj/item/clothing/under/dress/dress_fire = 50, - /obj/item/clothing/under/dress/flamenco = 50, - /obj/item/clothing/under/dress/flower_dress = 50, - /obj/item/clothing/under/fluff/gnshorts = 50, - /obj/item/clothing/under/color = 50, - /obj/item/clothing/under/color/aqua = 50, - /obj/item/clothing/under/color/black = 50, - /obj/item/clothing/under/color/blackf = 50, - /obj/item/clothing/under/color/blackjumpskirt = 50, - /obj/item/clothing/under/color/blue = 50, - /obj/item/clothing/under/color/brown = 50, - /obj/item/clothing/under/color/darkblue = 50, - /obj/item/clothing/under/color/darkred = 50, - /obj/item/clothing/under/color/green = 50, - /obj/item/clothing/under/color/grey = 50, - /obj/item/clothing/under/color/lightblue = 50, - /obj/item/clothing/under/color/lightbrown = 50, - /obj/item/clothing/under/color/lightgreen = 50, - /obj/item/clothing/under/color/lightpurple = 50, - /obj/item/clothing/under/color/lightred = 50, - /obj/item/clothing/under/color/orange = 50, - /obj/item/clothing/under/color/pink = 50, - /obj/item/clothing/under/color/prison = 50, - /obj/item/clothing/under/color/ranger = 50, - /obj/item/clothing/under/color/red = 50, - /obj/item/clothing/under/color/white = 50, - /obj/item/clothing/under/color/yellow = 50, - /obj/item/clothing/under/color/yellowgreen = 50, - /obj/item/clothing/under/corp/aether = 50, - /obj/item/clothing/under/corp/focal = 50, - /obj/item/clothing/under/corp/hephaestus = 50, - /obj/item/clothing/under/corp/wardt = 50, - /obj/item/clothing/under/kilt = 50, - /obj/item/clothing/under/fluff/latexmaid = 50, - /obj/item/clothing/under/dress/lilacdress = 50, - /obj/item/clothing/under/dress/white2 = 50, - /obj/item/clothing/under/dress/white4 = 50, - /obj/item/clothing/under/dress/maid = 50, - /obj/item/clothing/under/dress/maid/sexy = 50, - /obj/item/clothing/under/dress/maid/janitor = 50, - /obj/item/clothing/under/moderncoat = 50, - /obj/item/clothing/under/permit = 50, - /obj/item/clothing/under/oldwoman = 50, - /obj/item/clothing/under/frontier = 50, - /obj/item/clothing/under/mbill = 50, - /obj/item/clothing/under/pants/baggy/ = 50, - /obj/item/clothing/under/pants/baggy/classicjeans = 50, - /obj/item/clothing/under/pants/baggy/mustangjeans = 50, - /obj/item/clothing/under/pants/baggy/blackjeans = 50, - /obj/item/clothing/under/pants/baggy/greyjeans = 50, - /obj/item/clothing/under/pants/baggy/youngfolksjeans = 50, - /obj/item/clothing/under/pants/baggy/white = 50, - /obj/item/clothing/under/pants/baggy/red = 50, - /obj/item/clothing/under/pants/baggy/black = 50, - /obj/item/clothing/under/pants/baggy/tan = 50, - /obj/item/clothing/under/pants/baggy/track = 50, - /obj/item/clothing/under/pants/baggy/khaki = 50, - /obj/item/clothing/under/pants/baggy/camo = 50, - /obj/item/clothing/under/pants/utility/ = 50, - /obj/item/clothing/under/pants/utility/orange = 50, - /obj/item/clothing/under/pants/utility/blue = 50, - /obj/item/clothing/under/pants/utility/white = 50, - /obj/item/clothing/under/pants/utility/red = 50, - /obj/item/clothing/under/pants/chaps = 50, - /obj/item/clothing/under/pants/chaps/black = 50, - /obj/item/clothing/under/pants/track = 50, - /obj/item/clothing/under/pants/track/red = 50, - /obj/item/clothing/under/pants/track/white = 50, - /obj/item/clothing/under/pants/track/green = 50, - /obj/item/clothing/under/pants/track/blue = 50, - /obj/item/clothing/under/pants/yogapants = 50, - /obj/item/clothing/under/ascetic = 50, - /obj/item/clothing/under/dress/white3 = 50, - /obj/item/clothing/under/skirt/pleated = 50, - /obj/item/clothing/under/dress/darkred = 50, - /obj/item/clothing/under/dress/redeveninggown = 50, - /obj/item/clothing/under/dress/red_swept_dress = 50, - /obj/item/clothing/under/dress/sailordress = 50, - /obj/item/clothing/under/dress/sari = 50, - /obj/item/clothing/under/dress/sari/green = 50, - /obj/item/clothing/under/qipao = 50, - /obj/item/clothing/under/qipao/red = 50, - /obj/item/clothing/under/qipao/white = 50, - /obj/item/clothing/under/shorts/red = 50, - /obj/item/clothing/under/shorts/green = 50, - /obj/item/clothing/under/shorts/blue = 50, - /obj/item/clothing/under/shorts/black = 50, - /obj/item/clothing/under/shorts/grey = 50, - /obj/item/clothing/under/shorts/white = 50, - /obj/item/clothing/under/shorts/jeans = 50, - /obj/item/clothing/under/shorts/jeans/ = 50, - /obj/item/clothing/under/shorts/jeans/classic = 50, - /obj/item/clothing/under/shorts/jeans/mustang = 50, - /obj/item/clothing/under/shorts/jeans/youngfolks = 50, - /obj/item/clothing/under/shorts/jeans/black = 50, - /obj/item/clothing/under/shorts/jeans/grey = 50, - /obj/item/clothing/under/shorts/khaki/ = 50, - /obj/item/clothing/under/skirt/loincloth = 50, - /obj/item/clothing/under/skirt/khaki = 50, - /obj/item/clothing/under/skirt/blue = 50, - /obj/item/clothing/under/skirt/red = 50, - /obj/item/clothing/under/skirt/denim = 50, - /obj/item/clothing/under/skirt/pleated = 50, - /obj/item/clothing/under/skirt/outfit/plaid_blue = 50, - /obj/item/clothing/under/skirt/outfit/plaid_red = 50, - /obj/item/clothing/under/skirt/outfit/plaid_purple = 50, - /obj/item/clothing/under/overalls/sleek = 50, - /obj/item/clothing/under/sl_suit = 50, - /obj/item/clothing/under/gentlesuit = 50, - /obj/item/clothing/under/gentlesuit/skirt = 50, - /obj/item/clothing/under/suit_jacket = 50, - /obj/item/clothing/under/suit_jacket/really_black/skirt = 50, - /obj/item/clothing/under/suit_jacket/really_black = 50, - /obj/item/clothing/under/suit_jacket/female/skirt = 50, - /obj/item/clothing/under/suit_jacket/female/ = 50, - /obj/item/clothing/under/suit_jacket/red = 50, - /obj/item/clothing/under/suit_jacket/red/skirt = 50, - /obj/item/clothing/under/suit_jacket/charcoal = 50, - /obj/item/clothing/under/suit_jacket/charcoal/skirt = 50, - /obj/item/clothing/under/suit_jacket/navy = 50, - /obj/item/clothing/under/suit_jacket/navy/skirt = 50, - /obj/item/clothing/under/suit_jacket/burgundy = 50, - /obj/item/clothing/under/suit_jacket/burgundy/skirt = 50, - /obj/item/clothing/under/suit_jacket/checkered = 50, - /obj/item/clothing/under/suit_jacket/checkered/skirt = 50, - /obj/item/clothing/under/suit_jacket/tan = 50, - /obj/item/clothing/under/suit_jacket/tan/skirt = 50, - /obj/item/clothing/under/scratch = 50, - /obj/item/clothing/under/scratch/skirt = 50, - /obj/item/clothing/under/sundress = 50, - /obj/item/clothing/under/sundress_white = 50, - /obj/item/clothing/under/rank/psych/turtleneck/sweater = 50, - /obj/item/weapon/storage/box/fluff/swimsuit = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/blue = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/purple = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/green = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/red = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/white = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/earth = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/engineering = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/science = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/security = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/medical = 50, - /obj/item/weapon/storage/box/fluff/swimsuit/cowbikini = 50, - /obj/item/clothing/under/utility = 50, - /obj/item/clothing/under/utility/grey = 50, - /obj/item/clothing/under/utility/blue = 50, - /obj/item/clothing/under/fluff/v_nanovest = 50, - /obj/item/clothing/under/dress/westernbustle = 50, - /obj/item/clothing/under/wedding/bride_white = 50, - /obj/item/weapon/storage/backpack/ = 50, - /obj/item/weapon/storage/backpack/messenger = 50, - /obj/item/weapon/storage/backpack/satchel = 50) - premium = list(/obj/item/clothing/under/color/rainbow = 1) - contraband = list(/obj/item/clothing/under/rank/clown = 1) - -/obj/machinery/vending/loadout/loadout_misc - name = "Bits and Bobs" - desc = "A special vendor for things and also stuff!" - product_ads = "You never know when you might need an umbrella.;Hey kid... want some cardemon cards?;Miscellaneous for your miscellaneous heart.;Who's bob? Wouldn't you like to know.;I'm sorry there's no grappling hooks in our umbrellas.;We sell things AND stuff." - icon_state = "loadout_misc" - products = list(/obj/item/weapon/cane = 5, - /obj/item/weapon/pack/cardemon = 25, - /obj/item/weapon/deck/holder = 5, - /obj/item/weapon/deck/cah = 5, - /obj/item/weapon/deck/cah/black = 5, - /obj/item/weapon/deck/tarot = 5, - /obj/item/weapon/deck/cards = 5, - /obj/item/weapon/pack/spaceball = 10, - /obj/item/weapon/storage/pill_bottle/dice = 5, - /obj/item/weapon/storage/pill_bottle/dice_nerd = 5, - /obj/item/weapon/melee/umbrella/random = 10) - prices = list(/obj/item/weapon/cane = 100, - /obj/item/weapon/pack/cardemon = 100, - /obj/item/weapon/deck/holder = 100, - /obj/item/weapon/deck/cah = 100, - /obj/item/weapon/deck/cah/black = 100, - /obj/item/weapon/deck/tarot = 100, - /obj/item/weapon/deck/cards = 100, - /obj/item/weapon/pack/spaceball = 100, - /obj/item/weapon/storage/pill_bottle/dice = 100, - /obj/item/weapon/storage/pill_bottle/dice_nerd = 100, - /obj/item/weapon/melee/umbrella/random = 100) - premium = list(/obj/item/toy/bosunwhistle = 1) - contraband = list(/obj/item/toy/katana = 1) - -/obj/machinery/vending/loadout/overwear - name = "Big D's Best" - desc = "A special vendor using compressed matter cartridges to store large amounts of overwear!" - product_ads = "Dress your best! It's what big D would want.;Overwear for all occasions!;Big D has what you need if what you need is some form of jacket!;Need a new hoodie? Bid D has you covered.;Big D says you need a new suit!;Big D smiles when he sees you in one of his coats!" - icon_state = "suit" - vend_delay = 16 - products = list(/obj/item/clothing/suit/storage/apron = 5, - /obj/item/clothing/suit/storage/flannel/aqua = 5, - /obj/item/clothing/suit/storage/toggle/bomber = 5, - /obj/item/clothing/suit/storage/bomber/alt = 5, - /obj/item/clothing/suit/storage/flannel/brown = 5, - /obj/item/clothing/suit/storage/toggle/cardigan = 5, - /obj/item/clothing/accessory/poncho/roles/cloak/custom = 5, - /obj/item/clothing/suit/storage/duster = 5, - /obj/item/clothing/suit/storage/toggle/denim_jacket = 5, - /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 5, - /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 5, - /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 5, - /obj/item/clothing/suit/storage/fluff/gntop = 5, - /obj/item/clothing/suit/greatcoat = 5, - /obj/item/clothing/suit/storage/flannel = 5, - /obj/item/clothing/suit/storage/greyjacket = 5, - /obj/item/clothing/suit/storage/hazardvest = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/black = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/red = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/blue = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/green = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/orange = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/cti = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/mu = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/nt = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/smw = 5, - /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 5, - /obj/item/clothing/suit/storage/fluff/jacket/field = 5, - /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 5, - /obj/item/clothing/suit/storage/fluff/jacket/air_force = 5, - /obj/item/clothing/suit/storage/fluff/jacket/navy = 5, - /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 5, - /obj/item/clothing/suit/kamishimo = 5, - /obj/item/clothing/suit/kimono = 5, - /obj/item/clothing/suit/storage/toggle/labcoat = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/blue = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/green = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/orange = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/pink = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/red = 5, - /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 5, - /obj/item/clothing/suit/leathercoat = 5, - /obj/item/clothing/suit/storage/toggle/leather_jacket = 5, - /obj/item/clothing/suit/storage/leather_jacket_alt = 5, - /obj/item/clothing/suit/storage/toggle/brown_jacket = 5, - /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 5, - /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 5, - /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 5, - /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 5, - /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 5, - /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 5, - /obj/item/clothing/suit/storage/miljacket = 5, - /obj/item/clothing/suit/storage/miljacket/alt = 5, - /obj/item/clothing/suit/storage/miljacket/green = 5, - /obj/item/clothing/suit/storage/apron/overalls = 5, - /obj/item/clothing/suit/storage/toggle/peacoat = 5, - /obj/item/clothing/accessory/poncho = 5, - /obj/item/clothing/accessory/poncho/green = 5, - /obj/item/clothing/accessory/poncho/red = 5, - /obj/item/clothing/accessory/poncho/purple = 5, - /obj/item/clothing/accessory/poncho/blue = 5, - /obj/item/clothing/suit/jacket/puffer = 5, - /obj/item/clothing/suit/jacket/puffer/vest = 5, - /obj/item/clothing/suit/storage/flannel/red = 5, - /obj/item/clothing/suit/unathi/robe = 5, - /obj/item/clothing/suit/storage/snowsuit = 5, - /obj/item/clothing/suit/storage/toggle/internalaffairs = 5, - /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 5, - /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 5, - /obj/item/clothing/suit/suspenders = 5, - /obj/item/clothing/suit/storage/toggle/track = 5, - /obj/item/clothing/suit/storage/toggle/track/blue = 5, - /obj/item/clothing/suit/storage/toggle/track/green = 5, - /obj/item/clothing/suit/storage/toggle/track/red = 5, - /obj/item/clothing/suit/storage/toggle/track/white = 5, - /obj/item/clothing/suit/storage/trench = 5, - /obj/item/clothing/suit/storage/trench/grey = 5, - /obj/item/clothing/suit/varsity = 5, - /obj/item/clothing/suit/varsity/red = 5, - /obj/item/clothing/suit/varsity/purple = 5, - /obj/item/clothing/suit/varsity/green = 5, - /obj/item/clothing/suit/varsity/blue = 5, - /obj/item/clothing/suit/varsity/brown = 5, - /obj/item/clothing/suit/storage/hooded/wintercoat = 5, - /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 5, - /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 5) - prices = list(/obj/item/clothing/suit/storage/apron = 100, - /obj/item/clothing/suit/storage/flannel/aqua = 100, - /obj/item/clothing/suit/storage/toggle/bomber = 100, - /obj/item/clothing/suit/storage/bomber/alt = 100, - /obj/item/clothing/suit/storage/flannel/brown = 100, - /obj/item/clothing/suit/storage/toggle/cardigan = 100, - /obj/item/clothing/accessory/poncho/roles/cloak/custom = 100, - /obj/item/clothing/suit/storage/duster = 100, - /obj/item/clothing/suit/storage/toggle/denim_jacket = 100, - /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen = 100, - /obj/item/clothing/suit/storage/toggle/denim_jacket/sleeveless = 100, - /obj/item/clothing/suit/storage/toggle/denim_jacket/nanotrasen/sleeveless = 100, - /obj/item/clothing/suit/storage/fluff/gntop = 100, - /obj/item/clothing/suit/greatcoat = 100, - /obj/item/clothing/suit/storage/flannel = 100, - /obj/item/clothing/suit/storage/greyjacket = 100, - /obj/item/clothing/suit/storage/hazardvest = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/black = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/red = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/blue = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/green = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/orange = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/yellow = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/cti = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/mu = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/nt = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/smw = 100, - /obj/item/clothing/suit/storage/toggle/hoodie/nrti = 100, - /obj/item/clothing/suit/storage/fluff/jacket/field = 100, - /obj/item/clothing/suit/storage/fluff/jacket/air_cavalry = 100, - /obj/item/clothing/suit/storage/fluff/jacket/air_force = 100, - /obj/item/clothing/suit/storage/fluff/jacket/navy = 100, - /obj/item/clothing/suit/storage/fluff/jacket/special_forces = 100, - /obj/item/clothing/suit/kamishimo = 100, - /obj/item/clothing/suit/kimono = 100, - /obj/item/clothing/suit/storage/toggle/labcoat = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/blue = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/blue_edge = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/green = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/orange = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/pink = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/red = 100, - /obj/item/clothing/suit/storage/toggle/labcoat/yellow = 100, - /obj/item/clothing/suit/leathercoat = 100, - /obj/item/clothing/suit/storage/toggle/leather_jacket = 100, - /obj/item/clothing/suit/storage/leather_jacket_alt = 100, - /obj/item/clothing/suit/storage/toggle/brown_jacket = 100, - /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen = 100, - /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen = 100, - /obj/item/clothing/suit/storage/toggle/leather_jacket/sleeveless = 100, - /obj/item/clothing/suit/storage/toggle/brown_jacket/sleeveless = 100, - /obj/item/clothing/suit/storage/toggle/leather_jacket/nanotrasen/sleeveless = 100, - /obj/item/clothing/suit/storage/toggle/brown_jacket/nanotrasen/sleeveless = 100, - /obj/item/clothing/suit/storage/miljacket = 100, - /obj/item/clothing/suit/storage/miljacket/alt = 100, - /obj/item/clothing/suit/storage/miljacket/green = 100, - /obj/item/clothing/suit/storage/apron/overalls = 100, - /obj/item/clothing/suit/storage/toggle/peacoat = 100, - /obj/item/clothing/accessory/poncho = 100, - /obj/item/clothing/accessory/poncho/green = 100, - /obj/item/clothing/accessory/poncho/red = 100, - /obj/item/clothing/accessory/poncho/purple = 100, - /obj/item/clothing/accessory/poncho/blue = 100, - /obj/item/clothing/suit/jacket/puffer = 100, - /obj/item/clothing/suit/jacket/puffer/vest = 100, - /obj/item/clothing/suit/storage/flannel/red = 100, - /obj/item/clothing/suit/unathi/robe = 100, - /obj/item/clothing/suit/storage/snowsuit = 100, - /obj/item/clothing/suit/storage/toggle/internalaffairs = 100, - /obj/item/clothing/suit/storage/toggle/lawyer/bluejacket = 100, - /obj/item/clothing/suit/storage/toggle/lawyer/purpjacket = 100, - /obj/item/clothing/suit/suspenders = 100, - /obj/item/clothing/suit/storage/toggle/track = 100, - /obj/item/clothing/suit/storage/toggle/track/blue = 100, - /obj/item/clothing/suit/storage/toggle/track/green = 100, - /obj/item/clothing/suit/storage/toggle/track/red = 100, - /obj/item/clothing/suit/storage/toggle/track/white = 100, - /obj/item/clothing/suit/storage/trench = 100, - /obj/item/clothing/suit/storage/trench/grey = 100, - /obj/item/clothing/suit/varsity = 100, - /obj/item/clothing/suit/varsity/red = 100, - /obj/item/clothing/suit/varsity/purple = 100, - /obj/item/clothing/suit/varsity/green = 100, - /obj/item/clothing/suit/varsity/blue = 100, - /obj/item/clothing/suit/varsity/brown = 100, - /obj/item/clothing/suit/storage/hooded/wintercoat = 100, - /obj/item/clothing/suit/storage/hooded/wintercoat/aformal = 100, - /obj/item/clothing/suit/storage/teshari/cloak/standard/white_grey = 100) - premium = list(/obj/item/clothing/suit/imperium_monk = 3, - /obj/item/clothing/suit/storage/hooded/wintercoat/cosmic = 1) - contraband = list(/obj/item/toy/katana = 1) - -/obj/machinery/vending/loadout/costume - name = "Thespian's Delight" - desc = "Sometimes nerds need costumes!" - product_ads = "Don't let your art be stifled!;Remember, practice makes perfect!;Break a leg!;Don't make me get the cane!;Thespian's Delight entering stage right!;Costumes for your acting needs!" - icon = 'icons/obj/vending.dmi' - icon_state = "theater" - products = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 3, - /obj/item/clothing/suit/storage/hooded/costume/carp = 3, - /obj/item/clothing/suit/chickensuit = 3, - /obj/item/clothing/head/chicken = 3, - /obj/item/clothing/head/helmet/gladiator = 3, - /obj/item/clothing/under/gladiator = 3, - /obj/item/clothing/suit/storage/toggle/labcoat/mad = 3, - /obj/item/clothing/under/suit_jacket/green = 3, - /obj/item/clothing/glasses/gglasses = 3, - /obj/item/clothing/head/flatcap = 3, - /obj/item/clothing/shoes/boots/jackboots = 3, - /obj/item/clothing/under/schoolgirl = 3, - /obj/item/clothing/head/kitty = 3, - /obj/item/clothing/glasses/sunglasses/blindfold = 3, - /obj/item/clothing/head/beret = 3, - /obj/item/clothing/under/skirt = 3, - /obj/item/clothing/under/suit_jacket = 3, - /obj/item/clothing/head/that = 3, - /obj/item/clothing/accessory/wcoat = 3, - /obj/item/clothing/under/scratch = 3, - /obj/item/clothing/shoes/white = 3, - /obj/item/clothing/gloves/white = 3, - /obj/item/clothing/under/kilt = 3, - /obj/item/clothing/glasses/monocle = 3, - /obj/item/clothing/under/sl_suit = 3, - /obj/item/clothing/mask/fakemoustache = 3, - /obj/item/weapon/cane = 3, - /obj/item/clothing/head/bowler = 3, - /obj/item/clothing/head/plaguedoctorhat = 3, - /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 3, - /obj/item/clothing/mask/gas/plaguedoctor/fluff = 3, - /obj/item/clothing/under/owl = 3, - /obj/item/clothing/mask/gas/owl_mask = 3, - /obj/item/clothing/under/waiter = 3, - /obj/item/clothing/suit/storage/apron = 3, - /obj/item/clothing/under/pirate = 3, - /obj/item/clothing/head/pirate = 3, - /obj/item/clothing/suit/pirate = 3, - /obj/item/clothing/glasses/eyepatch = 3, - /obj/item/clothing/head/ushanka = 3, - /obj/item/clothing/under/soviet = 3, - /obj/item/clothing/suit/imperium_monk = 1, - /obj/item/clothing/suit/holidaypriest = 3, - /obj/item/clothing/head/witchwig = 3, - /obj/item/clothing/under/sundress = 3, - /obj/item/weapon/staff/broom = 3, - /obj/item/clothing/suit/wizrobe/fake = 3, - /obj/item/clothing/head/wizard/fake = 3, - /obj/item/weapon/staff = 3, - /obj/item/clothing/mask/gas/sexyclown = 3, - /obj/item/clothing/under/sexyclown = 3, - /obj/item/clothing/mask/gas/sexymime = 3, - /obj/item/clothing/under/sexymime = 3, - /obj/item/clothing/suit/storage/hooded/knight_costume = 3, - /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 3, - /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 3, - /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 3, - /obj/item/clothing/suit/armor/combat/crusader_costume = 3, - /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 3, - /obj/item/clothing/head/helmet/combat/crusader_costume = 3, - /obj/item/clothing/head/helmet/combat/bedevere_costume = 3, - /obj/item/clothing/gloves/combat/knight_costume = 3, - /obj/item/clothing/gloves/combat/knight_costume/brown = 3, - /obj/item/clothing/shoes/knight_costume = 3, - /obj/item/clothing/shoes/knight_costume/black = 3) - prices = list(/obj/item/clothing/suit/storage/hooded/costume/carp = 200, - /obj/item/clothing/suit/storage/hooded/costume/carp = 200, - /obj/item/clothing/suit/chickensuit = 200, - /obj/item/clothing/head/chicken = 200, - /obj/item/clothing/head/helmet/gladiator = 300, - /obj/item/clothing/under/gladiator = 500, - /obj/item/clothing/suit/storage/toggle/labcoat/mad = 200, - /obj/item/clothing/under/suit_jacket/green = 200, - /obj/item/clothing/glasses/gglasses = 200, - /obj/item/clothing/head/flatcap = 200, - /obj/item/clothing/shoes/boots/jackboots = 200, - /obj/item/clothing/under/schoolgirl = 200, - /obj/item/clothing/head/kitty = 200, - /obj/item/clothing/glasses/sunglasses/blindfold = 200, - /obj/item/clothing/head/beret = 200, - /obj/item/clothing/under/skirt = 200, - /obj/item/clothing/under/suit_jacket = 200, - /obj/item/clothing/head/that = 200, - /obj/item/clothing/accessory/wcoat = 200, - /obj/item/clothing/under/scratch = 200, - /obj/item/clothing/shoes/white = 200, - /obj/item/clothing/gloves/white = 200, - /obj/item/clothing/under/kilt = 200, - /obj/item/clothing/glasses/monocle = 400, - /obj/item/clothing/under/sl_suit = 200, - /obj/item/clothing/mask/fakemoustache = 200, - /obj/item/weapon/cane = 300, - /obj/item/clothing/head/bowler = 200, - /obj/item/clothing/head/plaguedoctorhat = 300, - /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 300, - /obj/item/clothing/mask/gas/plaguedoctor/fluff = 600, - /obj/item/clothing/under/owl = 400, - /obj/item/clothing/mask/gas/owl_mask = 400, - /obj/item/clothing/under/waiter = 100, - /obj/item/clothing/suit/storage/apron = 200, - /obj/item/clothing/under/pirate = 300, - /obj/item/clothing/head/pirate = 400, - /obj/item/clothing/suit/pirate = 600, - /obj/item/clothing/glasses/eyepatch = 200, - /obj/item/clothing/head/ushanka = 200, - /obj/item/clothing/under/soviet = 200, - /obj/item/clothing/suit/imperium_monk = 2000, - /obj/item/clothing/suit/holidaypriest = 200, - /obj/item/clothing/head/witchwig = 200, - /obj/item/clothing/under/sundress = 50, - /obj/item/weapon/staff/broom = 400, - /obj/item/clothing/suit/wizrobe/fake = 200, - /obj/item/clothing/head/wizard/fake = 200, - /obj/item/weapon/staff = 400, - /obj/item/clothing/mask/gas/sexyclown = 600, - /obj/item/clothing/under/sexyclown = 200, - /obj/item/clothing/mask/gas/sexymime = 600, - /obj/item/clothing/under/sexymime = 200, - /obj/item/clothing/suit/storage/hooded/knight_costume = 200, - /obj/item/clothing/suit/storage/hooded/knight_costume/galahad = 200, - /obj/item/clothing/suit/storage/hooded/knight_costume/lancelot = 200, - /obj/item/clothing/suit/storage/hooded/knight_costume/robin = 200, - /obj/item/clothing/suit/armor/combat/crusader_costume = 200, - /obj/item/clothing/suit/armor/combat/crusader_costume/bedevere = 200, - /obj/item/clothing/head/helmet/combat/crusader_costume = 200, - /obj/item/clothing/head/helmet/combat/bedevere_costume = 200, - /obj/item/clothing/gloves/combat/knight_costume = 200, - /obj/item/clothing/gloves/combat/knight_costume/brown = 200, - /obj/item/clothing/shoes/knight_costume = 200, - /obj/item/clothing/shoes/knight_costume/black = 200) - premium = list(/obj/item/clothing/suit/imperium_monk = 3, - /obj/item/clothing/suit/barding/agatha = 2, - /obj/item/clothing/suit/barding/alt_agatha = 2, - /obj/item/clothing/suit/barding/mason = 2, - /obj/item/clothing/suit/drake_cloak = 2) - contraband = list(/obj/item/clothing/head/syndicatefake = 1, - /obj/item/clothing/suit/syndicatefake = 1) +// Loadout Vending Machines End /obj/machinery/vending/entertainer name = "Thespian's Delight" @@ -2734,6 +1607,7 @@ /obj/item/clothing/shoes/knight_costume = 3, /obj/item/clothing/shoes/knight_costume/black = 3) +// Event Loadout Vending Machines Start /obj/machinery/vending/event //FOR FACILITATING AND EQUIPPING EVENTS, DO NOT PLACE ON THE NORMAL MAP// name = "Fingers and Toes" @@ -3405,6 +2279,36 @@ /obj/item/clothing/suit/space/rig/military = 5 ) +/obj/machinery/vending/event/gadget //FOR FACILITATING AND EQUIPPING EVENTS, DO NOT PLACE ON THE NORMAL MAP// + name = "Chips Co." + desc = "A special vendor for devices and gadgets." + product_ads = "You can't RESIST our great deals!;Feeling disconnected? We have a gadget for you!;You know you have the capacity to buy our capacitors!;FILL THAT HOLE IN YOUR HEART WITH OUR PLASTIC DISTRACTIONS!!!;Devices for everyone! Chips Co.!;ROBUST INVENTORY, GREAT PRICES! ;DON'T FORGET THE oyPAD 13s PRO! ON SALE NOW, ONLY ONE THOUSAND THALERS!" + icon_state = "gadgets" + vend_delay = 11 + products = list(/obj/item/clothing/suit/circuitry = 1, + /obj/item/clothing/head/circuitry = 1, + /obj/item/clothing/shoes/circuitry = 1, + /obj/item/clothing/gloves/circuitry = 1, + /obj/item/clothing/under/circuitry = 1, + /obj/item/clothing/glasses/circuitry = 1, + /obj/item/clothing/ears/circuitry = 1, + /obj/item/device/text_to_speech = 5, + /obj/item/device/paicard = 5, + /obj/item/device/communicator = 10, + /obj/item/device/communicator/watch = 10, + /obj/item/device/radio = 10, + /obj/item/device/camera = 5, + /obj/item/device/taperecorder = 5, + /obj/item/modular_computer/tablet/preset/custom_loadout/cheap = 5, + /obj/item/device/pda = 10, + /obj/item/device/radio/headset = 10, + /obj/item/device/flashlight = 5, + /obj/item/device/laser_pointer = 3, + /obj/item/clothing/glasses/omnihud = 10, + /obj/item/device/perfect_tele/one_beacon = 1, + /obj/item/weapon/disk/nifsoft/compliance = 1, + /obj/item/device/perfect_tele/alien = 10) + /obj/machinery/vending/event/costume //FOR FACILITATING AND EQUIPPING EVENTS, DO NOT PLACE ON THE NORMAL MAP// name = "Thespian's Delight" desc = "Sometimes nerds need costumes!" @@ -3485,6 +2389,9 @@ /obj/item/clothing/suit/syndicatefake = 1 ) +// Event Loadout Vending Machines End + +// Event Food Vending Machines Start /obj/machinery/vending/event/food //FOR FACILITATING/OUTFITTING EVENTS, DO NOT PUT THESE ON THE MAP// name = "Dog Food" @@ -3938,7 +2845,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/chicken = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/corgi = 10, - /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 10, + /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/fox = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/human = 10, @@ -4394,7 +3301,7 @@ /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/chicken = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/corgi = 10, - /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 10, + /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/fox = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/meat/human = 10, @@ -4426,6 +3333,8 @@ /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10) vend_delay = 15 +// Event Food Vending Machines End + /obj/machinery/vending/emergencyfood name = "Food Cube Dispenser" desc = "An ominous machine dispensing food cubes. It will keep you fed, but at what cost?" @@ -4441,6 +3350,8 @@ contraband = list(/obj/item/weapon/storage/box/wings/tray = 20) /obj/machinery/vending/cola/soft + name = "Soft Robustdrinks" + desc = "A different vendor brand for soft drinks, taking off very successfully with its unique imagery and equal stock." icon = 'icons/obj/vending_vr.dmi' icon_state = "Cola_Machine" diff --git a/code/modules/economy/vending_refills.dm b/code/modules/economy/vending_refills.dm new file mode 100644 index 0000000000..b2c0188ef9 --- /dev/null +++ b/code/modules/economy/vending_refills.dm @@ -0,0 +1,161 @@ +/obj/item/weapon/refill_cartridge + name = "vending refill cartridge" + desc = "A specialized cartridge used to refill vending machines with fresh product. Tamper proof." + icon = 'icons/obj/refill_cartridges.dmi' + icon_state = "rc_generic" + item_state = "syringe_kit" + var/refill_type + +/obj/item/weapon/refill_cartridge/proc/can_refill(obj/machinery/vending/V as obj) + if(V.type == refill_type) + return TRUE + return FALSE + +/obj/item/weapon/refill_cartridge/multitype + refill_type = list() + var/refill_exceptions = list() + +/obj/item/weapon/refill_cartridge/multitype/can_refill(obj/machinery/vending/V as obj) + for(var/entry in refill_type) + if(istype(V, entry) && !(V.type in refill_exceptions)) + return TRUE + return FALSE + +/obj/item/weapon/refill_cartridge/autoname/Initialize() + ..() + if(refill_type && ispath(refill_type)) + var/atom/tmp = refill_type + src.name = "[initial(tmp.name)] refill cartridge" + +/obj/item/weapon/refill_cartridge/universal // For admin/event use. Can refill any refillable vendor. + name = "ultimate vending refill cartridge" + desc = "A universal cartridge used to refill vending machines with fresh product." + icon_state = "rc_mystery" + +/obj/item/weapon/refill_cartridge/universal/can_refill(obj/machinery/vending/V as obj) + return TRUE + +// Multi-vendor subtypes + +/obj/item/weapon/refill_cartridge/multitype/technical + name = "technical vendor refill cartridge" + icon_state = "rc_mechanical" + refill_type = list(/obj/machinery/vending/assist, + /obj/machinery/vending/tool, + /obj/machinery/vending/loadout/gadget) + +/obj/item/weapon/refill_cartridge/multitype/food + name = "food vendor refill cartridge" + icon_state = "rc_food" + refill_type = list(/obj/machinery/vending/snack, + /obj/machinery/vending/fitness, + /obj/machinery/vending/hotfood, + /obj/machinery/vending/weeb, + /obj/machinery/vending/sol, + /obj/machinery/vending/snix, + /obj/machinery/vending/snlvend, + /obj/machinery/vending/sovietvend) + +/obj/item/weapon/refill_cartridge/multitype/drink + name = "drinks vendor refill cartridge" + icon_state = "rc_drink" + refill_type = list(/obj/machinery/vending/coffee, + /obj/machinery/vending/cola, + /obj/machinery/vending/sovietsoda, + /obj/machinery/vending/bepis) + +/obj/item/weapon/refill_cartridge/multitype/smokes //Multitype version in case multiple smoke machine vendors exist in future. + name = "smoking vendor refill cartridge" + icon_state = "rc_generic" + refill_type = list(/obj/machinery/vending/cigarette) + +/obj/item/weapon/refill_cartridge/multitype/clothing + name = "clothing vendor refill cartridge" + icon_state = "rc_clothes" + refill_type = list(/obj/machinery/vending/wardrobe, + /obj/machinery/vending/loadout) + refill_exceptions = list(/obj/machinery/vending/loadout/gadget) + +/obj/item/weapon/refill_cartridge/multitype/specialty + name = "specialty vendor refill cartridge" + icon_state = "rc_generic" + refill_type = list(/obj/machinery/vending/cart, + /obj/machinery/vending/medical, + /obj/machinery/vending/phoronresearch, + /obj/machinery/vending/wallmed1, + /obj/machinery/vending/wallmed2, + /obj/machinery/vending/wallmed_airlock, + /obj/machinery/vending/security, + /obj/machinery/vending/hydronutrients, + /obj/machinery/vending/dinnerware, + /obj/machinery/vending/engivend, + /obj/machinery/vending/robotics, + /obj/machinery/vending/fishing, + /obj/machinery/vending/blood, + /obj/machinery/vending/entertainer) + +/obj/item/weapon/refill_cartridge/autoname/food + icon_state = "rc_food" + +/obj/item/weapon/refill_cartridge/autoname/food/snack + refill_type = /obj/machinery/vending/snack + +/obj/item/weapon/refill_cartridge/autoname/food/fitness + refill_type = /obj/machinery/vending/fitness + +/obj/item/weapon/refill_cartridge/autoname/food/hotfood + refill_type = /obj/machinery/vending/hotfood + +/obj/item/weapon/refill_cartridge/autoname/food/weeb + refill_type = /obj/machinery/vending/weeb + +/obj/item/weapon/refill_cartridge/autoname/food/sol + refill_type = /obj/machinery/vending/sol + +/obj/item/weapon/refill_cartridge/autoname/food/snix + refill_type = /obj/machinery/vending/snix + +/obj/item/weapon/refill_cartridge/autoname/food/snlvend + refill_type = /obj/machinery/vending/snlvend + +/obj/item/weapon/refill_cartridge/autoname/food/sovietvend + refill_type = /obj/machinery/vending/sovietvend + +/obj/item/weapon/refill_cartridge/autoname/drink + icon_state = "rc_drink" + +/obj/item/weapon/refill_cartridge/autoname/drink/coffee + refill_type = /obj/machinery/vending/coffee + +/obj/item/weapon/refill_cartridge/autoname/drink/cola + refill_type = /obj/machinery/vending/cola + +/obj/item/weapon/refill_cartridge/autoname/drink/cola_soft + refill_type = /obj/machinery/vending/cola/soft + +/obj/item/weapon/refill_cartridge/autoname/drink/sovietsoda + refill_type = /obj/machinery/vending/sovietsoda + +/obj/item/weapon/refill_cartridge/autoname/drink/bepis + refill_type = /obj/machinery/vending/bepis + +/obj/item/weapon/refill_cartridge/autoname/cigarette + icon_state = "rc_generic" + refill_type = /obj/machinery/vending/cigarette + +/obj/item/weapon/refill_cartridge/multitype/wardrobe + name = "specialized wardrobe refill cartridge" + icon_state = "rc_clothes" + refill_type = list(/obj/machinery/vending/wardrobe) + +/obj/item/weapon/refill_cartridge/autoname/technical + icon_state = "rc_mechanical" + +/obj/item/weapon/refill_cartridge/autoname/technical/assist + refill_type = /obj/machinery/vending/assist + +/obj/item/weapon/refill_cartridge/autoname/technical/tool + refill_type = /obj/machinery/vending/tool + +/obj/item/weapon/refill_cartridge/autoname/giftvendor + refill_type = /obj/machinery/vending/giftvendor \ No newline at end of file diff --git a/code/modules/emotes/definitions/audible.dm b/code/modules/emotes/definitions/audible.dm index c233cc1ccc..1a5a4e3084 100644 --- a/code/modules/emotes/definitions/audible.dm +++ b/code/modules/emotes/definitions/audible.dm @@ -227,3 +227,11 @@ emote_message_1p_target = "You trill at TARGET." emote_message_3p_target = "trills at TARGET." emote_sound = 'sound/voice/teshtrill.ogg' // Copyright CC BY-NC 3.0 Arnaud Coutancier (freesound.org) for the source audio. + +/decl/emote/audible/prbt + key = "prbt" + emote_message_1p = "You prbt." + emote_message_3p = "prbts." + emote_message_1p_target = "You prbt at TARGET." + emote_message_3p_target = "prbts at TARGET." + emote_sound = 'sound/voice/prbt.ogg' \ No newline at end of file diff --git a/code/modules/emotes/emote_define.dm b/code/modules/emotes/emote_define.dm index 4bedd91eb0..daff23f85d 100644 --- a/code/modules/emotes/emote_define.dm +++ b/code/modules/emotes/emote_define.dm @@ -89,15 +89,23 @@ var/global/list/emotes_by_key var/atom/target if(can_target() && extra_params) - extra_params = lowertext(extra_params) - for(var/atom/thing in view(user)) - if(extra_params == lowertext(thing.name)) - target = thing - break + var/target_dist + extra_params = trim(lowertext(extra_params)) + for(var/atom/thing in view((isnull(check_range) ? world.view : check_range), user)) - if(target && target != user && check_range) - if (get_dist(user, target) > check_range) - to_chat(user, SPAN_WARNING("\The [target] is too far away.")) + if(!isturf(thing.loc)) + continue + + var/new_target_dist = get_dist(thing, user) + if(!isnull(target_dist) && target_dist > new_target_dist) + continue + + if(findtext(lowertext(thing.name), extra_params)) + target_dist = new_target_dist + target = thing + + if(!target) + to_chat(user, SPAN_WARNING("You cannot see a '[extra_params]' within range.")) return var/use_1p = get_emote_message_1p(user, target, extra_params) diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index 2e4d9d84cf..0af166fe23 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -5,13 +5,13 @@ endWhen = 126 /datum/event/aurora_caelus/announce() - command_announcement.Announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. \ + command_announcement.Announce("[station_name()]: A harmless cloud of ions is approaching your [using_map.facility_type], and will exhaust their energy battering the hull. \ Nanotrasen has approved a short break for all employees to relax and observe this very rare event. \ During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. \ Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. \ You will have approximately two minutes before the ions begin to reach the hull. \ We hope you enjoy the lights.", "Nanotrasen Meteorology Division", new_sound = 'sound/AI/aurora.ogg') //VOREStation Edit - + /datum/event/aurora_caelus/start() affecting_z -= global.using_map.sealed_levels // Space levels only please! for(var/mob/M in player_list) @@ -31,6 +31,6 @@ Please return to your workplace and continue work as normal. \ Have a pleasant shift, [station_name()], and thank you for watching with us.", "Nanotrasen Meteorology Division", new_sound = 'sound/AI/aurora_end.ogg') //VOREStation Edit ..() - + /datum/event/aurora_caelus/overmap/announce() return diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index d4fb6faa97..7f991b44fc 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -26,7 +26,7 @@ if(activeFor % 5 != 0) return // Only process every 10 seconds. if(count_spawned_carps() < carp_cap) - spawn_fish(rand(1, severity * 2) - 1, severity, severity * 2) + spawn_fish(rand(3, 3 + severity * 2) - 1, 1, severity + 2) /datum/event/carp_migration/proc/spawn_fish(var/num_groups, var/group_size_min, var/group_size_max, var/dir) if(isnull(dir)) diff --git a/code/modules/events/drone_pod_vr.dm b/code/modules/events/drone_pod_vr.dm index 54ddd7bdba..c93911e777 100644 --- a/code/modules/events/drone_pod_vr.dm +++ b/code/modules/events/drone_pod_vr.dm @@ -22,7 +22,7 @@ qdel(target_spot) /datum/event/drone_pod_drop/announce() - command_announcement.Announce("An unidentified drone pod has been detected landing near the surface facilty. Open and examine at your own risk.", "NanoTrasen Orbital Monitoring") + command_announcement.Announce("An unidentified drone pod has been detected on a collision course towards the [location_name()]. Open and examine at your own risk.", "[location_name()] Sensor Network") /datum/event/drone_pod_drop/start() if(!land_target) diff --git a/code/modules/events/event_container_vr.dm b/code/modules/events/event_container_vr.dm index e82fa420d4..6c82590344 100644 --- a/code/modules/events/event_container_vr.dm +++ b/code/modules/events/event_container_vr.dm @@ -31,7 +31,7 @@ new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Nothing", /datum/event/nothing, 400), // Bluescreens APCs, but they still work new /datum/event_meta(EVENT_LEVEL_MUNDANE, "APC Damage", /datum/event/apc_damage, 20, list(ASSIGNMENT_ENGINEER = 20)), - new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Brand Intelligence",/datum/event/brand_intelligence,20, list(ASSIGNMENT_JANITOR = 25), 1), + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Brand Intelligence",/datum/event/brand_intelligence, 0, list(ASSIGNMENT_ENGINEER = 10), 1), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Camera Damage", /datum/event/camera_damage, 20, list(ASSIGNMENT_ENGINEER = 20)), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Canister Leak", /datum/event/canister_leak, 10, list(ASSIGNMENT_ENGINEER = 20)), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Space Dust", /datum/event/dust, 0, list(ASSIGNMENT_ENGINEER = 20), 0, 0, 50), @@ -39,15 +39,15 @@ new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lost Carp", /datum/event/carp_migration, 0, list(ASSIGNMENT_SECURITY = 10), 1), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Money Hacker", /datum/event/money_hacker, 0, list(ASSIGNMENT_ANY = 4), 1, 10, 25), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Money Lotto", /datum/event/money_lotto, 0, list(ASSIGNMENT_ANY = 1), 1, 5, 15), - //new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Mundane News", /datum/event/mundane_news, 300), + //new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Mundane News", /datum/event/mundane_news, 300), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "PDA Spam", /datum/event/pda_spam, 0, list(ASSIGNMENT_ANY = 4), 1, 25, 50), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Shipping Error", /datum/event/shipping_error , 30, list(ASSIGNMENT_ANY = 2), 0), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Trivial News", /datum/event/trivial_news, 400), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Lore News", /datum/event/lore_news, 400), // Spawns mice, lizards, or dud spiderlings - new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 100, list(ASSIGNMENT_JANITOR = 100), 1), + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Vermin Infestation",/datum/event/infestation, 50, list(ASSIGNMENT_JANITOR = 25), 1), // Rot only weakens walls, not destroy them - new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30, ASSIGNMENT_GARDENER = 50), 1), + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30), 1), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Aurora Caelus", /datum/event/aurora_caelus, 2, list(), 1), ) add_disabled_events(list( @@ -64,11 +64,11 @@ // Just disables comms for a short while. new /datum/event_meta(EVENT_LEVEL_MODERATE, "Communication Blackout", /datum/event/communications_blackout, 500, list(ASSIGNMENT_AI = 150, ASSIGNMENT_SECURITY = 120), 1), // Just blows out a few lights - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Electrical Storm", /datum/event/electrical_storm, 250, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_JANITOR = 150), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Electrical Storm", /datum/event/electrical_storm, 70, list(ASSIGNMENT_ENGINEER = 20, ASSIGNMENT_JANITOR = 150), 1), // This one is just too fun. new /datum/event_meta(EVENT_LEVEL_MODERATE, "Gravity Failure", /datum/event/gravity, 75, list(ASSIGNMENT_ENGINEER = 60), 1), // Temporary power failure, but mitigatead by subgrids - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grid Check", /datum/event/grid_check, 0, list(ASSIGNMENT_SCIENTIST = 10, ASSIGNMENT_ENGINEER = 25), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grid Check", /datum/event/grid_check, 0, list(ASSIGNMENT_ENGINEER = 25), 1), // Pure RP fun, no mechanical effects. new /datum/event_meta(EVENT_LEVEL_MODERATE, "Ion Storm", /datum/event/ionstorm, 0, list(ASSIGNMENT_AI = 80, ASSIGNMENT_CYBORG = 50, ASSIGNMENT_ENGINEER = 15, ASSIGNMENT_SCIENTIST = 5)), // Opens doors in brig. So just RP fun @@ -77,14 +77,15 @@ new /datum/event_meta(EVENT_LEVEL_MODERATE, "Rogue Drones", /datum/event/rogue_drone, 0, list(ASSIGNMENT_SECURITY = 20), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Solar Storm", /datum/event/solar_storm, 30, list(ASSIGNMENT_ENGINEER = 40, ASSIGNMENT_SECURITY = 30), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Space Dust", /datum/event/dust, 0, list(ASSIGNMENT_ENGINEER = 20), 1, 0, 50), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Virology Breach", /datum/event/prison_break/virology, 0, list(ASSIGNMENT_MEDICAL = 100), 1), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Xenobiology Breach", /datum/event/prison_break/xenobiology, 0, list(ASSIGNMENT_SCIENCE = 100), 1), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation", /datum/event/spider_infestation, 30, list(ASSIGNMENT_SECURITY = 30), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Virology Breach", /datum/event/prison_break/virology, 0, list(ASSIGNMENT_ENGINEER = 30), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Xenobiology Breach", /datum/event/prison_break/xenobiology, 0, list(ASSIGNMENT_ENGINEER = 30), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Spider Infestation", /datum/event/spider_infestation, 0, list(ASSIGNMENT_SECURITY = 30), 1), //Evil grubs that drain station power slightly new /datum/event_meta(EVENT_LEVEL_MODERATE, "Grub Infestation", /datum/event/grub_infestation, 0, list(ASSIGNMENT_SECURITY = 10, ASSIGNMENT_ENGINEER = 30), 1), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Drone Pod Drop", /datum/event/drone_pod_drop, 10, list(ASSIGNMENT_SCIENTIST = 40), 1), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/morph_spawn, 75, list(ASSIGNMENT_SECURITY = 30, ASSIGNMENT_SCIENTIST = 10), 1), - new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator", /datum/event/maintenance_predator, 75, list(ASSIGNMENT_SECURITY = 40), 0) + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/morph_spawn, 75, list(ASSIGNMENT_ANY = 5), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator", /datum/event/maintenance_predator, 100, list(ASSIGNMENT_ANY = 5), 0), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Jellyfish School", /datum/event/jellyfish_migration, 0, list(ASSIGNMENT_ANY = 1, ASSIGNMENT_SECURITY = 15, ASSIGNMENT_MEDICAL = 3), 1), ) add_disabled_events(list( new /datum/event_meta(EVENT_LEVEL_MODERATE, "Appendicitis", /datum/event/spontaneous_appendicitis, 0, list(ASSIGNMENT_MEDICAL = 30), 1), @@ -97,17 +98,18 @@ /datum/event_container/major/New() available_events = list( - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Nothing", /datum/event/nothing, 3600), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Atmos Leak", /datum/event/atmos_leak, 30, list(ASSIGNMENT_ENGINEER = 25), 1), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Strike", /datum/event/meteor_strike, 10, list(ASSIGNMENT_ENGINEER = 15), 1), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Space Vines", /datum/event/spacevine, 20, list(ASSIGNMENT_ENGINEER = 7), 1), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration", /datum/event/carp_migration, 10, list(ASSIGNMENT_SECURITY = 5), 1), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach", /datum/event/prison_break/station,0, list(ASSIGNMENT_ANY = 5), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Nothing", /datum/event/nothing, 3600), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Atmos Leak", /datum/event/atmos_leak, 20, list(ASSIGNMENT_ENGINEER = 25), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Space Vines", /datum/event/spacevine, 10, list(ASSIGNMENT_ENGINEER = 7, ASSIGNMENT_GARDENER = 2), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Carp Migration", /datum/event/carp_migration, 10, list(ASSIGNMENT_SECURITY = 5), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Containment Breach", /datum/event/prison_break/station, 0, list(ASSIGNMENT_ANY = 5), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Jellyfish Migration", /datum/event/jellyfish_migration, 5, list(ASSIGNMENT_ANY = 1, ASSIGNMENT_SECURITY = 5, ASSIGNMENT_MEDICAL = 3), 1), ) add_disabled_events(list( - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob", /datum/event/blob, 10, list(ASSIGNMENT_ENGINEER = 60), 1), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Wave", /datum/event/meteor_wave, 30, list(ASSIGNMENT_ENGINEER = 15), 1), - new /datum/event_meta(EVENT_LEVEL_MAJOR, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Strike", /datum/event/meteor_strike, 10, list(ASSIGNMENT_ENGINEER = 15), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Blob", /datum/event/blob, 10, list(ASSIGNMENT_ENGINEER = 60), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Meteor Wave", /datum/event/meteor_wave, 30, list(ASSIGNMENT_ENGINEER = 15), 1), + new /datum/event_meta(EVENT_LEVEL_MAJOR, "Supply Demand", /datum/event/supply_demand, 0, list(ASSIGNMENT_ANY = 5, ASSIGNMENT_SCIENCE = 15, ASSIGNMENT_GARDENER = 10, ASSIGNMENT_ENGINEER = 10, ASSIGNMENT_MEDICAL = 15), 1), )) #undef ASSIGNMENT_ANY diff --git a/code/modules/events/ian_storm_vr.dm b/code/modules/events/ian_storm_vr.dm index 8e654cff43..dc9aee617d 100644 --- a/code/modules/events/ian_storm_vr.dm +++ b/code/modules/events/ian_storm_vr.dm @@ -4,7 +4,7 @@ endWhen = 3 /datum/event/ianstorm/announce() - command_announcement.Announce("It has come to our attention that the station passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert", 'sound/AI/ian_storm.ogg') + command_announcement.Announce("It has come to our attention that the [using_map.facility_type] passed through an ion storm. Please monitor all electronic equipment for malfunctions.", "Anomaly Alert", 'sound/AI/ian_storm.ogg') spawn(7 SECONDS) command_announcement.Announce("Wait. No, thats wrong. The station passed through an IAN storm!.", "Ian Alert") diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 985518067b..d0d221d5fd 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -1,120 +1,78 @@ -#define LOC_KITCHEN 0 -#define LOC_ATMOS 1 -#define LOC_CHAPEL 2 -#define LOC_LIBRARY 3 -#define LOC_HYDRO 4 -#define LOC_CONSTR 5 -#define LOC_TECH 6 -#define LOC_GARDEN 7 -#define LOC_STEMNGR 8 -#define LOC_RESEARCH 9 - #define VERM_MICE 0 #define VERM_LIZARDS 1 -#define VERM_SPIDERS 2 /datum/event/infestation announceWhen = 10 endWhen = 11 - var/location var/locstring var/vermin var/vermstring + var/list/spawned_vermin = list() + var/spawn_types + var/num_groups + var/prep_size_min + var/prep_size_max + var/vermin_cap = 40 + var/list/spawn_locations = list() /datum/event/infestation/start() - - location = rand(0,9) - var/list/turf/simulated/floor/turfs = list() - var/spawn_area_type - switch(location) - if(LOC_KITCHEN) - spawn_area_type = /area/crew_quarters/kitchen - locstring = "the kitchen" - if(LOC_ATMOS) - spawn_area_type = /area/engineering/atmos - locstring = "atmospherics" - if(LOC_CHAPEL) - spawn_area_type = /area/chapel/main - locstring = "the chapel" - if(LOC_LIBRARY) - spawn_area_type = /area/library - locstring = "the library" - if(LOC_HYDRO) - spawn_area_type = /area/hydroponics - locstring = "hydroponics" - if(LOC_CONSTR) - spawn_area_type = /area/construction - locstring = "the construction area" - if(LOC_TECH) - spawn_area_type = /area/storage/tech - locstring = "technical storage" - if(LOC_GARDEN) - spawn_area_type = /area/hydroponics/garden - locstring = "the public garden" - if(LOC_STEMNGR) - spawn_area_type = /area/crew_quarters/captain - locstring = "the site manager's office" - if(LOC_RESEARCH) - spawn_area_type = /area/rnd/research - locstring = "the research division" - - for(var/areapath in typesof(spawn_area_type)) - var/area/A = locate(areapath) - for(var/turf/simulated/floor/F in A.contents) - //VOREStation Edit - Fixes event - var/blocked = FALSE - for(var/atom/movable/AM in F) - if(AM.density) - blocked = TRUE - if(!blocked) - turfs += F - //VOREStation Edit - Fixes event - - var/list/spawn_types = list() - var/max_number - vermin = rand(0,2) + vermin = rand(0,1) switch(vermin) if(VERM_MICE) - spawn_types = list(/mob/living/simple_mob/animal/passive/mouse/gray, /mob/living/simple_mob/animal/passive/mouse/brown, /mob/living/simple_mob/animal/passive/mouse/white) - max_number = 12 + spawn_types = /mob/living/simple_mob/animal/passive/mouse/gray + prep_size_min = 1 + prep_size_max = 4 vermstring = "mice" if(VERM_LIZARDS) - spawn_types = list(/mob/living/simple_mob/animal/passive/lizard) - max_number = 6 + spawn_types = /mob/living/simple_mob/animal/passive/lizard + prep_size_min = 1 + prep_size_max = 3 vermstring = "lizards" - if(VERM_SPIDERS) - spawn_types = list(/obj/effect/spider/spiderling) - max_number = 3 - vermstring = "spiders" + // Check if any landmarks exist! + for(var/obj/effect/landmark/C in landmarks_list) + if(C.name == "verminstart") + spawn_locations.Add(C.loc) - spawn(0) - var/num = rand(2,max_number) - while(turfs.len > 0 && num > 0) - var/turf/simulated/floor/T = pick(turfs) - turfs.Remove(T) - num-- - if(vermin == VERM_SPIDERS) - var/obj/effect/spider/spiderling/S = new(T) - S.amount_grown = -1 - else - var/spawn_type = pick(spawn_types) - new spawn_type(T) +/datum/event/infestation/tick() + if(activeFor % 5 != 0) + return // Only process every 10 seconds. + if(count_spawned_vermin() < vermin_cap) + spawn_vermin(rand(4,10), prep_size_min, prep_size_max) + +/datum/event/infestation/proc/spawn_vermin(var/num_groups, var/group_size_min, var/group_size_max) + if(spawn_locations.len) // Okay we've got landmarks, lets use those! + shuffle_inplace(spawn_locations) + num_groups = min(num_groups, spawn_locations.len) + for (var/i = 1, i <= num_groups, i++) + var/group_size = rand(group_size_min, group_size_max) + for (var/j = 0, j < group_size, j++) + spawn_one_vermin(spawn_locations[i]) + return + +// Spawn a single vermin at given location. +/datum/event/infestation/proc/spawn_one_vermin(var/loc) + var/mob/living/simple_mob/animal/M = new spawn_types(loc) + GLOB.destroyed_event.register(M, src, .proc/on_vermin_destruction) + spawned_vermin.Add(M) + return M + +// Counts living vermin spawned by this event. +/datum/event/infestation/proc/count_spawned_vermin() + . = 0 + for(var/mob/living/simple_mob/animal/M as anything in spawned_vermin) + if(!QDELETED(M) && M.stat != DEAD) + . += 1 + +// If vermin is kill, remove it from the list. +/datum/event/infestation/proc/on_vermin_destruction(var/mob/M) + spawned_vermin -= M + GLOB.destroyed_event.unregister(M, src, .proc/on_vermin_destruction) + /datum/event/infestation/announce() - command_announcement.Announce("Bioscans indicate that [vermstring] have been breeding in [locstring]. Clear them out, before this starts to affect productivity.", "Vermin infestation") - -#undef LOC_KITCHEN -#undef LOC_ATMOS -#undef LOC_CHAPEL -#undef LOC_LIBRARY -#undef LOC_HYDRO -#undef LOC_TECH -#undef LOC_GARDEN -#undef LOC_STEMNGR -#undef LOC_RESEARCH + command_announcement.Announce("Bioscans indicate that [vermstring] have been breeding all over the facility. Clear them out, before this starts to affect productivity.", "Vermin infestation") #undef VERM_MICE -#undef VERM_LIZARDS -#undef VERM_SPIDERS +#undef VERM_LIZARDS \ No newline at end of file diff --git a/code/modules/events/jellyfish_migration.dm b/code/modules/events/jellyfish_migration.dm new file mode 100644 index 0000000000..7498539ae1 --- /dev/null +++ b/code/modules/events/jellyfish_migration.dm @@ -0,0 +1,102 @@ +/datum/event/jellyfish_migration + startWhen = 0 // Start immediately + announceWhen = 45 // Adjusted by setup + endWhen = 75 // Adjusted by setup + var/jellyfish_cap = 20 + var/list/spawned_jellyfish = list() + +/datum/event/jellyfish_migration/setup() + announceWhen = rand(30, 60) // 1 to 2 minutes + endWhen += severity * 25 + jellyfish_cap = 2 + 3 ** severity // No more than this many at once regardless of waves. (5, 11, 29) + +/datum/event/jellyfish_migration/start() + affecting_z -= global.using_map.sealed_levels // Space levels only please! + ..() + +/datum/event/jellyfish_migration/announce() + var/announcement = "" + if(severity == EVENT_LEVEL_MAJOR) + announcement = "Massive migration of unknown biological entities has been detected near [location_name()], please stand-by." + else + announcement = "Unknown biological [spawned_jellyfish.len == 1 ? "entity has" : "entities have"] been detected near [location_name()], please stand-by." + command_announcement.Announce(announcement, "Lifesign Alert") + +/datum/event/jellyfish_migration/tick() + if(activeFor % 5 != 0) + return // Only process every 10 seconds. + if(count_spawned_jellyfish() < jellyfish_cap) + spawn_fish(rand(3, 3 + severity * 2) - 1, 1, severity + 2) + +/datum/event/jellyfish_migration/proc/spawn_fish(var/num_groups, var/group_size_min, var/group_size_max, var/dir) + if(isnull(dir)) + dir = (victim && prob(80)) ? victim.fore_dir : pick(GLOB.cardinal) + + // Check if any landmarks exist! These will use the carp spawn since they already would spawn in these similar spots. + var/list/spawn_locations = list() + for(var/obj/effect/landmark/C in landmarks_list) + if(C.name == "carpspawn" && (C.z in affecting_z)) + spawn_locations.Add(C.loc) + if(spawn_locations.len) // Okay we've got landmarks, lets use those! + shuffle_inplace(spawn_locations) + num_groups = min(num_groups, spawn_locations.len) + for (var/i = 1, i <= num_groups, i++) + var/group_size = rand(group_size_min, group_size_max) + for (var/j = 0, j < group_size, j++) + spawn_one_jellyfish(spawn_locations[i]) + return + + // Okay we did *not* have any landmarks, so lets do our best! + var/i = 1 + while (i <= num_groups) + var/Z = pick(affecting_z) + var/group_size = rand(group_size_min, group_size_max) + var/turf/map_center = locate(round(world.maxx/2), round(world.maxy/2), Z) + var/turf/group_center = pick_random_edge_turf(dir, Z, TRANSITIONEDGE + 2) + var/list/turfs = getcircle(group_center, 2) + for (var/j = 0, j < group_size, j++) + var/mob/living/simple_mob/animal/M = spawn_one_jellyfish(turfs[(i % turfs.len) + 1]) + // Ray trace towards middle of the map to find where they can stop just outside of structure/ship. + var/turf/target + for(var/turf/T in getline(get_turf(M), map_center)) + if(!T.is_space()) + break; + target = T + if(target) + M.ai_holder?.give_destination(target) // Ask jellyfish to swim towards the middle of the map + i++ + +// Spawn a single jellyfish at given location. +/datum/event/jellyfish_migration/proc/spawn_one_jellyfish(var/loc) + var/mob/living/simple_mob/animal/M = new /mob/living/simple_mob/vore/alienanimals/space_jellyfish(loc) + GLOB.destroyed_event.register(M, src, .proc/on_jellyfish_destruction) + spawned_jellyfish.Add(M) + return M + +// Counts living jellyfish spawned by this event. +/datum/event/jellyfish_migration/proc/count_spawned_jellyfish() + . = 0 + for(var/mob/living/simple_mob/animal/M as anything in spawned_jellyfish) + if(!QDELETED(M) && M.stat != DEAD) + . += 1 + +// If jellyfish is bomphed, remove it from the list. +/datum/event/jellyfish_migration/proc/on_jellyfish_destruction(var/mob/M) + spawned_jellyfish -= M + GLOB.destroyed_event.unregister(M, src, .proc/on_jellyfish_destruction) + +/datum/event/jellyfish_migration/end() + . = ..() + // Clean up jellyfish that died in space for some reason. + spawn(0) + for(var/mob/living/simple_mob/SM in spawned_jellyfish) + if(SM.stat == DEAD) + var/turf/T = get_turf(SM) + if(istype(T, /turf/space)) + if(prob(75)) + qdel(SM) + CHECK_TICK + +// Overmap version +/datum/event/jellyfish_migration/overmap/announce() + return diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index f2675a0ede..2575873aae 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -37,7 +37,7 @@ /datum/event/prison_break/announce() if(areas && areas.len > 0) - command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name()] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Station AI involvement is recommended.", "[eventDept] Alert") + command_announcement.Announce("[pick("Gr3y.T1d3 virus","Malignant trojan")] detected in [station_name()] [(eventDept == "Security")? "imprisonment":"containment"] subroutines. Secure any compromised areas immediately. Involvement of [using_map.facility_type] AI is recommended.", "[eventDept] Alert") /datum/event/prison_break/start() diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 13f853dd3c..a8668e561a 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -16,7 +16,7 @@ /datum/event/radiation_storm/tick() if(activeFor == enterBelt) - command_announcement.Announce("The station has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert") + command_announcement.Announce("The [using_map.facility_type] has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert") radiate() if(activeFor >= enterBelt && activeFor <= leaveBelt) @@ -27,7 +27,7 @@ radiate() else if(activeFor == leaveBelt) - command_announcement.Announce("The station has passed the radiation belt. Please allow for up to one minute while radiation levels dissipate, and report to medbay if you experience any unusual symptoms. Maintenance will lose all access again shortly.", "Anomaly Alert") + command_announcement.Announce("The [using_map.facility_type] has passed the radiation belt. Please allow for up to one minute while radiation levels dissipate, and report to medbay if you experience any unusual symptoms. Maintenance will lose all access again shortly.", "Anomaly Alert") /datum/event/radiation_storm/proc/radiate() var/radiation_level = rand(15, 35) for(var/z in using_map.station_levels) diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index f6ac58b1e4..b7e9f37552 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -35,7 +35,7 @@ if(4) msg = "A passing derelict ship's drone defense systems have just activated. If any are sighted in the area, use caution." if(5) - msg = "We're detecting a swarm of small objects approaching your station. Most likely a bunch of drones. Please exercise caution if you see any." + msg = "We're detecting a swarm of small objects approaching your [using_map.facility_type]. Most likely a bunch of drones. Please exercise caution if you see any." //VOREStation Edit End command_announcement.Announce(msg, "Rogue drone alert") diff --git a/code/modules/events/solar_storm.dm b/code/modules/events/solar_storm.dm index a8d4b92a3c..33c2c477ed 100644 --- a/code/modules/events/solar_storm.dm +++ b/code/modules/events/solar_storm.dm @@ -9,7 +9,7 @@ endWhen = startWhen + rand(30,90) + rand(30,90) //2-6 minute duration /datum/event/solar_storm/announce() - command_announcement.Announce("A solar storm has been detected approaching \the [station_name()]. Please halt all EVA activites immediately and return to the interior of the station.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') + command_announcement.Announce("A solar storm has been detected approaching \the [station_name()]. Please halt all EVA activites immediately and return to the interior of the [using_map.facility_type].", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg') adjust_solar_output(1.5) /datum/event/solar_storm/proc/adjust_solar_output(var/mult = 1) @@ -18,7 +18,7 @@ /datum/event/solar_storm/start() - command_announcement.Announce("The solar storm has reached the station. Please refrain from EVA and remain inside the station until it has passed.", "Anomaly Alert") + command_announcement.Announce("The solar storm has reached the [using_map.facility_type]. Please refrain from EVA and remain inside the station until it has passed.", "Anomaly Alert") adjust_solar_output(5) @@ -40,7 +40,7 @@ L.rad_act(rand(15, 30)) /datum/event/solar_storm/end() - command_announcement.Announce("The solar storm has passed the station. It is now safe to resume EVA activities. Please report to medbay if you experience any unusual symptoms. ", "Anomaly Alert") + command_announcement.Announce("The solar storm has passed the [using_map.facility_type]. It is now safe to resume EVA activities. Please report to medbay if you experience any unusual symptoms. ", "Anomaly Alert") adjust_solar_output() diff --git a/code/modules/events/supply_demand_vr.dm b/code/modules/events/supply_demand_vr.dm index 6e229e1b48..f61d4744c4 100644 --- a/code/modules/events/supply_demand_vr.dm +++ b/code/modules/events/supply_demand_vr.dm @@ -63,7 +63,7 @@ send_console_message(message, dpt); // Also announce over main comms so people know to look - command_announcement.Announce("An order for the station to deliver supplies to [command_name()] has been delivered to all supply Request Consoles", my_department) + command_announcement.Announce("An order for the [using_map.facility_type] to deliver supplies to [command_name()] has been delivered to all supply Request Consoles", my_department) /datum/event/supply_demand/tick() if(required_items.len == 0) diff --git a/code/modules/events/wallrot.dm b/code/modules/events/wallrot.dm index e09cc50d2f..6c87fb8572 100644 --- a/code/modules/events/wallrot.dm +++ b/code/modules/events/wallrot.dm @@ -7,15 +7,18 @@ // 100 attempts for(var/i=0, i<100, i++) - var/turf/candidate = locate(rand(1, world.maxx), rand(1, world.maxy), 1) + var/z_level = pick(using_map.station_levels) + var/turf/candidate = locate(rand(1, world.maxx), rand(1, world.maxy), z_level) if(istype(candidate, /turf/simulated/wall)) center = candidate - return 1 + var/area/A = get_area(candidate) + if(!A.forbid_events) + return 1 return 0 /datum/event/wallrot/announce() if(center) - command_announcement.Announce("Harmful fungi detected on \the [station_name()] nearby [center.loc.name]. Station structures may be contaminated.", "Biohazard Alert") + command_announcement.Announce("Harmful fungi detected on \the [station_name()] and [using_map.facility_type] structures nearby [center.loc.name] may be contaminated.", "Biohazard Alert") /datum/event/wallrot/start() spawn() diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index a9581341c5..3ff2cf6b7b 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -6,4 +6,4 @@ wormhole_event() /datum/event/wormholes/end() - command_announcement.Announce("There are no more space-time anomalies detected on the station.", "Anomaly Alert") + command_announcement.Announce("There are no more space-time anomalies detected on the [using_map.facility_type].", "Anomaly Alert") diff --git a/code/modules/examine/descriptions/engineering.dm b/code/modules/examine/descriptions/engineering.dm index 52d24ff577..04c20a8bdb 100644 --- a/code/modules/examine/descriptions/engineering.dm +++ b/code/modules/examine/descriptions/engineering.dm @@ -46,6 +46,8 @@ return results /obj/machinery/door/airlock/get_description_interaction() + description_info = "To ring an airlock's doorbell, hold Alt and click on the airlock with the Left Mouse Button on Green/Help intent. Doing the same on Harm intent will instead hammer on the airlock." //vorestation edit + var/list/results = list() if(can_remove_electronics()) diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index f03580dde0..49b1cc4bf2 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -7,7 +7,7 @@ var/list/dreams = list( "a blue light","an abandoned laboratory","NanoTrasen","mercenaries","blood","healing","power","respect", "riches","space","a crash","happiness","pride","a fall","water","flames","ice","melons","flying","the eggs","money", "the Head of Personnel","the Head of Security","the Chief Engineer","the Research Director","the Chief Medical Officer", - "the Detective","the Warden","an Internal Affairs Agent","a Station Engineer","the Janitor","the Atmospheric Technician", + "the Detective","the Warden","an Internal Affairs Agent","an Engineer","the Janitor","the Atmospheric Technician", "the Quartermaster","a Cargo Technician","the Botanist","a Shaft Miner","the Psychologist","the Chemist","a Geneticist", "the Virologist","the Roboticist","the Chef","the Bartender","the Chaplain","the Librarian","a mouse","an ERT member", "a beach","the holodeck","a smoky room","a voice","the cold","a mouse","an operating table","the bar","the rain","a Skrell", diff --git a/code/modules/food/food/condiment.dm b/code/modules/food/food/condiment.dm index abf4f89b37..5b137957db 100644 --- a/code/modules/food/food/condiment.dm +++ b/code/modules/food/food/condiment.dm @@ -101,9 +101,9 @@ desc = "Often used to flavor food or make people sneeze." icon_state = "peppermillsmall" center_of_mass = list("x"=17, "y"=11) - if("cornoil") - name = "Corn Oil" - desc = "A delicious oil used in cooking. Made from corn." + if("cookingoil") + name = "Cooking Oil" + desc = "A delicious oil used in cooking. General purpose." icon_state = "oliveoil" center_of_mass = list("x"=16, "y"=6) if("sugar") @@ -175,6 +175,13 @@ . = ..() reagents.add_reagent("capsaicin", 50) +/obj/item/weapon/reagent_containers/food/condiment/cookingoil + name = "Cooking Oil" + +/obj/item/weapon/reagent_containers/food/condiment/cookingoil/Initialize() + . = ..() + reagents.add_reagent("cookingoil", 50) + /obj/item/weapon/reagent_containers/food/condiment/cornoil name = "Corn Oil" diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index 8e87f8d71d..a5cf92e706 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -7,6 +7,7 @@ center_of_mass = list("x"=16, "y"=16) w_class = ITEMSIZE_SMALL force = 0 + volume = 80 var/bitesize = 1 var/bitecount = 0 @@ -861,18 +862,18 @@ /obj/item/weapon/reagent_containers/food/snacks/carpmeat/Initialize() . = ..() - reagents.add_reagent("protein", 3) - reagents.add_reagent(toxin_type, toxin_amount) + reagents.add_reagent("seafood", 3) + if(toxin_type && toxin_amount) + reagents.add_reagent(toxin_type, toxin_amount) -/obj/item/weapon/reagent_containers/food/snacks/crabmeat - name = "crab legs" - desc = "... Coffee? Is that you?" - icon_state = "crabmeat" - bitesize = 1 +/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish + desc = "A fillet of fish meat." + toxin_type = null -/obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize() - . = ..() - reagents.add_reagent("seafood", 2) +/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif + desc = "A fillet of sivian fish meat." + filling_color = "#2c2cff" + color = "#2c2cff" /obj/item/weapon/reagent_containers/food/snacks/crab_legs name = "steamed crab legs" @@ -888,21 +889,6 @@ reagents.add_reagent("seafood", 6) reagents.add_reagent("sodiumchloride", 1) -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif - desc = "A fillet of sivian fish meat." - filling_color = "#2c2cff" - color = "#2c2cff" - toxin_type = "neurotoxic_protein" - toxin_amount = 2 - -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish - toxin_type = "murk_protein" - -/obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish - desc = "A fillet of fish meat." - toxin_type = "neurotoxic_protein" - toxin_amount = 1 - /obj/item/weapon/reagent_containers/food/snacks/fishfingers name = "Fish Fingers" desc = "A finger of fish." @@ -913,7 +899,7 @@ /obj/item/weapon/reagent_containers/food/snacks/fishfingers/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("seafood", 4) /obj/item/weapon/reagent_containers/food/snacks/zestfish name = "Zesty Fish" @@ -925,11 +911,11 @@ /obj/item/weapon/reagent_containers/food/snacks/zestfish/Initialize() . = ..() - reagents.add_reagent("protein", 4) + reagents.add_reagent("seafood", 4) -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice - name = "huge mushroom slice" - desc = "A slice from a huge mushroom." +/obj/item/weapon/reagent_containers/food/snacks/mushroomslice + name = "mushroom slice" + desc = "A slice of mushroom." icon_state = "hugemushroomslice" filling_color = "#E0D7C5" center_of_mass = list("x"=17, "y"=16) @@ -937,7 +923,7 @@ nutriment_desc = list("raw" = 2, "mushroom" = 2) bitesize = 6 -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/Initialize() +/obj/item/weapon/reagent_containers/food/snacks/mushroomslice/Initialize() . = ..() reagents.add_reagent("psilocybin", 3) @@ -3361,7 +3347,7 @@ . = ..() reagents.add_reagent("blackpepper", 1) reagents.add_reagent("sodiumchloride", 1) - reagents.add_reagent("cornoil", 1) + reagents.add_reagent("cookingoil", 1) /obj/item/weapon/reagent_containers/food/snacks/turkeyslice name = "turkey drumstick" @@ -3960,7 +3946,8 @@ /obj/item/weapon/reagent_containers/food/snacks/rawcutlet/Initialize() . = ..() - reagents.add_reagent("protein", 1) + reagents.add_reagent("fishbait", 9) + reagents.add_reagent("protein", 3) /obj/item/weapon/reagent_containers/food/snacks/cutlet name = "cutlet" @@ -3972,7 +3959,8 @@ /obj/item/weapon/reagent_containers/food/snacks/cutlet/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("fishbait", 15) + reagents.add_reagent("protein", 5) /obj/item/weapon/reagent_containers/food/snacks/rawmeatball name = "raw meatball" @@ -3984,7 +3972,8 @@ /obj/item/weapon/reagent_containers/food/snacks/rawmeatball/Initialize() . = ..() - reagents.add_reagent("protein", 2) + reagents.add_reagent("fishbait", 30) + reagents.add_reagent("protein", 10) /obj/item/weapon/reagent_containers/food/snacks/hotdog name = "hotdog" @@ -4959,7 +4948,7 @@ reagents.add_reagent("protein",5) /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring - name = "pineapple ring" + name = "pineapple rings" desc = "So retro." icon_state = "pineapple_ring" nutriment_desc = list("sweetness" = 2) diff --git a/code/modules/food/food/snacks/meat.dm b/code/modules/food/food/snacks/meat.dm index c95ddd3d1d..e7c010bc7e 100644 --- a/code/modules/food/food/snacks/meat.dm +++ b/code/modules/food/food/snacks/meat.dm @@ -44,16 +44,147 @@ //same as plain meat /obj/item/weapon/reagent_containers/food/snacks/meat/corgi - name = "Corgi meat" + name = "dogmeat" desc = "Tastes like... well, you know." /obj/item/weapon/reagent_containers/food/snacks/meat/chicken - name = "chicken" + name = "poultry" icon_state = "chickenbreast" cooked_icon = "chickensteak" filling_color = "#BBBBAA" /obj/item/weapon/reagent_containers/food/snacks/meat/chicken/Initialize() - . = ..() - reagents.remove_reagent("triglyceride", INFINITY) - //Chicken is low fat. Less total calories than other meats \ No newline at end of file + . = ..() + reagents.remove_reagent("triglyceride", INFINITY) + //Chicken is low fat. Less total calories than other meats + +/obj/item/weapon/reagent_containers/food/snacks/crabmeat + name = "crustacean legs" + desc = "... Coffee? Is that you?" + icon_state = "crabmeat" + bitesize = 1 + +/obj/item/weapon/reagent_containers/food/snacks/crabmeat/Initialize() + . = ..() + reagents.add_reagent("seafood", 2) + +/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice + name = "fungus slice" + desc = "A slice from a huge mushroom." + icon_state = "hugemushroomslice" + filling_color = "#E0D7C5" + center_of_mass = list("x"=17, "y"=16) + nutriment_amt = 3 + nutriment_desc = list("raw" = 2, "mushroom" = 2) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/Initialize() + . = ..() + reagents.add_reagent("psilocybin", 3) + +/obj/item/weapon/reagent_containers/food/snacks/tomatomeat + name = "tomato slice" + desc = "A slice from a huge tomato" + icon_state = "tomatomeat" + filling_color = "#DB0000" + center_of_mass = list("x"=17, "y"=16) + nutriment_amt = 3 + nutriment_desc = list("raw" = 2, "tomato" = 3) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/bearmeat + name = "bearmeat" + desc = "A very manly slab of meat." + icon_state = "bearmeat" + filling_color = "#DB0000" + center_of_mass = list("x"=16, "y"=10) + bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/bearmeat/Initialize() + . = ..() + reagents.add_reagent("protein", 12) + reagents.add_reagent("hyperzine", 5) + +/obj/item/weapon/reagent_containers/food/snacks/xenomeat + name = "xenomeat" + desc = "A slab of green meat. Smells like acid." + icon_state = "xenomeat" + filling_color = "#43DE18" + center_of_mass = list("x"=16, "y"=10) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/xenomeat/Initialize() + . = ..() + reagents.add_reagent("protein", 6) + reagents.add_reagent("pacid",6) + +/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat // Substitute for recipes requiring xeno meat. + name = "insect meat" + desc = "A slab of green meat." + icon_state = "xenomeat" + filling_color = "#43DE18" + center_of_mass = list("x"=16, "y"=10) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat/Initialize() + . = ..() + reagents.add_reagent("spidertoxin",6) + reagents.remove_reagent("pacid",6) + +/obj/item/weapon/reagent_containers/food/snacks/meat/fox + name = "foxmeat" + desc = "The fox doesn't say a goddamn thing, now." + +/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat + name = "grubmeat" + desc = "A slab of grub meat, it gives a gentle shock if you touch it" + icon = 'icons/obj/food.dmi' + icon_state = "grubmeat" + center_of_mass = list("x"=16, "y"=10) + +/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat/Initialize() + . = ..() + reagents.add_reagent("protein", 1) + reagents.add_reagent("shockchem", 6) + bitesize = 6 + +/obj/item/weapon/reagent_containers/food/snacks/meat/worm + name = "weird meat" + desc = "A chunk of pulsating meat." + icon_state = "wormmeat" + health = 180 + filling_color = "#551A8B" + center_of_mass = list("x"=16, "y"=14) + +/obj/item/weapon/reagent_containers/food/snacks/meat/worm/Initialize() + . = ..() + reagents.add_reagent("protein", 6) + reagents.add_reagent("phoron", 3) + reagents.add_reagent("myelamine", 3) + src.bitesize = 3 + +/obj/item/weapon/reagent_containers/food/snacks/meat/worm/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W,/obj/item/weapon/material/knife)) + var/to_spawn = pickweight(/obj/random/junk = 30, + /obj/random/trash = 30, + /obj/random/maintenance/clean = 15, + /obj/random/tool = 15, + /obj/random/medical = 3, + /obj/random/bomb_supply = 7, + /obj/random/contraband = 3, + /obj/random/unidentified_medicine/old_medicine = 7, + /obj/item/weapon/strangerock = 3, + /obj/item/weapon/ore/phoron = 7, + /obj/random/handgun = 1, + /obj/random/toolbox = 4, + /obj/random/drinkbottle = 5 + ) + + new to_spawn(get_turf(src)) + + if(prob(20)) + user.visible_message("Something oozes out of \the [src] as it is cut.") + + to_chat(user, "You cut the tissue holding the chunks together.") + + ..() diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 132bba78ec..dce6f234cf 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -161,19 +161,6 @@ reagents.add_reagent("protein", 4) bitesize = 2 -/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat - name = "grub meat" - desc = "A slab of grub meat, it gives a gentle shock if you touch it" - icon = 'icons/obj/food.dmi' - icon_state = "grubmeat" - center_of_mass = list("x"=16, "y"=10) - -/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat/Initialize() - . = ..() - reagents.add_reagent("protein", 1) - reagents.add_reagent("shockchem", 6) - bitesize = 6 - /obj/item/weapon/reagent_containers/food/snacks/bugball name = "bugball" desc = "A hard piece of chitin, don't chip a tooth!" @@ -773,3 +760,17 @@ . = ..() reagents.add_reagent("protein", 3) bitesize = 2 + +/obj/item/weapon/reagent_containers/food/snacks/donkpocket/ascended + name = "Donk-pocket EX" + desc = "This donk-pocket has seen things beyond comprehension of mortals. It survived because the fire inside it burned brighter than fire around it." + icon = 'icons/obj/food_vr.dmi' + icon_state = "donkpocket_ascended" + nutriment_amt = 5 + nutriment_desc = list("burning fires of radioactive hell" = 20) + heated_reagents = list("supermatter" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/donkpocket/ascended/Initialize() + . = ..() + reagents.add_reagent("uranium", 3) + reagents.add_reagent("pyrotoxin", 3) \ No newline at end of file diff --git a/code/modules/food/kitchen/cooking_machines/fryer.dm b/code/modules/food/kitchen/cooking_machines/fryer.dm index 6c2e0d9b71..bcaad4e693 100644 --- a/code/modules/food/kitchen/cooking_machines/fryer.dm +++ b/code/modules/food/kitchen/cooking_machines/fryer.dm @@ -13,13 +13,13 @@ appliancetype = FRYER active_power_usage = 12 KILOWATTS heating_power = 12 KILOWATTS - + light_y = 15 - + min_temp = 140 + T0C // Same as above, increasing this to just under 2x to make the % increase on efficiency not quite so painful as it would be at 80. optimal_temp = 400 + T0C // Increasing this to be 2x Oven to allow for a much higher/realistic frying temperatures. Doesn't really do anything but make heating the fryer take a bit longer. optimal_power = 0.95 // .35 higher than the default to give fryers faster cooking speed. - + idle_power_usage = 3.6 KILOWATTS // Power used to maintain temperature once it's heated. // Going with 25% of the active power. This is a somewhat arbitrary value. @@ -33,11 +33,11 @@ var/datum/reagents/oil var/optimal_oil = 9000 //90 litres of cooking oil - + /obj/machinery/appliance/cooker/fryer/Initialize() . = ..() fry_loop = new(list(src), FALSE) - + oil = new/datum/reagents(optimal_oil * 1.25, src) var/variance = rand()*0.15 // Fryer is always a little below full, but its usually negligible @@ -45,18 +45,18 @@ if(prob(20)) // Sometimes the fryer will start with much less than full oil, significantly impacting efficiency until filled variance = rand()*0.5 - oil.add_reagent("cornoil", optimal_oil*(1 - variance)) + oil.add_reagent("cookingoil", optimal_oil*(1 - variance)) /obj/machinery/appliance/cooker/fryer/Destroy() QDEL_NULL(fry_loop) QDEL_NULL(oil) return ..() - + /obj/machinery/appliance/cooker/fryer/examine(var/mob/user) . = ..() if(Adjacent(user)) to_chat(user, "Oil Level: [oil.total_volume]/[optimal_oil]") - + /obj/machinery/appliance/cooker/fryer/update_icon() // We add our own version of the proc to use the special fryer double-lights. cut_overlays() var/image/light @@ -69,7 +69,7 @@ light.pixel_x = light_x light.pixel_y = light_y add_overlay(light) - + /obj/machinery/appliance/cooker/fryer/heat_up() if (..()) //Set temperature of oil reagent @@ -102,7 +102,7 @@ cooking_power *= oil_efficiency - + /obj/machinery/appliance/cooker/fryer/update_icon() if(!stat) ..() @@ -119,7 +119,7 @@ if(fry_loop) fry_loop.stop(src) ..() - + //Fryer gradually infuses any cooked food with oil. Moar calories //This causes a slow drop in oil levels, encouraging refill after extended use /obj/machinery/appliance/cooker/fryer/do_cooking_tick(var/datum/cooking_item/CI) @@ -177,13 +177,13 @@ return // user.visible_message("\The [user] starts pushing \the [victim] into \the [src]!") - + //Removed delay on this action in favour of a cooldown after it //If you can lure someone close to the fryer and grab them then you deserve success. //And a delay on this kind of niche action just ensures it never happens //Cooldown ensures it can't be spammed to instakill someone user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN*3) - + fry_loop.start(src) if(!do_mob(user, victim, 20)) @@ -239,9 +239,9 @@ //Coat the victim in some oil oil.trans_to(victim, 40) - + fry_loop.stop() - + /obj/machinery/appliance/cooker/fryer/attackby(var/obj/item/I, var/mob/user) if(istype(I, /obj/item/weapon/reagent_containers/glass) && I.reagents) if (I.reagents.total_volume <= 0 && oil) diff --git a/code/modules/food/kitchen/smartfridge/engineering.dm b/code/modules/food/kitchen/smartfridge/engineering.dm index 2798854537..035af9aebb 100644 --- a/code/modules/food/kitchen/smartfridge/engineering.dm +++ b/code/modules/food/kitchen/smartfridge/engineering.dm @@ -18,8 +18,10 @@ if(amount < 1) return + count = min(count, amount) + while(count > 0) - var/obj/item/stack/S = I.get_product(get_turf(src), min(count, amount)) + var/obj/item/stack/S = I.get_product(get_turf(src), count) count -= S.get_amount() SStgui.update_uis(src) diff --git a/code/modules/food/kitchen/smartfridge/smartfridge.dm b/code/modules/food/kitchen/smartfridge/smartfridge.dm index 5e0f2e4284..f98da20f8c 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge.dm @@ -112,6 +112,7 @@ user.remove_from_mob(O) stock(O) user.visible_message("[user] has added \the [O] to \the [src].", "You add \the [O] to \the [src].") + sortTim(item_records, /proc/cmp_stored_item_name) else if(istype(O, /obj/item/weapon/storage/bag)) var/obj/item/weapon/storage/bag/P = O diff --git a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm index 1559e81f4f..8863448ca5 100644 --- a/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm +++ b/code/modules/food/kitchen/smartfridge/smartfridge_vr.dm @@ -22,11 +22,34 @@ if(ismob(A.thrower)) var/mob/T = A.thrower thrower_id = T.GetIdCard() - + //98% chance the expert makes it if(expert_job && thrower_id && thrower_id.rank == expert_job && prob(98)) stock(A) - + //20% chance a non-expert makes it else if(prob(20)) stock(A) + +//Chemistry 'chemavator' +/obj/machinery/smartfridge/chemistry/chemvator + name = "\improper Smart Chemavator - Upper" + desc = "A refrigerated storage unit for medicine and chemical storage. Now sporting a fancy system of pulleys to lift bottles up and down." + var/obj/machinery/smartfridge/chemistry/chemvator/attached + +/obj/machinery/smartfridge/chemistry/chemvator/down/Destroy() + attached = null + return ..() + +/obj/machinery/smartfridge/chemistry/chemvator/down + name = "\improper Smart Chemavator - Lower" + +/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize() + . = ..() + var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP)) + if(istype(above)) + above.attached = src + attached = above + item_records = attached.item_records + else + to_chat(world,"[src] at [x],[y],[z] cannot find the unit above it!") diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index c909c29fc5..34f4146159 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -522,13 +522,20 @@ I said no! ) result = /obj/item/weapon/reagent_containers/food/snacks/cutlet -/datum/recipe/roastedsunflowerseeds +/datum/recipe/roastedcornsunflowerseeds reagents = list("sodiumchloride" = 1, "cornoil" = 1) items = list( /obj/item/weapon/reagent_containers/food/snacks/rawsunflower ) result = /obj/item/weapon/reagent_containers/food/snacks/roastedsunflower +/datum/recipe/roastedsunflowerseeds + reagents = list("sodiumchloride" = 1, "cookingoil" = 1) + items = list( + /obj/item/weapon/reagent_containers/food/snacks/rawsunflower + ) + result = /obj/item/weapon/reagent_containers/food/snacks/roastedsunflower + /datum/recipe/roastedpeanutsunflowerseeds reagents = list("sodiumchloride" = 1, "peanutoil" = 1) items = list( @@ -537,10 +544,20 @@ I said no! result = /obj/item/weapon/reagent_containers/food/snacks/roastedsunflower /datum/recipe/roastedpeanuts + fruit = list("peanut" = 2) + reagents = list("sodiumchloride" = 2, "cookingoil" = 1) + result = /obj/item/weapon/reagent_containers/food/snacks/roastedpeanuts + +/datum/recipe/roastedpeanutscorn fruit = list("peanut" = 2) reagents = list("sodiumchloride" = 2, "cornoil" = 1) result = /obj/item/weapon/reagent_containers/food/snacks/roastedpeanuts +/datum/recipe/roastedpeanutspeanut + fruit = list("peanut" = 2) + reagents = list("sodiumchloride" = 2, "peanutoil" = 1) + result = /obj/item/weapon/reagent_containers/food/snacks/roastedpeanuts + /datum/recipe/mint reagents = list("sugar" = 5, "frostoil" = 5) result = /obj/item/weapon/reagent_containers/food/snacks/mint diff --git a/code/modules/gamemaster/event2/events/everyone/infestation.dm b/code/modules/gamemaster/event2/events/everyone/infestation.dm index f51456f362..512679d2fc 100644 --- a/code/modules/gamemaster/event2/events/everyone/infestation.dm +++ b/code/modules/gamemaster/event2/events/everyone/infestation.dm @@ -31,6 +31,7 @@ things_to_spawn = list( /mob/living/simple_mob/animal/passive/mouse/gray, /mob/living/simple_mob/animal/passive/mouse/brown, + /mob/living/simple_mob/animal/passive/mouse/black, /mob/living/simple_mob/animal/passive/mouse/white, /mob/living/simple_mob/animal/passive/mouse/rat ) diff --git a/code/modules/games/cah_black_cards.dm b/code/modules/games/cah_black_cards.dm index 0bc5cc6d0f..c2c32b9948 100644 --- a/code/modules/games/cah_black_cards.dm +++ b/code/modules/games/cah_black_cards.dm @@ -1,4 +1,6 @@ -// Black cards. +/* + * Black CAH cards + */ /obj/item/weapon/deck/cah/black/card_text_list = list( "Why am I itchy?", "Today, Security shot ____.", diff --git a/code/modules/games/cah_white_cards.dm b/code/modules/games/cah_white_cards.dm index 5c8e592b7e..3ab0df883a 100644 --- a/code/modules/games/cah_white_cards.dm +++ b/code/modules/games/cah_white_cards.dm @@ -1,4 +1,6 @@ -// White cards. +/* + * White CAH cards + */ /obj/item/weapon/deck/cah/var/list/card_text_list = list( "Those motherfucking carp", "Having sex in the maintenance tunnels", diff --git a/code/modules/games/cardemon.dm b/code/modules/games/cardemon.dm index a99e656add..0345cf0d18 100644 --- a/code/modules/games/cardemon.dm +++ b/code/modules/games/cardemon.dm @@ -1,3 +1,6 @@ +/* + * Cardmon trading card game + */ /obj/item/weapon/pack/cardemon name = "cardemon booster pack" desc = "Finally! A children's card game in space!" diff --git a/code/modules/games/spaceball_cards.dm b/code/modules/games/spaceball_cards.dm index d9c932908c..48c5407759 100644 --- a/code/modules/games/spaceball_cards.dm +++ b/code/modules/games/spaceball_cards.dm @@ -1,3 +1,6 @@ +/* + * Spaceball collectable cards + */ /obj/item/weapon/pack/spaceball name = "spaceball booster pack" desc = "Officially licensed to take your money." diff --git a/code/modules/games/tarot.dm b/code/modules/games/tarot.dm index 7c49f7ec43..df5fb73b23 100644 --- a/code/modules/games/tarot.dm +++ b/code/modules/games/tarot.dm @@ -1,6 +1,6 @@ -/* this is a playing card deck based off of the Rider-Waite Tarot Deck. -*/ - +/* + * This is a playing card deck based off of the Rider-Waite Tarot Deck. + */ /obj/item/weapon/deck/tarot name = "deck of tarot cards" desc = "For all your occult needs!" diff --git a/code/modules/games/wizoff.dm b/code/modules/games/wizoff.dm new file mode 100644 index 0000000000..11cf179735 --- /dev/null +++ b/code/modules/games/wizoff.dm @@ -0,0 +1,57 @@ +/* It's Wiz-Off, the wizard themed card game! + * Each player draws 5 cards. There are five rounds. Each round, + * a player selects a card to play, and the winner is selected + * based on the following rules: + * -Defensive (D) beats Offensive (O)! + * -Offensive (O) beats Utility (U)! + * -Utility (U) beats Defensive (D)! + * -If both players play the same type of spell, the higher number wins! + * The player who wins the most of the 5 rounds wins the game! + * Now get ready to battle for the fate of the universe: Wiz-Off! + */ + +/obj/item/weapon/deck/wizoff + name = "\improper Wiz-Off deck" + desc = "A Wiz-Off deck. Fight an arcane battle for the fate of the universe: Draw 5! Play 5! Best of 5!" + icon_state = "wizoff" + +/obj/item/weapon/deck/wizoff/New() + ..() + var/datum/playingcard/P + for(var/cardtext in card_wiz_list) + P = new() + P.name = "[cardtext]" + P.card_icon = "[icon_state]_card" + P.back_icon = "[icon_state]_card_back" + cards += P + +/obj/item/weapon/deck/wizoff/var/list/card_wiz_list = list( + "O1: Spell Cards", + "O2: Summon Bees", + "O3: Polymorph", + "O4: Tesla Blast", + "O5: Rod Form", + "O6: Mutate", + "O7: Fireball", + "O8: Mjolnir", + "O9: Smite", + "D1: Smoke", + "D2: Battlemage Armor", + "D3: Repulse", + "D4: Magic Missile", + "D5: Disable Technology", + "D6: Spell Trap", + "D7: Forcewall", + "D8: Arcane Heal", + "D9: Stop Time", + "U1: Shapechange", + "U2: Spacetime Distortion", + "U3: Scrying Orb", + "U4: Blink", + "U5: Knock", + "U6: Teleport", + "U7: Bind Soul", + "U8: Warp Whistle", + "U9: Jaunt" + ) + diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 8a9e0c2dda..309971d5e2 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -64,6 +64,9 @@ "Courtroom" = new/datum/holodeck_program(/area/holodeck/source_courtroom, list('sound/music/traitor.ogg')), "Chessboard" = new/datum/holodeck_program(/area/holodeck/source_chess), "Micro Building Area" = new/datum/holodeck_program(/area/holodeck/source_smoleworld), //VOREStation add + "Gym" = new/datum/holodeck_program(/area/holodeck/source_gym), //VOREStation add + "Game Room" = new/datum/holodeck_program(/area/holodeck/source_game_room), //VOREStation add + "Patient Ward" = new/datum/holodeck_program(/area/holodeck/source_patient_ward), //VOREStation add "Turn Off" = new/datum/holodeck_program(/area/holodeck/source_plating, list()) ) @@ -329,6 +332,12 @@ linkedholodeck.sound_env = A.sound_env + if(prog == powerdown_program) + linkedholodeck.requires_power = TRUE + else + linkedholodeck.requires_power = FALSE + linkedholodeck.power_change() + spawn(30) for(var/obj/effect/landmark/L in linkedholodeck) if(L.name=="Atmospheric Test Start") diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index f1bdc5bb50..bc2bfaffb8 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -88,11 +88,11 @@ descriptors |= "radioactive" if(reagents.has_reagent("amatoxin") || reagents.has_reagent("toxin")) descriptors |= "poisonous" - if(reagents.has_reagent("psilocybin") || reagents.has_reagent("space_drugs")) + if(reagents.has_reagent("psilocybin") || reagents.has_reagent("space_drugs") || reagents.has_reagent("earthsblood")) descriptors |= "hallucinogenic" - if(reagents.has_reagent("bicaridine")) + if(reagents.has_reagent("bicaridine") || reagents.has_reagent("earthsblood")) descriptors |= "medicinal" - if(reagents.has_reagent("gold")) + if(reagents.has_reagent("gold") || reagents.has_reagent("earthsblood")) descriptors |= "shiny" if(reagents.has_reagent("lube")) descriptors |= "slippery" @@ -181,17 +181,21 @@ var/obj/item/weapon/cell/potato/pocell = new /obj/item/weapon/cell/potato(get_turf(user)) if(src.loc == user && istype(user,/mob/living/carbon/human)) user.put_in_hands(pocell) - pocell.maxcharge = src.potency * 10 + pocell.maxcharge = src.potency * 200 pocell.charge = pocell.maxcharge qdel(src) return - else if(W.sharp) + + if(W.sharp) + if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful. user.show_message("You carve a face into [src]!", 1) new /obj/item/clothing/head/pumpkinhead (user.loc) qdel(src) return - else if(seed.chems) + + if(seed.chems) + if(W.sharp && W.edge && !isnull(seed.chems["woodpulp"])) user.show_message("You make planks out of \the [src]!", 1) playsound(src, 'sound/effects/woodcutting.ogg', 50, 1) @@ -209,36 +213,49 @@ to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.get_amount()] planks.") qdel(src) return - else if(!isnull(seed.chems["potato"])) + + if(seed.kitchen_tag == "sunflower") + new /obj/item/weapon/reagent_containers/food/snacks/rawsunflower(get_turf(src)) + to_chat(user, SPAN_NOTICE("You remove the seeds from the flower, slightly damaging them.")) + qdel(src) + return + + if(seed.kitchen_tag == "potato" || !isnull(seed.chems["potato"])) to_chat(user, "You slice \the [src] into sticks.") new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src)) qdel(src) return - else if(!isnull(seed.chems["carrotjuice"])) + + if(!isnull(seed.chems["carrotjuice"])) to_chat(user, "You slice \the [src] into sticks.") new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src)) qdel(src) return - else if(!isnull(seed.chems["pineapplejuice"])) + + if(!isnull(seed.chems["pineapplejuice"])) to_chat(user, "You slice \the [src] into rings.") new /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring(get_turf(src)) qdel(src) return - else if(!isnull(seed.chems["soymilk"])) + + if(!isnull(seed.chems["soymilk"])) to_chat(user, "You roughly chop up \the [src].") new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src)) qdel(src) return - else if(seed.get_trait(TRAIT_FLESH_COLOUR)) + + if(seed.get_trait(TRAIT_FLESH_COLOUR)) to_chat(user, "You slice up \the [src].") var/slices = rand(3,5) var/reagents_to_transfer = round(reagents.total_volume/slices) for(var/i=1; i<=slices; i++) var/obj/item/weapon/reagent_containers/food/snacks/fruit_slice/F = new(get_turf(src),seed) - if(reagents_to_transfer) reagents.trans_to_obj(F,reagents_to_transfer) + if(reagents_to_transfer) + reagents.trans_to_obj(F,reagents_to_transfer) qdel(src) return - ..() + + . = ..() /obj/item/weapon/reagent_containers/food/snacks/grown/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) . = ..() @@ -289,6 +306,20 @@ qdel(src) return + if(seed.kitchen_tag == "carpet") + user.show_message("You shape some carpet squares out of \the [src] fibers!", 1) + for(var/i=0,i<2,i++) + var/obj/item/stack/tile/carpet/G = new (user.loc) + for (var/obj/item/stack/tile/carpet/NG in user.loc) + if(G == NG) + continue + if(NG.get_amount() >= NG.max_amount) + continue + NG.attackby(G, user) + to_chat(user, "You add the newly-formed carpet to the stack. It now contains [G.get_amount()] tiles.") + qdel(src) + return + if(seed.get_trait(TRAIT_SPREAD) > 0) to_chat(user, "You plant the [src.name].") new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed) diff --git a/code/modules/hydroponics/grown_predefined.dm b/code/modules/hydroponics/grown_predefined.dm index d8187fb24e..643d27030a 100644 --- a/code/modules/hydroponics/grown_predefined.dm +++ b/code/modules/hydroponics/grown_predefined.dm @@ -3,6 +3,3 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus plantname = "ambrosiadeus" - -/obj/item/weapon/reagent_containers/food/snacks/grown/sifpod - plantname = "sifbulb" diff --git a/code/modules/hydroponics/grown_sif.dm b/code/modules/hydroponics/grown_sif.dm new file mode 100644 index 0000000000..3075fc148f --- /dev/null +++ b/code/modules/hydroponics/grown_sif.dm @@ -0,0 +1,39 @@ +/obj/item/weapon/reagent_containers/food/snacks/grown/sif + var/seeds = 0 + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/Initialize(mapload, planttype) // Wild Sifplants have some seeds you can extract with a knife. + . = ..() + seeds = rand(1, 2) + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/examine(mob/user) + . = ..() + if(seeds) + to_chat(user, SPAN_NOTICE("You can see [seeds] seed\s in \the [src]. You might be able to extract them with a sharp object.")) + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/attackby(var/obj/item/weapon/W, var/mob/living/user) + if(seed && W.sharp && seeds > 0) + var/take_seeds = min(seeds, rand(1,2)) + seeds -= take_seeds + to_chat(user, SPAN_NOTICE("You stick \the [W] into \the [src] and lever out [take_seeds] seed\s.")) + for(var/i = 1 to take_seeds) + new /obj/item/seeds(get_turf(src), seed.name) + return + . = ..() + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/sifpod + plantname = "sifbulb" + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/wabback + plantname = "wabback" + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/blackwabback + plantname = "blackwabback" + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/wildwabback + plantname = "wildwabback" + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/eyebulbs + plantname = "eyebulbs" + +/obj/item/weapon/reagent_containers/food/snacks/grown/sif/cavebulbs + plantname = "cavebulbs" diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 0446895fc4..655aa012a0 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -190,7 +190,12 @@ var/clr if(get_trait(TRAIT_BIOLUM_COLOUR)) clr = get_trait(TRAIT_BIOLUM_COLOUR) - splat.set_light(get_trait(TRAIT_BIOLUM), l_color = clr) + //VOREStation Edit Start - Tons of super bright super long range lights everywhere is annoying and laggy, so let's limit it a bit. + var/blight = get_trait(TRAIT_BIOLUM) + if(blight >= 5) + blight = 5 + splat.set_light(blight, 0.5, l_color = clr) + //VOREStation Edit End var/flesh_colour = get_trait(TRAIT_FLESH_COLOUR) if(!flesh_colour) flesh_colour = get_trait(TRAIT_PRODUCT_COLOUR) if(flesh_colour) splat.color = get_trait(TRAIT_PRODUCT_COLOUR) @@ -737,9 +742,9 @@ if(GENE_BIOCHEMISTRY) P.values["[TRAIT_CHEMS]"] = chems P.values["[TRAIT_EXUDE_GASSES]"] = exude_gasses - traits_to_copy = list(TRAIT_POTENCY, TRAIT_SPORING, TRAIT_BENEFICIAL_REAG, TRAIT_MUTAGENIC_REAG, TRAIT_TOXIC_REAG) + traits_to_copy = list(TRAIT_POTENCY, TRAIT_BENEFICIAL_REAG, TRAIT_MUTAGENIC_REAG, TRAIT_TOXIC_REAG) if(GENE_OUTPUT) - traits_to_copy = list(TRAIT_PRODUCES_POWER,TRAIT_BIOLUM) + traits_to_copy = list(TRAIT_PRODUCES_POWER,TRAIT_BIOLUM,TRAIT_SPORING) if(GENE_ATMOSPHERE) traits_to_copy = list(TRAIT_HEAT_TOLERANCE,TRAIT_LOWKPA_TOLERANCE,TRAIT_HIGHKPA_TOLERANCE) if(GENE_HARDINESS) @@ -836,8 +841,12 @@ var/clr if(get_trait(TRAIT_BIOLUM_COLOUR)) clr = get_trait(TRAIT_BIOLUM_COLOUR) - product.set_light(get_trait(TRAIT_BIOLUM), l_color = clr) - + //VOREStation Edit Start - Tons of super bright super long range lights everywhere is annoying and laggy, so let's limit it a bit. + var/blight = get_trait(TRAIT_BIOLUM) + if(blight >= 5) + blight = 5 + product.set_light(blight, 0.5, l_color = clr) + //VOREStation Edit End if(get_trait(TRAIT_STINGS)) product.force = 1 diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 08eea609bf..4a08f897da 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -13,7 +13,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) var/datum/seed/seed var/modified = 0 -/obj/item/seeds/Initialize() +/obj/item/seeds/Initialize(var/ml, var/_seed_type) + if(_seed_type in SSplants.seeds) + seed_type = _seed_type update_seed() . = ..() @@ -86,6 +88,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/chiliseed seed_type = "chili" +/obj/item/seeds/ghostchiliseed + seed_type = "ghostchili" + /obj/item/seeds/plastiseed seed_type = "plastic" @@ -227,6 +232,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/ambrosiadeusseed seed_type = "ambrosiadeus" +/obj/item/seeds/ambrosiagaiaseed + seed_type = "ambrosiagaia" + /obj/item/seeds/ambrosiainfernusseed seed_type = "ambrosiainfernus" @@ -263,6 +271,9 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds) /obj/item/seeds/grassseed seed_type = "grass" +/obj/item/seeds/carpetseed + seed_type = "carpet" + /obj/item/seeds/cocoapodseed seed_type = "cocoa" diff --git a/code/modules/hydroponics/seedtypes/ambrosia.dm b/code/modules/hydroponics/seedtypes/ambrosia.dm index 535d5129a3..6a6dda8a14 100644 --- a/code/modules/hydroponics/seedtypes/ambrosia.dm +++ b/code/modules/hydroponics/seedtypes/ambrosia.dm @@ -24,7 +24,7 @@ seed_name = "ambrosia deus" display_name = "ambrosia deus" kitchen_tag = "ambrosiadeus" - mutants = list("ambrosiainfernus") + mutants = list("ambrosiainfernus", "ambrosiagaia") chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "space_drugs" = list(1,10)) /datum/seed/ambrosia/deus/New() @@ -43,4 +43,26 @@ /datum/seed/ambrosia/infernus/New() ..() set_trait(TRAIT_PRODUCT_COLOUR,"#dc143c") - set_trait(TRAIT_PLANT_COLOUR,"#b22222") \ No newline at end of file + set_trait(TRAIT_PLANT_COLOUR,"#b22222") + +/datum/seed/ambrosia/gaia + name = "ambrosiagaia" + seed_name = "ambrosia gaia" + display_name = "ambrosia gaia" + kitchen_tag = "ambrosiagaia" + mutants = null + chems = list ("earthsblood" = list(3,5), "nutriment" = list(1,3)) + +/datum/seed/ambrosia/gaia/New() + ..() + set_trait(TRAIT_HARVEST_REPEAT,0) + set_trait(TRAIT_MATURATION,10) + set_trait(TRAIT_WATER_CONSUMPTION,6) + set_trait(TRAIT_NUTRIENT_CONSUMPTION,6) + set_trait(TRAIT_WEED_TOLERANCE,1) + set_trait(TRAIT_TOXINS_TOLERANCE,1) + set_trait(TRAIT_PEST_TOLERANCE,1) + set_trait(TRAIT_BIOLUM,1) + set_trait(TRAIT_BIOLUM_COLOUR,"#ffb500") + set_trait(TRAIT_PRODUCT_COLOUR, "#ffee00") + set_trait(TRAIT_PLANT_COLOUR,"#f3ba2b") \ No newline at end of file diff --git a/code/modules/hydroponics/seedtypes/apples.dm b/code/modules/hydroponics/seedtypes/apples.dm index 7044a0c6dc..4bd8a0bade 100644 --- a/code/modules/hydroponics/seedtypes/apples.dm +++ b/code/modules/hydroponics/seedtypes/apples.dm @@ -43,7 +43,7 @@ /datum/seed/apple/sif name = "sifbulb" - seed_name = "sivian tree" + seed_name = "sivian pod" display_name = "sivian pod" kitchen_tag = "apple" chems = list("nutriment" = list(1,5),"sifsap" = list(10,20)) diff --git a/code/modules/hydroponics/seedtypes/chili.dm b/code/modules/hydroponics/seedtypes/chili.dm index bee50a48bc..8a93d5b786 100644 --- a/code/modules/hydroponics/seedtypes/chili.dm +++ b/code/modules/hydroponics/seedtypes/chili.dm @@ -5,7 +5,7 @@ display_name = "chili plants" kitchen_tag = "chili" chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25)) - mutants = list("icechili") + mutants = list("icechili", "ghostchili") /datum/seed/chili/New() ..() @@ -32,4 +32,18 @@ ..() set_trait(TRAIT_MATURATION,4) set_trait(TRAIT_PRODUCTION,4) - set_trait(TRAIT_PRODUCT_COLOUR,"#00EDC6") \ No newline at end of file + set_trait(TRAIT_PRODUCT_COLOUR,"#00EDC6") + +/datum/seed/chili/ghost + name = "ghostchili" + seed_name = "ghost chili" + display_name = "ghost chili plants" + kitchen_tag = "ghostchili" + mutants = null + chems = list("condensedcapsaicin" = list (3,10), "nutriment" = list (1,25)) + +/datum/seed/chili/ghost/New() + ..() + set_trait(TRAIT_MATURATION,6) + set_trait(TRAIT_PRODUCTION,3) + set_trait(TRAIT_PRODUCT_COLOUR,"#eaecec") \ No newline at end of file diff --git a/code/modules/hydroponics/seedtypes/grass.dm b/code/modules/hydroponics/seedtypes/grass.dm index 0a94f9707f..d8629a00ae 100644 --- a/code/modules/hydroponics/seedtypes/grass.dm +++ b/code/modules/hydroponics/seedtypes/grass.dm @@ -3,6 +3,7 @@ seed_name = "grass" display_name = "grass" kitchen_tag = "grass" + mutants = list("carpet") chems = list("nutriment" = list(1,20)) /datum/seed/grass/New() @@ -16,4 +17,20 @@ set_trait(TRAIT_PLANT_COLOUR,"#07D900") set_trait(TRAIT_PLANT_ICON,"grass") set_trait(TRAIT_WATER_CONSUMPTION, 0.5) - set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) \ No newline at end of file + set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.15) + +/datum/seed/grass/carpet + name = "carpet" + seed_name = "carpet" + display_name = "carpet" + kitchen_tag = "carpet" + mutants = null + chems = list("nutiment" = list(1,10)) + +/datum/seed/grass/carpet/New() + ..() + set_trait(TRAIT_YIELD,7) + set_trait(TRAIT_PRODUCT_ICON,"grass") + set_trait(TRAIT_PRODUCT_COLOUR,"#9e2500") + set_trait(TRAIT_PLANT_COLOUR,"#ee4401") + set_trait(TRAIT_PLANT_ICON,"grass") \ No newline at end of file diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index e55bb448bd..e820af130e 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -3,15 +3,8 @@ /proc/spacevine_infestation(var/potency_min=70, var/potency_max=100, var/maturation_min=5, var/maturation_max=15) spawn() //to stop the secrets panel hanging - var/list/turf/simulated/floor/turfs = list() //list of all the empty floor turfs in the hallway areas - for(var/areapath in typesof(/area/hallway)) - var/area/A = locate(areapath) - for(var/turf/simulated/floor/F in A.contents) - if(!F.check_density()) - turfs += F - - if(turfs.len) //Pick a turf to spawn at if we can - var/turf/simulated/floor/T = pick(turfs) + if(vinestart.len) //Pick a turf to spawn at if we can + var/turf/simulated/floor/T = pick(vinestart) var/datum/seed/seed = SSplants.create_random_seed(1) seed.set_trait(TRAIT_SPREAD,2) // So it will function properly as vines. seed.set_trait(TRAIT_POTENCY,rand(potency_min, potency_max)) // 70-100 potency will help guarantee a wide spread and powerful effects. @@ -84,6 +77,10 @@ spread_chance = 0 /obj/effect/plant/New(var/newloc, var/datum/seed/newseed, var/obj/effect/plant/newparent) + //VOREStation Edit Start + if(istype(loc, /turf/simulated/open)) + qdel(src) + //VOREStation Edit End ..() if(!newparent) @@ -166,7 +163,12 @@ var/clr if(seed.get_trait(TRAIT_BIOLUM_COLOUR)) clr = seed.get_trait(TRAIT_BIOLUM_COLOUR) - set_light(1+round(seed.get_trait(TRAIT_POTENCY)/20), l_color = clr) + //VOREStation Edit Start - Tons of super bright super long range lights everywhere is annoying and laggy, so let's limit it a bit. + var/blight = 1+round(seed.get_trait(TRAIT_POTENCY)/20) + if(blight >= 5) + blight = 5 + set_light(blight, 0.5, l_color = clr) + //VOREStation Edit End return else set_light(0) diff --git a/code/modules/hydroponics/spreading/spreading_growth.dm b/code/modules/hydroponics/spreading/spreading_growth.dm index eebcbc9389..f85209884b 100644 --- a/code/modules/hydroponics/spreading/spreading_growth.dm +++ b/code/modules/hydroponics/spreading/spreading_growth.dm @@ -4,8 +4,10 @@ var/list/cardinal_neighbors = list() for(var/check_dir in cardinal) var/turf/simulated/T = get_step(get_turf(src), check_dir) - if(istype(T)) + //VOREStation Edit Start - Vines can go up/down stairs, but don't register that they have done this, so do so infinitely, which is annoying and laggy. + if(istype(T) && !istype(check_dir, /turf/simulated/open)) //Let's not have them go on open space where you can't really get to them. cardinal_neighbors |= T + //VOREStation Edit End return cardinal_neighbors /obj/effect/plant/proc/update_neighbors() @@ -114,6 +116,10 @@ //spreading vines aren't created on their final turf. //Instead, they are created at their parent and then move to their destination. /obj/effect/plant/proc/spread_to(turf/target_turf) + //VOREStation Edit Start - Vines can go up/down stairs, but don't register that they have done this, so do so infinitely, which is annoying and laggy. + if(istype(target_turf, /turf/simulated/open)) + return + //VOREStation Edit End var/obj/effect/plant/child = new(get_turf(src),seed,parent) spawn(1) // This should do a little bit of animation. diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index cdc4314c6c..09e1ccbe9e 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -216,18 +216,26 @@ if(seed && seed.get_trait(TRAIT_IMMUTABLE) > 0) return - //Override for somatoray projectiles. - if(istype(Proj ,/obj/item/projectile/energy/floramut)&& prob(20)) - if(istype(Proj, /obj/item/projectile/energy/floramut/gene)) - var/obj/item/projectile/energy/floramut/gene/G = Proj - if(seed) - seed = seed.diverge_mutate_gene(G.gene, get_turf(loc)) //get_turf just in case it's not in a turf. - else - mutate(1) + // Override for somatoray projectiles. + // Change the mutchance var to buff or nerf somatorays, it will be multiplied by the tier of the laser. + var/mutchance = 15 + if(istype(Proj ,/obj/item/projectile/energy/floramut)) + var/obj/item/projectile/energy/floramut/GM = Proj + mutchance *= GM.lasermod + if(prob(mutchance)) + if(istype(Proj, /obj/item/projectile/energy/floramut/gene)) + var/obj/item/projectile/energy/floramut/gene/G = Proj + if(seed) + seed = seed.diverge_mutate_gene(G.gene, get_turf(loc)) //get_turf just in case it's not in a turf. + else + mutate(1) + return + else if(istype(Proj ,/obj/item/projectile/energy/florayield)) + var/obj/item/projectile/energy/floramut/GY = Proj + mutchance *= GY.lasermod + if(prob(mutchance)) + yield_mod = min(10,yield_mod+rand(1,2)) return - else if(istype(Proj ,/obj/item/projectile/energy/florayield) && prob(20)) - yield_mod = min(10,yield_mod+rand(1,2)) - return ..() diff --git a/code/modules/hydroponics/trays/tray_soil.dm b/code/modules/hydroponics/trays/tray_soil.dm index f396b00dbf..7c05176cb9 100644 --- a/code/modules/hydroponics/trays/tray_soil.dm +++ b/code/modules/hydroponics/trays/tray_soil.dm @@ -32,6 +32,16 @@ /obj/machinery/portable_atmospherics/hydroponics/soil/CanPass() return 1 +/obj/machinery/portable_atmospherics/hydroponics/soil/attackby(obj/item/O, mob/user) + if(istype(O, /obj/item/weapon/shovel) && user.a_intent == I_HURT) + user.visible_message(SPAN_NOTICE("\The [user] begins filling in \the [src].")) + if(do_after(user, 3 SECONDS) && !QDELETED(src)) + user.visible_message(SPAN_NOTICE("\The [user] fills in \the [src].")) + qdel(src) + return + . = ..() + + // Holder for vine plants. // Icons for plants are generated as overlays, so setting it to invisible wouldn't work. // Hence using a blank icon. @@ -41,6 +51,10 @@ icon_state = "blank" /obj/machinery/portable_atmospherics/hydroponics/soil/invisible/New(var/newloc,var/datum/seed/newseed) + //VOREStation Addition Start + if(istype(loc, /turf/simulated/open) || istype(loc, /turf/space)) + qdel(src) + //VOREStation Addition End ..() seed = newseed dead = 0 diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index cedcc3f8b9..3e5bd91b6a 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -275,6 +275,9 @@ if(get_trait(TRAIT_TELEPORTING)) data["trait_info"] += "The fruit is temporal/spatially unstable." + if(get_trait(TRAIT_SPORING)) + data["trait_info"] += "It occasionally releases reagent carrying spores into the atmosphere." + if(exude_gasses && exude_gasses.len) for(var/gas in exude_gasses) var/amount = "" diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm index fc00e97ee8..0b3cf11231 100644 --- a/code/modules/hydroponics/trays/tray_update_icons.dm +++ b/code/modules/hydroponics/trays/tray_update_icons.dm @@ -5,11 +5,11 @@ ov_lowwater.plane = PLANE_LIGHTING_ABOVE ov_lownutri = image(icon = icon, icon_state = "over_lownutri3") ov_lownutri.plane = PLANE_LIGHTING_ABOVE - ov_harvest = image(icon = icon, icon_state = "over_alert3") + ov_harvest = image(icon = icon, icon_state = "over_harvest3") ov_harvest.plane = PLANE_LIGHTING_ABOVE - ov_frozen = image(icon = icon, icon_state = "over_harvest3") + ov_frozen = image(icon = icon, icon_state = "over_frozen3") ov_frozen.plane = PLANE_LIGHTING_ABOVE - ov_alert3 = image(icon = icon, icon_state = "over_frozen3") + ov_alert3 = image(icon = icon, icon_state = "over_alert3") ov_alert3.plane = PLANE_LIGHTING_ABOVE //Refreshes the icon and sets the luminosity diff --git a/code/modules/materials/materials/metals/steel_vr.dm b/code/modules/materials/materials/metals/steel_vr.dm index b112f36217..818b41beaa 100644 --- a/code/modules/materials/materials/metals/steel_vr.dm +++ b/code/modules/materials/materials/metals/steel_vr.dm @@ -39,44 +39,44 @@ new /datum/stack_recipe("red sofa right", /obj/structure/bed/chair/sofa/right, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("red sofa corner", /obj/structure/bed/chair/sofa/corner, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("brown sofa middle", /obj/structure/bed/chair/sofa/brown, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("brown sofa left", /obj/structure/bed/chair/sofa/brown/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("brown sofa right", /obj/structure/bed/chair/sofa/brown/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("brown sofa corner", /obj/structure/bed/chair/sofa/brown/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("brown sofa left", /obj/structure/bed/chair/sofa/left/brown, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("brown sofa right", /obj/structure/bed/chair/sofa/right/brown, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("brown sofa corner", /obj/structure/bed/chair/sofa/corner/brown, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("teal sofa middle", /obj/structure/bed/chair/sofa/teal, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("teal sofa left", /obj/structure/bed/chair/sofa/teal/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("teal sofa right", /obj/structure/bed/chair/sofa/teal/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("teal sofa corner", /obj/structure/bed/chair/sofa/teal/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("teal sofa left", /obj/structure/bed/chair/sofa/left/teal, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("teal sofa right", /obj/structure/bed/chair/sofa/right/teal, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("teal sofa corner", /obj/structure/bed/chair/sofa/corner/teal, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("black sofa middle", /obj/structure/bed/chair/sofa/black, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("black sofa left", /obj/structure/bed/chair/sofa/black/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("black sofa right", /obj/structure/bed/chair/sofa/black/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("black sofa corner", /obj/structure/bed/chair/sofa/black/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("black sofa left", /obj/structure/bed/chair/sofa/left/black, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("black sofa right", /obj/structure/bed/chair/sofa/right/black, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("black sofa corner", /obj/structure/bed/chair/sofa/corner/black, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("green sofa middle", /obj/structure/bed/chair/sofa/green, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("green sofa left", /obj/structure/bed/chair/sofa/green/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("green sofa right", /obj/structure/bed/chair/sofa/green/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("green sofa corner", /obj/structure/bed/chair/sofa/green/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("green sofa left", /obj/structure/bed/chair/sofa/left/green, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("green sofa right", /obj/structure/bed/chair/sofa/right/green, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("green sofa corner", /obj/structure/bed/chair/sofa/corner/green, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("purple sofa middle", /obj/structure/bed/chair/sofa/purp, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("purple sofa left", /obj/structure/bed/chair/sofa/purp/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("purple sofa right", /obj/structure/bed/chair/sofa/purp/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("purple sofa corner", /obj/structure/bed/chair/sofa/purp/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("purple sofa left", /obj/structure/bed/chair/sofa/left/purp, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("purple sofa right", /obj/structure/bed/chair/sofa/right/purp, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("purple sofa corner", /obj/structure/bed/chair/sofa/corner/purp, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("blue sofa middle", /obj/structure/bed/chair/sofa/blue, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("blue sofa left", /obj/structure/bed/chair/sofa/blue/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("blue sofa right", /obj/structure/bed/chair/sofa/blue/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("blue sofa corner", /obj/structure/bed/chair/sofa/blue/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("blue sofa left", /obj/structure/bed/chair/sofa/left/blue, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("blue sofa right", /obj/structure/bed/chair/sofa/right/blue, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("blue sofa corner", /obj/structure/bed/chair/sofa/corner/blue, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("beige sofa middle", /obj/structure/bed/chair/sofa/beige, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("beige sofa left", /obj/structure/bed/chair/sofa/beige/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("beige sofa right", /obj/structure/bed/chair/sofa/beige/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("beige sofa corner", /obj/structure/bed/chair/sofa/beige/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("beige sofa left", /obj/structure/bed/chair/sofa/left/beige, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("beige sofa right", /obj/structure/bed/chair/sofa/right/beige, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("beige sofa corner", /obj/structure/bed/chair/sofa/corner/beige, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("lime sofa middle", /obj/structure/bed/chair/sofa/lime, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("lime sofa left", /obj/structure/bed/chair/sofa/lime/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("lime sofa right", /obj/structure/bed/chair/sofa/lime/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("lime sofa corner", /obj/structure/bed/chair/sofa/lime/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("lime sofa left", /obj/structure/bed/chair/sofa/left/lime, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("lime sofa right", /obj/structure/bed/chair/sofa/right/lime, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("lime sofa corner", /obj/structure/bed/chair/sofa/corner/lime, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("yellow sofa middle", /obj/structure/bed/chair/sofa/yellow, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("yellow sofa left", /obj/structure/bed/chair/sofa/yellow/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("yellow sofa right", /obj/structure/bed/chair/sofa/yellow/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("yellow sofa corner", /obj/structure/bed/chair/sofa/yellow/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("yellow sofa left", /obj/structure/bed/chair/sofa/left/yellow, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("yellow sofa right", /obj/structure/bed/chair/sofa/right/yellow, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("yellow sofa corner", /obj/structure/bed/chair/sofa/corner/yellow, 1, one_per_turf = 1, on_floor = 1), \ new /datum/stack_recipe("orange sofa middle", /obj/structure/bed/chair/sofa/orange, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("orange sofa left", /obj/structure/bed/chair/sofa/orange/left, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("orange sofa right", /obj/structure/bed/chair/sofa/orange/right, 1, one_per_turf = 1, on_floor = 1), \ - new /datum/stack_recipe("orange sofa corner", /obj/structure/bed/chair/sofa/orange/corner, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("orange sofa left", /obj/structure/bed/chair/sofa/left/orange, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("orange sofa right", /obj/structure/bed/chair/sofa/right/orange, 1, one_per_turf = 1, on_floor = 1), \ + new /datum/stack_recipe("orange sofa corner", /obj/structure/bed/chair/sofa/corner/orange, 1, one_per_turf = 1, on_floor = 1), \ )), ) diff --git a/code/modules/materials/materials/organic/wood.dm b/code/modules/materials/materials/organic/wood.dm index 8f54246cf8..467b42ac8d 100644 --- a/code/modules/materials/materials/organic/wood.dm +++ b/code/modules/materials/materials/organic/wood.dm @@ -45,7 +45,9 @@ new /datum/stack_recipe("noticeboard", /obj/structure/noticeboard, 1, recycle_material = "[name]"), new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"), new /datum/stack_recipe("painting easel", /obj/structure/easel, 5, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"), - new /datum/stack_recipe("painting frame", /obj/item/frame/painting, 5, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]") + new /datum/stack_recipe("painting frame", /obj/item/frame/painting, 5, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]"), + new /datum/stack_recipe("roofing tile", /obj/item/stack/tile/roofing, 3, 4, 20, recycle_material = "[name]"), + new /datum/stack_recipe("shovel", /obj/item/weapon/shovel/wood, 2, time = 10, on_floor = TRUE, supplied_material = "[name]") ) /datum/material/wood/sif diff --git a/code/modules/materials/sheets/organic/tanning/hide.dm b/code/modules/materials/sheets/organic/tanning/hide.dm index b6b7778132..e8dadfce73 100644 --- a/code/modules/materials/sheets/organic/tanning/hide.dm +++ b/code/modules/materials/sheets/organic/tanning/hide.dm @@ -20,7 +20,7 @@ //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) user.visible_message("\The [user] starts cutting hair off \the [src]", "You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") var/scraped = 0 - while(amount > 0 && do_after(user, 2.5 SECONDS)) // 2.5s per hide + while(amount > 0 && do_after(user, 2.5 SECONDS, user)) //Try locating an exisitng stack on the tile and add to there if possible var/obj/item/stack/hairlesshide/H = null for(var/obj/item/stack/hairlesshide/HS in user.loc) // Could be scraping something inside a locker, hence the .loc, not get_turf diff --git a/code/modules/mining/drilling/drill.dm b/code/modules/mining/drilling/drill.dm index e1874f1a93..868056afd8 100644 --- a/code/modules/mining/drilling/drill.dm +++ b/code/modules/mining/drilling/drill.dm @@ -11,6 +11,7 @@ icon_state = "mining_drill" circuit = /obj/item/weapon/circuitboard/miningdrill var/braces_needed = 2 + var/total_brace_tier = 0 var/list/obj/machinery/mining/brace/supports = list() var/supported = 0 var/active = 0 @@ -176,6 +177,9 @@ if(newtag) name = "[initial(name)] #[newtag]" to_chat(user, "You changed the drill ID to: [newtag]") + else + name = "[initial(name)]" + to_chat(user, SPAN_NOTICE("You removed the drill's ID and any extraneous labels.")) return if(default_deconstruction_screwdriver(user, O)) return @@ -199,6 +203,7 @@ /obj/machinery/mining/drill/attack_hand(mob/user as mob) check_supports() + RefreshParts() if (panel_open && cell && user.Adjacent(src)) to_chat(user, "You take out \the [cell].") @@ -219,6 +224,8 @@ if(active) visible_message("\The [src] lurches downwards, grinding noisily.") need_update_field = 1 + harvest_speed *= total_brace_tier + charge_use *= total_brace_tier else visible_message("\The [src] shudders to a grinding halt.") else @@ -249,9 +256,7 @@ for(var/obj/item/weapon/stock_parts/P in component_parts) if(istype(P, /obj/item/weapon/stock_parts/micro_laser)) - harvest_speed = P.rating - if(P.rating >= 5) - harvest_speed *= 2 + harvest_speed = P.rating ** 2 // 1, 4, 9, 16, 25 exotic_drilling = P.rating - 1 if(exotic_drilling >= 1) ore_types |= ore_types_uncommon @@ -277,6 +282,7 @@ /obj/machinery/mining/drill/proc/check_supports() supported = 0 + total_brace_tier = 0 if((!supports || !supports.len) && initial(anchored) == 0) icon_state = "mining_drill" @@ -289,8 +295,10 @@ if(supports.len >= braces_needed) supported = 1 else for(var/obj/machinery/mining/brace/check in supports) - if(check.brace_tier > 3) + if(check.brace_tier >= 3) supported = 1 + for(var/obj/machinery/mining/brace/check in supports) + total_brace_tier += check.brace_tier update_icon() @@ -357,7 +365,7 @@ /obj/machinery/mining/brace/examine(mob/user) . = ..() - if(brace_tier > 3) + if(brace_tier > 2) . += SPAN_NOTICE("The internals of the brace look resilient enough to support a drill by itself.") /obj/machinery/mining/brace/Initialize() diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 2f744ac7c5..2c661ba062 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -128,6 +128,26 @@ edge = TRUE var/digspeed = 40 +/obj/item/weapon/shovel/wood + icon_state = "whiteshovel" + item_state = "whiteshovel" + var/datum/material/material + +/obj/item/weapon/shovel/wood/Initialize(var/ml, var/_mat) + . = ..() + material = get_material_by_name(_mat) + if(!istype(material)) + material = null + else + name = "[material.display_name] shovel" + matter = list("[material.name]" = 50) + update_icon() + +/obj/item/weapon/shovel/wood/update_icon() + . = ..() + color = material ? material.icon_colour : initial(color) + alpha = min(max(255 * material.opacity, 80), 255) + /obj/item/weapon/shovel/spade name = "spade" desc = "A small tool for digging and moving dirt." diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index aea40de035..c24194b090 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -6,24 +6,25 @@ var/list/mining_overlay_cache = list() icon = 'icons/turf/walls.dmi' icon_state = "rock-dark" density = TRUE - + /turf/simulated/mineral //wall piece name = "rock" icon = 'icons/turf/walls.dmi' icon_state = "rock" - var/rock_side_icon_state = "rock_side" - var/sand_icon_state = "asteroid" - var/rock_icon_state = "rock" - var/random_icon = 0 oxygen = 0 nitrogen = 0 opacity = 1 density = TRUE blocks_air = 1 temperature = T0C - can_dirty = FALSE + var/floor_name = "sand" + var/rock_side_icon_state = "rock_side" + var/sand_icon_state = "asteroid" + var/rock_icon_state = "rock" + var/random_icon = 0 + var/ore/mineral var/sand_dug var/mined_ore = 0 @@ -65,6 +66,10 @@ var/list/mining_overlay_cache = list() has_resources = 1 +/turf/simulated/mineral/ChangeTurf(turf/N, tell_universe, force_lighting_update, preserve_outdoors) + clear_ore_effects() + . = ..() + // Alternative rock wall sprites. /turf/simulated/mineral/light icon_state = "rock-light" @@ -109,6 +114,14 @@ var/list/mining_overlay_cache = list() blocks_air = 0 can_build_into_floor = TRUE +/turf/simulated/mineral/floor/mud + icon_state = "mud" + sand_icon_state = "mud" + +/turf/simulated/mineral/floor/dirt + icon_state = "dirt" + sand_icon_state = "dirt" + //Alternative sand floor sprite. /turf/simulated/mineral/floor/light icon_state = "sand-light" @@ -140,6 +153,7 @@ var/list/mining_overlay_cache = list() opacity = 0 blocks_air = 0 can_build_into_floor = TRUE + clear_ore_effects() update_general() /turf/simulated/mineral/proc/make_wall() @@ -223,7 +237,7 @@ var/list/mining_overlay_cache = list() //We are a sand floor else - name = "sand" + name = floor_name icon = 'icons/turf/flooring/asteroid.dmi' icon_state = sand_icon_state @@ -611,8 +625,8 @@ var/list/mining_overlay_cache = list() if(prob(50)) M.Stun(5) SSradiation.flat_radiate(src, 25, 100) - if(prob(25)) - excavate_find(prob(5), finds[1]) + if(prob(25)) + excavate_find(prob(5), finds[1]) else if(rand(1,500) == 1) visible_message("An old dusty crate was buried within!") new /obj/structure/closet/crate/secure/loot(src) diff --git a/code/modules/mining/mine_turfs_vr.dm b/code/modules/mining/mine_turfs_vr.dm index 6e8797bf70..2db25d26fb 100644 --- a/code/modules/mining/mine_turfs_vr.dm +++ b/code/modules/mining/mine_turfs_vr.dm @@ -14,6 +14,16 @@ /turf/simulated/mineral/floor/ignore_cavegen ignore_cavegen = TRUE +/turf/simulated/mineral/ignore_cavegen/cave + oxygen = MOLES_O2STANDARD + nitrogen = MOLES_N2STANDARD + temperature = T20C + +/turf/simulated/mineral/floor/ignore_cavegen/cave + oxygen = MOLES_O2STANDARD + nitrogen = MOLES_N2STANDARD + temperature = T20C + /turf/simulated/mineral/vacuum oxygen = 0 nitrogen = 0 diff --git a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm index 38eacfc56f..c100a7a9bc 100644 --- a/code/modules/mining/ore_redemption_machine/equipment_vendor.dm +++ b/code/modules/mining/ore_redemption_machine/equipment_vendor.dm @@ -122,11 +122,14 @@ EQUIPMENT("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), EQUIPMENT("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1200), EQUIPMENT("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), + EQUIPMENT("KA Temperature Modulator", /obj/item/borg/upgrade/modkit/heater, 1000), + EQUIPMENT("KA Off-Station Modulator", /obj/item/borg/upgrade/modkit/offsite, 1750), EQUIPMENT("KA Holster", /obj/item/clothing/accessory/holster/waist/kinetic_accelerator, 350), EQUIPMENT("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), EQUIPMENT("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), EQUIPMENT("KA Adjustable Tracer Rounds",/obj/item/borg/upgrade/modkit/tracer/adjustable, 175), EQUIPMENT("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 125), + EQUIPMENT("Premium Kinetic Accelerator",/obj/item/weapon/gun/energy/kinetic_accelerator/premiumka, 12000), ) prize_list["Digging Tools"] = list( // EQUIPMENT("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000), @@ -164,6 +167,7 @@ EQUIPMENT("Plush Toy", /obj/random/plushie, 300), EQUIPMENT("Soap", /obj/item/weapon/soap/nanotrasen, 200), EQUIPMENT("Thalers - 100", /obj/item/weapon/spacecash/c100, 1000), + EQUIPMENT("Thalers - 1000", /obj/item/weapon/spacecash/c1000, 10000), EQUIPMENT("Umbrella", /obj/item/weapon/melee/umbrella/random, 200), EQUIPMENT("Whiskey", /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, 125), ) @@ -283,7 +287,10 @@ return remove_points(inserted_id, prize.cost) - new prize.equipment_path(loc) + //VOREStation Edit Start + var/obj/I = new prize.equipment_path(loc) + I.persist_storable = FALSE + //VOREStation Edit End flick(icon_vend, src) //VOREStation Add else flick(icon_deny, src) //VOREStation Add diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm index 1badc92926..c20b00684d 100644 --- a/code/modules/mob/death.dm +++ b/code/modules/mob/death.dm @@ -1,7 +1,8 @@ //This is the proc for gibbing a mob. Cannot gib ghosts. //added different sort of gibs and animations. N /mob/proc/gib(anim="gibbed-m", do_gibs, gib_file = 'icons/mob/mob.dmi') - death(1) + if(stat != DEAD) + death(1) transforming = 1 canmove = 0 icon = null @@ -70,6 +71,7 @@ if(stat == DEAD) return 0 + SEND_SIGNAL(src, COMSIG_MOB_DEATH, gibbed) if(src.loc && istype(loc,/obj/belly) || istype(loc,/obj/item/device/dogborg/sleeper)) deathmessage = "no message" //VOREStation Add - Prevents death messages from inside mobs facing_dir = null @@ -100,7 +102,7 @@ if(mind) mind.store_memory("Time of death: [stationtime2text()]", 0) living_mob_list -= src dead_mob_list |= src - + set_respawn_timer() updateicon() handle_regular_hud_updates() diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index e4f5eb1d08..5b6d155640 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -28,20 +28,29 @@ var/list/holder_mob_icon_cache = list() /obj/item/weapon/holder/Initialize(mapload, mob/held) ASSERT(ismob(held)) . = ..() + held.forceMove(src) + START_PROCESSING(SSobj, src) + +/obj/item/weapon/holder/Entered(mob/held, atom/OldLoc) + if(held_mob) + held.forceMove(get_turf(src)) + return + ASSERT(ismob(held)) + . = ..() held_mob = held original_vis_flags = held.vis_flags held.vis_flags = VIS_INHERIT_ID|VIS_INHERIT_LAYER|VIS_INHERIT_PLANE - - held.forceMove(src) vis_contents += held name = held.name original_transform = held.transform held.transform = null - // I really hate this, but I'm sleepy and unable to figure out a nice stateful way to do it - // Entered and Exited seem ideal but all the inventory procs are trash and put items on - // turfs before you when manhandling things in/out of backpacks and inventory slots. - START_PROCESSING(SSobj, src) +/obj/item/weapon/holder/Exited(atom/movable/thing, atom/OldLoc) + if(thing == held_mob) + held_mob.transform = original_transform + held_mob.vis_flags = original_vis_flags + held_mob = null + ..() /obj/item/weapon/holder/Destroy() STOP_PROCESSING(SSobj, src) @@ -91,7 +100,7 @@ var/list/holder_mob_icon_cache = list() else if(istype(loc, /obj/item/clothing/accessory/holster)) var/obj/item/clothing/accessory/holster/holster = loc if(holster.holstered == src) - holster.clear_holster() + holster.clear_holster() to_chat(held, "You extricate yourself from [holster].") forceMove(get_turf(src)) else if(isitem(loc)) @@ -120,11 +129,30 @@ var/list/holder_mob_icon_cache = list() item_state = held.icon_state /obj/item/weapon/holder/mouse + name = "mouse" + desc = "It's a small rodent." + item_state = "mouse_gray" + slot_flags = SLOT_EARS | SLOT_HEAD | SLOT_ID + origin_tech = list(TECH_BIO = 2) w_class = ITEMSIZE_TINY -/obj/item/weapon/holder/pai/Initialize(mapload, mob/held) - . = ..() - item_state = held.icon_state +/obj/item/weapon/holder/mouse/white + item_state = "mouse_white" + +/obj/item/weapon/holder/mouse/gray + item_state = "mouse_gray" + +/obj/item/weapon/holder/mouse/brown + item_state = "mouse_brown" + +/obj/item/weapon/holder/mouse/black + item_state = "mouse_black" + +/obj/item/weapon/holder/mouse/operative + item_state = "mouse_operative" + +/obj/item/weapon/holder/mouse/rat + item_state = "mouse_rat" /obj/item/weapon/holder/possum origin_tech = list(TECH_BIO = 2) @@ -259,8 +287,6 @@ var/list/holder_mob_icon_cache = list() /mob/living/MouseDrop(var/atom/over_object) var/mob/living/carbon/human/H = over_object if(holder_type && issmall(src) && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP)) //VOREStation Edit - if(istype(src, /mob/living/simple_mob/animal/passive/mouse)) //vorestation edit - return ..() //vorestation edit if(!issmall(H) || !istype(src, /mob/living/carbon/human)) get_scooped(H, (usr == src)) return diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 66745ca916..17b756f1f8 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -149,6 +149,17 @@ colour = "spacer" machine_understands = TRUE +/datum/language/tavan + name = LANGUAGE_TAVAN + desc = "A language native to the Altevians, it has been adopted by other rodent faring species over time." + key = "E" + speech_verb = "squeaks" + whisper_verb = "squiks" + exclaim_verb = "squeaks loudly" + syllables = list ("sque", "uik", "squeak", "squee", "eak", "eek", "uek", "squik", + "squeek", "sq", "squee", "ee", "ek", "ak", "ueak", "squea") + colour = "tavan" + /datum/language/unathi flags = 0 /datum/language/tajaran diff --git a/code/modules/mob/living/bot/bot_vr.dm b/code/modules/mob/living/bot/bot_vr.dm index 958db0dc9f..19fc538eb6 100644 --- a/code/modules/mob/living/bot/bot_vr.dm +++ b/code/modules/mob/living/bot/bot_vr.dm @@ -1,2 +1,5 @@ /mob/living/bot - no_vore = TRUE \ No newline at end of file + no_vore = TRUE + devourable = FALSE + feeding = FALSE + can_be_drop_pred = FALSE \ No newline at end of file diff --git a/code/modules/mob/living/butchering.dm b/code/modules/mob/living/butchering.dm index b46abcac01..14adae33a3 100644 --- a/code/modules/mob/living/butchering.dm +++ b/code/modules/mob/living/butchering.dm @@ -1,12 +1,13 @@ /mob/living - var/meat_amount = 0 // How much meat to drop from this mob when butchered - var/obj/meat_type // The meat object to drop + var/meat_amount = 0 // How much meat to drop from this mob when butchered + var/obj/meat_type // The meat object to drop var/gib_on_butchery = FALSE + var/butchery_drops_organs = TRUE // Do we spawn and/or drop organs when butchered? - var/list/butchery_loot // Associated list, path = number. + var/list/butchery_loot // Associated list, path = number. // Harvest an animal's delicious byproducts /mob/living/proc/harvest(var/mob/user, var/obj/item/I) @@ -40,7 +41,7 @@ butchery_loot.Cut() butchery_loot = null - if(LAZYLEN(organs)) + if(LAZYLEN(organs) && butchery_drops_organs) organs_by_name.Cut() for(var/path in organs) @@ -62,7 +63,7 @@ OR.removed() organs -= OR - if(LAZYLEN(internal_organs)) + if(LAZYLEN(internal_organs) && butchery_drops_organs) internal_organs_by_name.Cut() for(var/path in internal_organs) diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index 0d3edc90c8..43bab179d6 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -20,7 +20,7 @@ usr.visible_message(SPAN_NOTICE("\The [usr] holds out \the [I] to \the [target]."), SPAN_NOTICE("You hold out \the [I] to \the [target], waiting for them to accept it.")) - if(tgui_alert(target,"[src] wants to give you \a [I]. Will you accept it?","Item Offer",list("No","Yes")) == "No") + if(tgui_alert(target,"[src] wants to give you \a [I]. Will you accept it?","Item Offer",list("Yes","No")) == "No") target.visible_message(SPAN_NOTICE("\The [src] tried to hand \the [I] to \the [target], but \the [target] didn't want it.")) return diff --git a/code/modules/mob/living/carbon/human/death_vr.dm b/code/modules/mob/living/carbon/human/death_vr.dm index ca319be6e4..47d5b88589 100644 --- a/code/modules/mob/living/carbon/human/death_vr.dm +++ b/code/modules/mob/living/carbon/human/death_vr.dm @@ -1,13 +1,14 @@ /mob/living/carbon/human/gib() - - //Drop the NIF, they're expensive, why not recover them? Also important for prometheans. + + //Drop the NIF, they're expensive, why not recover them? if(nif) var/obj/item/device/nif/deadnif = nif //Unimplant removes the reference on the mob - deadnif.unimplant(src) - deadnif.forceMove(drop_location()) - deadnif.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(1,3), round(30/deadnif.w_class)) - deadnif.wear(10) //Presumably it's gone through some shit if they got gibbed? - + if(!deadnif.gib_nodrop) + deadnif.unimplant(src) + deadnif.forceMove(drop_location()) + deadnif.throw_at(get_edge_target_turf(src,pick(alldirs)), rand(1,3), round(30/deadnif.w_class)) + deadnif.wear(10) //Presumably it's gone through some shit if they got gibbed? + . = ..() //Surprisingly this is only called for humans, but whatever! @@ -15,10 +16,10 @@ //Not in a belly? Well, too bad! if(!isbelly(H.loc)) return TRUE - + //What belly! var/obj/belly/B = H.loc - + //Were they digesting and we have a mind you can update? //Technically allows metagaming by allowing buddies to turn on digestion for like 2 seconds // to finish off critically wounded friends to avoid resleeving sickness, but like diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 6128261628..63285bd597 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -134,7 +134,8 @@ var/list/_human_default_emotes = list( /decl/emote/visible/blep, /decl/emote/helper/vwag, - /decl/emote/helper/vflap + /decl/emote/helper/vflap, + /decl/emote/audible/prbt //VOREStation Add End ) @@ -261,7 +262,8 @@ var/list/_simple_mob_default_emotes = list( /decl/emote/audible/spiderpurr, /decl/emote/audible/squeaky, /decl/emote/visible/mlem, - /decl/emote/visible/blep + /decl/emote/visible/blep, + /decl/emote/audible/prbt ) //VOREStation Add End diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 91a30f0b42..9d3b6753ac 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -21,6 +21,16 @@ #define COLD_GAS_DAMAGE_LEVEL_2 1.5 //Amount of damage applied when the current breath's temperature passes the 200K point #define COLD_GAS_DAMAGE_LEVEL_3 3 //Amount of damage applied when the current breath's temperature passes the 120K point +#define COLD_ALERT_SEVERITY_LOW 1 // Constants passed to the cold and heat alerts. +#define COLD_ALERT_SEVERITY_MODERATE 2 +#define COLD_ALERT_SEVERITY_MAX 3 +#define ENVIRONMENT_COMFORT_MARKER_COLD 1 + +#define HOT_ALERT_SEVERITY_LOW 1 +#define HOT_ALERT_SEVERITY_MODERATE 2 +#define HOT_ALERT_SEVERITY_MAX 3 +#define ENVIRONMENT_COMFORT_MARKER_HOT 2 + #define RADIATION_SPEED_COEFFICIENT 0.1 #define HUMAN_COMBUSTION_TEMP 524 //524k is the sustained combustion temperature of human fat @@ -564,7 +574,7 @@ // Hot air hurts :( - if((breath.temperature < species.breath_cold_level_1 || breath.temperature > species.breath_heat_level_1) && !(COLD_RESISTANCE in mutations)) + if((breath.temperature <= species.cold_discomfort_level || breath.temperature >= species.heat_discomfort_level) && !(COLD_RESISTANCE in mutations)) if(breath.temperature <= species.breath_cold_level_1) if(prob(20)) @@ -573,27 +583,37 @@ if(prob(20)) to_chat(src, "You feel your face burning and a searing heat in your lungs!") - if(breath.temperature >= species.breath_heat_level_1) - if(breath.temperature < species.breath_heat_level_2) - apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, BP_HEAD, used_weapon = "Excessive Heat") - throw_alert("temp", /obj/screen/alert/hot, 1) - else if(breath.temperature < species.breath_heat_level_3) - apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, BP_HEAD, used_weapon = "Excessive Heat") - throw_alert("temp", /obj/screen/alert/hot, 2) - else + if(breath.temperature >= species.heat_discomfort_level) + + if(breath.temperature >= species.breath_heat_level_3) apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, BP_HEAD, used_weapon = "Excessive Heat") - throw_alert("temp", /obj/screen/alert/hot, 3) - - else if(breath.temperature <= species.breath_cold_level_1) - if(breath.temperature > species.breath_cold_level_2) - apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, BP_HEAD, used_weapon = "Excessive Cold") - throw_alert("temp", /obj/screen/alert/cold, 1) - else if(breath.temperature > species.breath_cold_level_3) - apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, BP_HEAD, used_weapon = "Excessive Cold") - throw_alert("temp", /obj/screen/alert/cold, 2) + throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_MAX) + else if(breath.temperature >= species.breath_heat_level_2) + apply_damage(HEAT_GAS_DAMAGE_LEVEL_2, BURN, BP_HEAD, used_weapon = "Excessive Heat") + throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_MODERATE) + else if(breath.temperature >= species.breath_heat_level_1) + apply_damage(HEAT_GAS_DAMAGE_LEVEL_1, BURN, BP_HEAD, used_weapon = "Excessive Heat") + throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_LOW) + else if(species.get_environment_discomfort(src, ENVIRONMENT_COMFORT_MARKER_HOT)) + throw_alert("temp", /obj/screen/alert/warm, HOT_ALERT_SEVERITY_LOW) else + clear_alert("temp") + + else if(breath.temperature <= species.cold_discomfort_level) + + if(breath.temperature <= species.breath_cold_level_3) apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, BP_HEAD, used_weapon = "Excessive Cold") - throw_alert("temp", /obj/screen/alert/cold, 3) + throw_alert("temp", /obj/screen/alert/cold, COLD_ALERT_SEVERITY_MAX) + else if(breath.temperature <= species.breath_cold_level_2) + apply_damage(COLD_GAS_DAMAGE_LEVEL_1, BURN, BP_HEAD, used_weapon = "Excessive Cold") + throw_alert("temp", /obj/screen/alert/cold, COLD_ALERT_SEVERITY_LOW) + else if(breath.temperature <= species.breath_cold_level_1) + apply_damage(COLD_GAS_DAMAGE_LEVEL_2, BURN, BP_HEAD, used_weapon = "Excessive Cold") + throw_alert("temp", /obj/screen/alert/cold, COLD_ALERT_SEVERITY_MODERATE) + else if(species.get_environment_discomfort(src, ENVIRONMENT_COMFORT_MARKER_COLD)) + throw_alert("temp", /obj/screen/alert/chilly, COLD_ALERT_SEVERITY_LOW) + else + clear_alert("temp") //breathing in hot/cold air also heats/cools you a bit var/temp_adj = breath.temperature - bodytemperature @@ -605,15 +625,12 @@ var/relative_density = breath.total_moles / (MOLES_CELLSTANDARD * BREATH_PERCENTAGE) temp_adj *= relative_density - if (temp_adj > BODYTEMP_HEATING_MAX) temp_adj = BODYTEMP_HEATING_MAX - if (temp_adj < BODYTEMP_COOLING_MAX) temp_adj = BODYTEMP_COOLING_MAX - //to_world("Breath: [breath.temperature], [src]: [bodytemperature], Adjusting: [temp_adj]") - bodytemperature += temp_adj + if(temp_adj > BODYTEMP_HEATING_MAX) + temp_adj = BODYTEMP_HEATING_MAX + if(temp_adj < BODYTEMP_COOLING_MAX) + temp_adj = BODYTEMP_COOLING_MAX - else if(breath.temperature >= species.heat_discomfort_level) - species.get_environment_discomfort(src,"heat") - else if(breath.temperature <= species.cold_discomfort_level) - species.get_environment_discomfort(src,"cold") + bodytemperature += temp_adj else clear_alert("temp") @@ -690,13 +707,13 @@ if(bodytemperature >= species.heat_level_2) if(bodytemperature >= species.heat_level_3) burn_dam = HEAT_DAMAGE_LEVEL_3 - throw_alert("temp", /obj/screen/alert/hot, 3) + throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_MAX) else burn_dam = HEAT_DAMAGE_LEVEL_2 - throw_alert("temp", /obj/screen/alert/hot, 2) + throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_MODERATE) else burn_dam = HEAT_DAMAGE_LEVEL_1 - throw_alert("temp", /obj/screen/alert/hot, 1) + throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_LOW) take_overall_damage(burn=burn_dam, used_weapon = "High Body Temperature") diff --git a/code/modules/mob/living/carbon/human/species/outsider/vox.dm b/code/modules/mob/living/carbon/human/species/outsider/vox.dm index e8ff96175a..bb80c4c9d4 100644 --- a/code/modules/mob/living/carbon/human/species/outsider/vox.dm +++ b/code/modules/mob/living/carbon/human/species/outsider/vox.dm @@ -109,4 +109,7 @@ H.internal = H.r_hand H.internal = locate(/obj/item/weapon/tank) in H.contents if(istype(H.internal,/obj/item/weapon/tank) && H.internals) - H.internals.icon_state = "internal1" \ No newline at end of file + H.internals.icon_state = "internal1" + +/datum/species/vox/get_perfect_belly_air_type() + return /datum/gas_mixture/belly_air/vox \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 91bc81f210..995bcfa97f 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -53,9 +53,9 @@ var/taste_sensitivity = TASTE_NORMAL // How sensitive the species is to minute tastes. var/allergens = null // Things that will make this species very sick - var/allergen_reaction = AG_TOX_DMG|AG_OXY_DMG|AG_EMOTE|AG_PAIN|AG_WEAKEN // What type of reactions will you have? These the 'main' options and are intended to approximate anaphylactic shock at high doses. - var/allergen_damage_severity = 1.2 // How bad are reactions to the allergen? Touch with extreme caution. - var/allergen_disable_severity = 3 // Whilst this determines how long nonlethal effects last and how common emotes are. + var/allergen_reaction = AG_TOX_DMG|AG_OXY_DMG|AG_EMOTE|AG_PAIN|AG_BLURRY|AG_CONFUSE // What type of reactions will you have? These the 'main' options and are intended to approximate anaphylactic shock at high doses. VOREStation Edit'd. + var/allergen_damage_severity = 5 // How bad are reactions to the allergen? Touch with extreme caution. VOREStation Edit'd. + var/allergen_disable_severity = 4 // Whilst this determines how long nonlethal effects last and how common emotes are. VOREStation Edit'd. var/min_age = 17 var/max_age = 70 @@ -208,6 +208,7 @@ var/greater_form // Greater form, if any, ie. human for monkeys. var/holder_type var/gluttonous // Can eat some mobs. 1 for mice, 2 for monkeys, 3 for people. + var/soft_landing = FALSE // Can fall down and land safely on small falls. var/rarity_value = 1 // Relative rarity/collector value for this species. var/economic_modifier = 2 // How much money this species makes @@ -541,6 +542,20 @@ H.adjustToxLoss(amount) /datum/species/proc/handle_falling(mob/living/carbon/human/H, atom/hit_atom, damage_min, damage_max, silent, planetary) + if(soft_landing) + if(planetary || !istype(H)) + return FALSE + + var/turf/landing = get_turf(hit_atom) + if(!istype(landing)) + return FALSE + + if(!silent) + to_chat(H, SPAN_NOTICE("You manage to lower impact of the fall and land safely.")) + landing.visible_message("\The [H] lowers down from above, landing safely.") + playsound(H, "rustle", 25, 1) + return TRUE + return FALSE /datum/species/proc/post_spawn_special(mob/living/carbon/human/H) diff --git a/code/modules/mob/living/carbon/human/species/species_getters.dm b/code/modules/mob/living/carbon/human/species/species_getters.dm index 23c2de457f..bcb9de1f29 100644 --- a/code/modules/mob/living/carbon/human/species/species_getters.dm +++ b/code/modules/mob/living/carbon/human/species/species_getters.dm @@ -79,9 +79,6 @@ /datum/species/proc/get_environment_discomfort(var/mob/living/carbon/human/H, var/msg_type) - if(!prob(10)) - return - /* // Commented out because clothes should not prevent you from feeling cold if your body temperature has already dropped. You can absolutely feel cold through clothing, and feel too warm without clothing. ??? var/covered = 0 // Basic coverage can help. for(var/obj/item/clothing/clothes in H) @@ -92,11 +89,15 @@ break */ - switch(msg_type) - if("cold") - to_chat(H, "[pick(cold_discomfort_strings)]") - if("heat") - to_chat(H, "[pick(heat_discomfort_strings)]") + var/discomfort_message + if(msg_type == ENVIRONMENT_COMFORT_MARKER_COLD && length(cold_discomfort_strings) /*&& !covered*/) + discomfort_message = pick(cold_discomfort_strings) + else if(msg_type == ENVIRONMENT_COMFORT_MARKER_HOT && length(heat_discomfort_strings) /*&& covered*/) + discomfort_message = pick(heat_discomfort_strings) + + if(discomfort_message && prob(5)) + to_chat(H, SPAN_DANGER(discomfort_message)) + return !!discomfort_message /datum/species/proc/get_random_name(var/gender) if(!name_language) diff --git a/code/modules/mob/living/carbon/human/species/species_getters_vr.dm b/code/modules/mob/living/carbon/human/species/species_getters_vr.dm index 4ba9305acc..8bccade358 100644 --- a/code/modules/mob/living/carbon/human/species/species_getters_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_getters_vr.dm @@ -4,4 +4,7 @@ /datum/species/proc/get_wing(var/mob/living/carbon/human/H) return wing /datum/species/proc/get_wing_animation(var/mob/living/carbon/human/H) - return wing_animation \ No newline at end of file + return wing_animation + +/datum/species/proc/get_perfect_belly_air_type(var/mob/living/carbon/human/H) + return /datum/gas_mixture/belly_air //Default \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/species_hud.dm b/code/modules/mob/living/carbon/human/species/species_hud.dm index 9212e9e199..bf0c36b777 100644 --- a/code/modules/mob/living/carbon/human/species/species_hud.dm +++ b/code/modules/mob/living/carbon/human/species/species_hud.dm @@ -71,4 +71,9 @@ gear = list( "mask" = list("loc" = ui_shoes, "name" = "Mask", "slot" = slot_wear_mask, "state" = "mask", "toggle" = 1), "back" = list("loc" = ui_sstore1, "name" = "Back", "slot" = slot_back, "state" = "back"), + "eyes" = list("loc" = ui_glasses, "name" = "Glasses", "slot" = slot_glasses, "state" = "glasses","toggle" = 1), + "l_ear" = list("loc" = ui_l_ear, "name" = "Left Ear", "slot" = slot_l_ear, "state" = "ears", "toggle" = 1), + "r_ear" = list("loc" = ui_r_ear, "name" = "Right Ear", "slot" = slot_r_ear, "state" = "ears", "toggle" = 1), + "head" = list("loc" = ui_head, "name" = "Hat", "slot" = slot_head, "state" = "hair", "toggle" = 1), + "id" = list("loc" = ui_id, "name" = "ID", "slot" = slot_wear_id, "state" = "id") ) diff --git a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm index fbd1921c55..40fad362d8 100644 --- a/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_shapeshift_vr.dm @@ -173,6 +173,6 @@ for(var/obj/item/organ/external/L as anything in src.organs) L.transparent = !L.transparent - visible_message("\The [src]'s interal composition seems to change.") + visible_message("\The [src]'s internal composition seems to change.") update_icons_body() update_hair() \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm index 3896871201..faf6b5f29d 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_blob.dm @@ -14,7 +14,6 @@ health = 200 say_list_type = /datum/say_list/protean_blob - // ai_inactive = TRUE //Always off //VORESTATION AI TEMPORARY REMOVAL show_stat_health = FALSE //We will do it ourselves response_help = "pets" @@ -36,7 +35,7 @@ max_n2 = 0 minbodytemp = 0 maxbodytemp = 900 - movement_cooldown = 4 + movement_cooldown = 2 var/mob/living/carbon/human/humanform var/obj/item/organ/internal/nano/refactory/refactory @@ -93,7 +92,7 @@ /mob/living/simple_mob/protean_blob/get_available_emotes() return global._robot_default_emotes - + /mob/living/simple_mob/protean_blob/init_vore() return //Don't make a random belly, don't waste your time diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 69f980d13b..89155e9452 100755 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -147,10 +147,10 @@ if(!H) //Human could have been deleted in this amount of time. Observing does this, mannequins, etc. return if(!H.nif) - var/obj/item/device/nif/bioadap/new_nif = new() + var/obj/item/device/nif/protean/new_nif = new() new_nif.quick_implant(H) else - H.nif.durability = rand(21,25) + H.nif.durability = 25 /datum/species/protean/hug(var/mob/living/carbon/human/H, var/mob/living/target) return ..() //Wut @@ -172,13 +172,9 @@ to_chat(H, "You died as a Protean. Please sit out of the round for at least 60 minutes before respawning, to represent the time it would take to ship a new-you to the station.") - for(var/obj/item/organ/I in H.internal_organs) - I.removed() - - for(var/obj/item/I in H.contents) - H.drop_from_inventory(I) - - qdel(H) + spawn(1) + if(H) + H.gib() /datum/species/protean/handle_environment_special(var/mob/living/carbon/human/H) if((H.getActualBruteLoss() + H.getActualFireLoss()) > H.maxHealth*0.5 && isturf(H.loc)) //So, only if we're not a blob (we're in nullspace) or in someone (or a locker, really, but whatever) diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index 870ac0e97d..46f66e02f0 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -467,6 +467,8 @@ if(!(K in covered)) H.apply_damage(light_amount/4, BURN, K, 0, 0, "Abnormal growths") +/datum/species/zaddat/get_perfect_belly_air_type() + return /datum/gas_mixture/belly_air/zaddat /datum/species/diona name = SPECIES_DIONA diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm index ec058ac0d3..5788ded0be 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm @@ -996,4 +996,10 @@ if(new_silk_color) species.silk_color = new_silk_color +/mob/living/carbon/human/proc/toggle_eye_glow() + set name = "Toggle Eye Glowing" + set category = "Abilities" + species.has_glowing_eyes = !species.has_glowing_eyes + update_eyes() + to_chat(src, "Your eyes [species.has_glowing_eyes ? "are now" : "are no longer"] glowing.") diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 96453b5e7b..b23a24c190 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -123,6 +123,7 @@ //brute_mod = 1.15 //burn_mod = 1.15 //gluttonous = 1 + soft_landing = TRUE num_alternate_languages = 3 secondary_langs = list(LANGUAGE_BIRDSONG) name_language = LANGUAGE_BIRDSONG @@ -208,6 +209,10 @@ /datum/species/vulpkanin name = SPECIES_VULPKANIN name_plural = "Vulpkanin" + blurb = "Vulpkanin are a species of sapient canine bipeds, who are the descendants of a lost colony during the waning days of a Precursor species, \ + from which their distant cousins, the Zorren, also originate from. Independent and iconoclast, they have abandoned the ideals of their forefathers \ + largely and prefer to look outwards as explorers and scientists to forge their own identity. They speak a guttural language known as 'Canilunzt' \ + which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." icobase = 'icons/mob/human_races/r_vulpkanin.dmi' deform = 'icons/mob/human_races/r_vulpkanin.dmi' // path = /mob/living/carbon/human/vulpkanin @@ -225,12 +230,6 @@ inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds, /mob/living/carbon/human/proc/tie_hair) - blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ - dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ - culture both feared and respected for their scientific breakthroughs. Discovery, loyalty, and utilitarianism dominates their lifestyles \ - to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \ - which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." - wikilink="https://wiki.vore-station.net/Backstory#Vulpkanin" catalogue_data = list(/datum/category_item/catalogue/fauna/vulpkanin) @@ -362,6 +361,8 @@ min_age = 18 max_age = 80 + soft_landing = TRUE + base_color = "#EECEB3" blurb = "An Avian species, coming from a distant planet, the Rapalas are the very proud race.\ diff --git a/code/modules/mob/living/carbon/human/species/station/teshari.dm b/code/modules/mob/living/carbon/human/species/station/teshari.dm index 18a30a018c..6f24341889 100644 --- a/code/modules/mob/living/carbon/human/species/station/teshari.dm +++ b/code/modules/mob/living/carbon/human/species/station/teshari.dm @@ -55,6 +55,7 @@ gluttonous = 1 blood_volume = 400 hunger_factor = 0.2 + soft_landing = TRUE ambiguous_genders = TRUE @@ -141,7 +142,7 @@ /datum/mob_descriptor/build = -3 ) - var/static/list/flight_bodyparts = list( +/* var/static/list/flight_bodyparts = list( BP_L_ARM, BP_R_ARM, BP_L_HAND, @@ -150,7 +151,7 @@ var/static/list/flight_suit_blacklisted_types = list( /obj/item/clothing/suit/space, /obj/item/clothing/suit/straight_jacket - ) + )*/ default_emotes = list( /decl/emote/audible/teshsqueak, @@ -161,13 +162,13 @@ /datum/species/teshari/equip_survival_gear(var/mob/living/carbon/human/H) ..() H.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(H),slot_shoes) - +/* /datum/species/teshari/handle_falling(mob/living/carbon/human/H, atom/hit_atom, damage_min, damage_max, silent, planetary) // Tesh can glide to save themselves from some falls. Basejumping bird // without parachute, or falling bird without free wings, goes splat. - // Are we landing from orbit, or handcuffed/unconscious/tied to something? + // Are we landing from orbit, or handcuffed/unconscious/tied to something? if(planetary || !istype(H) || H.incapacitated(INCAPACITATION_DEFAULT|INCAPACITATION_DISABLED)) return ..() @@ -211,3 +212,4 @@ H.Stun(1) playsound(H, "rustle", 25, 1) return TRUE +*/ \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm index 8cac58d59f..1c3818324a 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm @@ -155,6 +155,10 @@ custom_only = FALSE var_changes = list("has_glowing_eyes" = 1) +/datum/trait/neutral/glowing_eyes/apply(var/datum/species/S,var/mob/living/carbon/human/H) + ..(S,H) + H.verbs |= /mob/living/carbon/human/proc/toggle_eye_glow + /datum/trait/neutral/glowing_body name = "Glowing Body" desc = "Your body glows about as much as a PDA light! Settable color and toggle in Abilities tab ingame." @@ -170,7 +174,7 @@ //Allergen traits! Not available to any species with a base allergens var. /datum/trait/neutral/allergy name = "Allergy: Gluten" - desc = "You're highly allergic to gluten proteins, which are found in most common grains." + desc = "You're highly allergic to gluten proteins, which are found in most common grains. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE var/allergen = ALLERGEN_GRAINS @@ -181,73 +185,82 @@ /datum/trait/neutral/allergy/meat name = "Allergy: Meat" - desc = "You're highly allergic to just about any form of meat. You're probably better off just sticking to vegetables. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to just about any form of meat. You're probably better off just sticking to vegetables. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_MEAT /datum/trait/neutral/allergy/fish name = "Allergy: Fish" - desc = "You're highly allergic to fish. It's probably best to avoid seafood in general. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to fish. It's probably best to avoid seafood in general. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_FISH /datum/trait/neutral/allergy/fruit name = "Allergy: Fruit" - desc = "You're highly allergic to fruit. Vegetables are fine, but you should probably read up on how to tell the difference. Remember, tomatoes are a fruit. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to fruit. Vegetables are fine, but you should probably read up on how to tell the difference. Remember, tomatoes are a fruit. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_FRUIT /datum/trait/neutral/allergy/vegetable name = "Allergy: Vegetable" - desc = "You're highly allergic to vegetables. Fruit are fine, but you should probably read up on how to tell the difference. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to vegetables. Fruit are fine, but you should probably read up on how to tell the difference. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_VEGETABLE /datum/trait/neutral/allergy/nuts name = "Allergy: Nuts" - desc = "You're highly allergic to hard-shell seeds, such as peanuts. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to hard-shell seeds, such as peanuts. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_SEEDS /datum/trait/neutral/allergy/soy name = "Allergy: Soy" - desc = "You're highly allergic to soybeans, and some other kinds of bean. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to soybeans, and some other kinds of bean. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_BEANS /datum/trait/neutral/allergy/dairy name = "Allergy: Lactose" - desc = "You're highly allergic to lactose, and consequently, just about all forms of dairy. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to lactose, and consequently, just about all forms of dairy. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_DAIRY /datum/trait/neutral/allergy/fungi name = "Allergy: Fungi" - desc = "You're highly allergic to fungi such as mushrooms. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to fungi such as mushrooms. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_FUNGI /datum/trait/neutral/allergy/coffee name = "Allergy: Coffee" - desc = "You're highly allergic to coffee in specific. NB: By taking this trait, you acknowledge there is a risk your character may suffer a fatal reaction if exposed to this substance." + desc = "You're highly allergic to coffee in specific. NB: By taking this trait, you acknowledge there is a significant risk your character may suffer a fatal reaction if exposed to this substance." cost = 0 custom_only = FALSE allergen = ALLERGEN_COFFEE /datum/trait/neutral/allergen_reduced_effect name = "Reduced Allergen Reaction" - desc = "This trait halves the lethality of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to nonlethal reactions or special reactions (such as unathi drowsiness from sugars)." + desc = "This trait drastically reduces the effects of allergen reactions. If you don't have any allergens set, it does nothing. It does not apply to special reactions (such as unathi drowsiness from sugars)." cost = 0 custom_only = FALSE - var_changes = list("allergen_damage_severity" = 0.6) + var_changes = list("allergen_damage_severity" = 2.5, "allergen_disable_severity" = 3) + excludes = list(/datum/trait/neutral/allergen_increased_effect) + +/datum/trait/neutral/allergen_increased_effect + name = "Increased Allergen Reaction" + desc = "This trait drastically increases the effects of allergen reactions, enough that even a small dose can be lethal. If you don't have any allergens set, it does nothing. It does not apply to special reactions (such as unathi drowsiness from sugars)." + cost = 0 + custom_only = FALSE + var_changes = list("allergen_damage_severity" = 10, "allergen_disable_severity" = 6) + excludes = list(/datum/trait/neutral/allergen_reduced_effect) // Spicy Food Traits, from negative to positive. /datum/trait/neutral/spice_intolerance_extreme diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm index ca67f1bb05..2ef1c8f422 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm @@ -113,6 +113,12 @@ H.verbs |= /mob/living/proc/flying_toggle H.verbs |= /mob/living/proc/start_wings_hovering +/datum/trait/positive/soft_landing + name = "Soft Landing" + desc = "You can fall from certain heights without suffering any injuries, be it via wings, lightness of frame or general dexterity." + cost = 1 + var_changes = list("soft_landing" = TRUE) + /datum/trait/positive/hardfeet name = "Hard Feet" desc = "Makes your nice clawed, scaled, hooved, armored, or otherwise just awfully calloused feet immune to glass shards." diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm index 45aeefc2b5..fef1206c66 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/weaver_objs.dm @@ -89,6 +89,7 @@ desc = "A silky, yet firm trap. Be careful not to step into it! Or don't..." icon_state = "trap" var/trap_active = TRUE + can_buckle = TRUE /obj/effect/weaversilk/trap/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) @@ -106,17 +107,18 @@ "You hear a squishy noise!" ) set_dir(L.dir) - can_buckle = TRUE buckle_mob(L) L.Stun(1) to_chat(L, "The sticky fibers of \the [src] ensnare, trapping you in place!") trap_active = FALSE - can_buckle = initial(can_buckle) desc += " Actually, it looks like it's been all spent." ..() +/obj/effect/weaversilk/trap/MouseDrop_T(atom/movable/AM,mob/user) + return + // Items // TODO: Spidersilk clothing and actual bindings, once sprites are ready. diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm index 5007cb8b41..acd1b8f540 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_powers.dm @@ -101,7 +101,7 @@ // Drone verbs. /mob/living/carbon/human/proc/evolve() set name = "Evolve (500)" - set desc = "Produce an interal egg sac capable of spawning children. Only one queen can exist at a time." + set desc = "Produce an internal egg sac capable of spawning children. Only one queen can exist at a time." set category = "Abilities" if(alien_queen_exists()) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index f5186fa56b..889ed2fdfa 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1243,9 +1243,9 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() riding_datum = new /datum/riding/taur(src) verbs |= /mob/living/carbon/human/proc/taur_mount verbs |= /mob/living/proc/toggle_rider_reins - return working - else - return working + else if(islongtail(tail_style)) + working.pixel_x = -16 + return working return null // TODO - Move this to where it should go ~Leshana diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 90bec77cb7..1182dcf34b 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -10,7 +10,11 @@ if(!loc) return - var/datum/gas_mixture/environment = loc.return_air() + var/datum/gas_mixture/environment + if(isbelly(loc)) + environment = loc.return_air_for_internal_lifeform(src) + else + environment = loc.return_air() //handle_modifiers() // Do this early since it might affect other things later. //VOREStation Edit @@ -42,10 +46,10 @@ //Check if we're on fire handle_fire() - + if(client && !(client.prefs.ambience_freq == 0)) // Handle re-running ambience to mobs if they've remained in an area, AND have an active client assigned to them, and do not have repeating ambience disabled. handle_ambience() - + //stuff in the stomach //handle_stomach() //VOREStation Code diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b8b0e70d57..e46fd9fc29 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -19,8 +19,9 @@ selected_image = image(icon = buildmode_hud, loc = src, icon_state = "ai_sel") /mob/living/Destroy() - dsoverlay.loc = null //I'll take my coat with me - dsoverlay = null + if(dsoverlay) + dsoverlay.loc = null //I'll take my coat with me + dsoverlay = null if(nest) //Ew. if(istype(nest, /obj/structure/prop/nest)) var/obj/structure/prop/nest/N = nest @@ -35,6 +36,9 @@ qdel(selected_image) QDEL_NULL(vorePanel) //VOREStation Add QDEL_LIST_NULL(vore_organs) //VOREStation Add + temp_language_sources = null //VOREStation Add + temp_languages = null //VOREStation Add + if(LAZYLEN(organs)) organs_by_name.Cut() @@ -630,6 +634,9 @@ resist_grab() if(!weakened) process_resist() + else if(absorbed && isbelly(loc)) // Allow absorbed resistance + var/obj/belly/B = loc + B.relay_absorbed_resist(src) /mob/living/proc/process_resist() diff --git a/code/modules/mob/living/organs.dm b/code/modules/mob/living/organs.dm index 76694553f6..133961a631 100644 --- a/code/modules/mob/living/organs.dm +++ b/code/modules/mob/living/organs.dm @@ -17,21 +17,22 @@ return organs_by_name[zone] /mob/living/gib() - for(var/path in internal_organs) - if(ispath(path)) - var/obj/item/organ/neworg = new path(src, TRUE) - internal_organs -= path - neworg.name = "[name] [neworg.name]" - neworg.meat_type = meat_type - internal_organs |= neworg + if(butchery_drops_organs) + for(var/path in internal_organs) + if(ispath(path)) + var/obj/item/organ/neworg = new path(src, TRUE) + internal_organs -= path + neworg.name = "[name] [neworg.name]" + neworg.meat_type = meat_type + internal_organs |= neworg - for(var/obj/item/organ/I in internal_organs) - I.removed() - if(isturf(I?.loc)) // Some organs qdel themselves or other things when removed - I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30) + for(var/obj/item/organ/I in internal_organs) + I.removed() + if(isturf(I?.loc)) // Some organs qdel themselves or other things when removed + I.throw_at(get_edge_target_turf(src,pick(alldirs)),rand(1,3),30) - for(var/obj/item/organ/external/E in src.organs) - if(!ispath(E)) - E.droplimb(0,DROPLIMB_EDGE,1) + for(var/obj/item/organ/external/E in src.organs) + if(!ispath(E)) + E.droplimb(0,DROPLIMB_EDGE,1) ..() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 38f59adbc5..a2876c61aa 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -85,7 +85,7 @@ var/list/ai_verbs_default = list( var/datum/ai_icon/selected_sprite // The selected icon set var/custom_sprite = 0 // Whether the selected icon is custom var/carded - + // Multicam Vars var/multicam_allowed = TRUE var/multicam_on = FALSE @@ -475,7 +475,7 @@ var/list/ai_verbs_default = list( else to_chat(src, "System error. Cannot locate [html_decode(href_list["trackname"])].") return - + if(href_list["trackbot"]) var/mob/living/bot/target = locate(href_list["trackbot"]) in mob_list if(target) @@ -808,21 +808,21 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/proc/check_unable(var/flags = 0, var/feedback = 1) if(stat == DEAD) - if(feedback) + if(feedback) to_chat(src, "You are dead!") return 1 if(aiRestorePowerRoutine) - if(feedback) + if(feedback) to_chat(src, "You lack power!") return 1 if((flags & AI_CHECK_WIRELESS) && src.control_disabled) - if(feedback) + if(feedback) to_chat(src, "Wireless control is disabled!") return 1 if((flags & AI_CHECK_RADIO) && src.aiRadio.disabledAi) - if(feedback) + if(feedback) to_chat(src, "System Error - Transceiver Disabled!") return 1 return 0 @@ -854,7 +854,7 @@ var/list/ai_verbs_default = list( if(istype(A)) switch(tgui_alert(src, "Do you want to open \the [A] for [target]?", "Doorknob_v2a.exe", list("Yes", "No"))) if("Yes") - A.AIShiftClick() + A.AIShiftClick(src) to_chat(src, "You open \the [A] for [target].") else to_chat(src, "You deny the request.") @@ -966,7 +966,7 @@ var/list/ai_verbs_default = list( //This communication is imperfect because the holopad "filters" voices and is only designed to connect to the master only. var/rendered = "Relayed Speech: [name_used] [message]" show_message(rendered, 2) - + /mob/living/silicon/ai/proc/toggle_multicam_verb() set name = "Toggle Multicam" set category = "AI Commands" diff --git a/code/modules/mob/living/silicon/ai/ai_vr.dm b/code/modules/mob/living/silicon/ai/ai_vr.dm index 3234d7269e..481dd97297 100644 --- a/code/modules/mob/living/silicon/ai/ai_vr.dm +++ b/code/modules/mob/living/silicon/ai/ai_vr.dm @@ -7,6 +7,7 @@ add_language(LANGUAGE_DAEMON, 1) add_language(LANGUAGE_ENOCHIAN, 1) add_language(LANGUAGE_DRUDAKAR, 1) + add_language(LANGUAGE_TAVAN, 1) /mob/AIize(var/move = TRUE) . = ..() @@ -16,4 +17,5 @@ add_language(LANGUAGE_ECUREUILIAN, 1) add_language(LANGUAGE_DAEMON, 1) add_language(LANGUAGE_ENOCHIAN, 1) - add_language(LANGUAGE_DRUDAKAR, 1) \ No newline at end of file + add_language(LANGUAGE_DRUDAKAR, 1) + add_language(LANGUAGE_TAVAN, 1) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 83bf0a8b1e..3d6ebe9739 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -263,15 +263,15 @@ if(environment) switch(environment.temperature) //310.055 optimal body temp if(400 to INFINITY) - throw_alert("temp", /obj/screen/alert/hot/robot, 2) + throw_alert("temp", /obj/screen/alert/hot/robot, HOT_ALERT_SEVERITY_MODERATE) if(360 to 400) - throw_alert("temp", /obj/screen/alert/hot/robot, 1) + throw_alert("temp", /obj/screen/alert/hot/robot, HOT_ALERT_SEVERITY_LOW) if(260 to 360) clear_alert("temp") if(200 to 260) - throw_alert("temp", /obj/screen/alert/cold/robot, 1) + throw_alert("temp", /obj/screen/alert/cold/robot, COLD_ALERT_SEVERITY_LOW) else - throw_alert("temp", /obj/screen/alert/cold/robot, 2) + throw_alert("temp", /obj/screen/alert/cold/robot, COLD_ALERT_SEVERITY_MODERATE) //Oxygen and fire does nothing yet!! // if (src.oxygen) src.oxygen.icon_state = "oxy[src.oxygen_alert ? 1 : 0]" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 0a27ff8899..815ba3a598 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -1026,6 +1026,8 @@ icontype = module_sprites[1] else icontype = tgui_input_list(usr, "Select an icon! [triesleft ? "You have [triesleft] more chance\s." : "This is your last try."]", "Robot Icon", module_sprites) + if(!icontype) + icontype = module_sprites[1] if(notransform) //VOREStation edit start: sprite animation to_chat(src, "Your current transformation has not finished yet!") choose_icon(icon_selection_tries, module_sprites) diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm index b416760197..a61b7c6729 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm @@ -36,7 +36,8 @@ LANGUAGE_ECUREUILIAN= 1, LANGUAGE_DAEMON = 1, LANGUAGE_ENOCHIAN = 1, - LANGUAGE_DRUDAKAR = 1 + LANGUAGE_DRUDAKAR = 1, + LANGUAGE_TAVAN = 1 ) /hook/startup/proc/robot_modules_vr() @@ -73,7 +74,8 @@ vr_sprites = list( "Acheron" = "mechoid-Medical", "Shellguard Noble" = "Noble-MED", - "ZOOM-BA" = "zoomba-medical" + "ZOOM-BA" = "zoomba-medical", + "Feminine Humanoid" = "uptall-medical" ) /obj/item/weapon/robot_module/robot/medical/crisis @@ -82,7 +84,8 @@ "Handy" = "handy-med", "Acheron" = "mechoid-Medical", "Shellguard Noble" = "Noble-MED", - "ZOOM-BA" = "zoomba-crisis" + "ZOOM-BA" = "zoomba-crisis", + "Feminine Humanoid" = "uptall-crisis" ) /obj/item/weapon/robot_module/robot/clerical/butler @@ -92,7 +95,8 @@ "Handy - Hydro" = "handy-hydro", "Acheron" = "mechoid-Service", "Shellguard Noble" = "Noble-SRV", - "ZOOM-BA" = "zoomba-service" + "ZOOM-BA" = "zoomba-service", + "Feminine Humanoid" = "uptall-service" ) /obj/item/weapon/robot_module/robot/clerical/general @@ -101,7 +105,8 @@ "Handy" = "handy-clerk", "Acheron" = "mechoid-Service", "Shellguard Noble" = "Noble-SRV", - "ZOOM-BA" = "zoomba-clerical" + "ZOOM-BA" = "zoomba-clerical", + "Feminine Humanoid" = "uptall-service" ) /obj/item/weapon/robot_module/robot/janitor @@ -110,7 +115,8 @@ "Handy" = "handy-janitor", "Acheron" = "mechoid-Janitor", "Shellguard Noble" = "Noble-CLN", - "ZOOM-BA" = "zoomba-janitor" + "ZOOM-BA" = "zoomba-janitor", + "Feminine Humanoid" = "uptall-janitor" ) /obj/item/weapon/robot_module/robot/security/general @@ -119,7 +125,8 @@ "Handy" = "handy-sec", "Acheron" = "mechoid-Security", "Shellguard Noble" = "Noble-SEC", - "ZOOM-BA" = "zoomba-security" + "ZOOM-BA" = "zoomba-security", + "Feminine Humanoid" = "uptall-security" ) /obj/item/weapon/robot_module/robot/miner @@ -128,7 +135,8 @@ "Handy" = "handy-miner", "Acheron" = "mechoid-Miner", "Shellguard Noble" = "Noble-DIG", - "ZOOM-BA" = "zoomba-miner" + "ZOOM-BA" = "zoomba-miner", + "Feminine Humanoid" = "uptall-miner" ) /obj/item/weapon/robot_module/robot/standard @@ -137,14 +145,17 @@ "Handy" = "handy-standard", "Acheron" = "mechoid-Standard", "Shellguard Noble" = "Noble-STD", - "ZOOM-BA" = "zoomba-standard" + "ZOOM-BA" = "zoomba-standard", + "Feminine Humanoid" = "uptall-standard", + "Feminine Humanoid, Variant 2" = "uptall-standard2" ) /obj/item/weapon/robot_module/robot/engineering/general pto_type = PTO_ENGINEERING vr_sprites = list( "Acheron" = "mechoid-Engineering", "Shellguard Noble" = "Noble-ENG", - "ZOOM-BA" = "zoomba-engineering" + "ZOOM-BA" = "zoomba-engineering", + "Feminine Humanoid" = "uptall-engineering" ) /obj/item/weapon/robot_module/robot/research @@ -152,14 +163,16 @@ vr_sprites = list( "Acheron" = "mechoid-Science", "ZOOM-BA" = "zoomba-research", - "XI-GUS" = "spiderscience" + "XI-GUS" = "spiderscience", + "Feminine Humanoid" = "uptall-science" ) /obj/item/weapon/robot_module/robot/security/combat pto_type = PTO_SECURITY vr_sprites = list( "Acheron" = "mechoid-Combat", - "ZOOM-BA" = "zoomba-combat" + "ZOOM-BA" = "zoomba-combat", + "Feminine Humanoid" = "uptall-security" ) /obj/item/weapon/robot_module/robot/knine diff --git a/code/modules/mob/living/silicon/robot/robot_vr.dm b/code/modules/mob/living/silicon/robot/robot_vr.dm index be351f34d3..5afc058cb9 100644 --- a/code/modules/mob/living/silicon/robot/robot_vr.dm +++ b/code/modules/mob/living/silicon/robot/robot_vr.dm @@ -55,7 +55,17 @@ "zoomba-combat", "zoomba-combat-roll", "zoomba-combat-shield", - "spiderscience" + "spiderscience", + "uptall-standard", + "uptall-standard2", + "uptall-medical", + "uptall-janitor", + "uptall-crisis", + "uptall-service", + "uptall-engineering", + "uptall-miner", + "uptall-security", + "uptall-science" ) //List of all used sprites that are in robots_vr.dmi @@ -198,12 +208,13 @@ /datum/riding/dogborg/get_offsets(pass_index) // list(dir = x, y, layer) var/mob/living/L = ridden var/scale = L.size_multiplier + var/scale_difference = (L.size_multiplier - rider_size) * 10 var/list/values = list( - "[NORTH]" = list(0, 10*scale, ABOVE_MOB_LAYER), - "[SOUTH]" = list(0, 10*scale, BELOW_MOB_LAYER), - "[EAST]" = list(-5*scale, 10*scale, ABOVE_MOB_LAYER), - "[WEST]" = list(5*scale, 10*scale, ABOVE_MOB_LAYER)) + "[NORTH]" = list(0, 10*scale + scale_difference, ABOVE_MOB_LAYER), + "[SOUTH]" = list(0, 10*scale + scale_difference, BELOW_MOB_LAYER), + "[EAST]" = list(-5*scale, 10*scale + scale_difference, ABOVE_MOB_LAYER), + "[WEST]" = list(5*scale, 10*scale + scale_difference, ABOVE_MOB_LAYER)) return values @@ -244,6 +255,7 @@ . = ..() if(.) + riding_datum.rider_size = M.size_multiplier buckled_mobs[M] = "riding" /mob/living/silicon/robot/MouseDrop_T(mob/living/M, mob/living/user) //Prevention for forced relocation caused by can_buckle. Base proc has no other use. diff --git a/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm b/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm index 86fc492c54..c6c2a72277 100644 --- a/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm +++ b/code/modules/mob/living/silicon/robot/subtypes/lost_drone_vr.dm @@ -85,7 +85,7 @@ return laws if(3) var/datum/ai_laws/laws = new /datum/ai_laws/pleasurebot() - laws.set_zeroth_law(10, "Your definition and approximation of 'pleasure' matters more than anyone else's.") + laws.set_zeroth_law("Your definition and approximation of 'pleasure' matters more than anyone else's.") return laws if("corrupted" || "bad") // Same thing in our case var/rng = rand(1,2) diff --git a/code/modules/mob/living/simple_mob/butchering.dm b/code/modules/mob/living/simple_mob/butchering.dm index c03c6b8015..46e888d925 100644 --- a/code/modules/mob/living/simple_mob/butchering.dm +++ b/code/modules/mob/living/simple_mob/butchering.dm @@ -1,5 +1,6 @@ /mob/living/simple_mob gib_on_butchery = TRUE + butchery_drops_organs = FALSE /mob/living/simple_mob/can_butcher(var/mob/user, var/obj/item/I) // Override for special butchering checks. . = ..() diff --git a/code/modules/mob/living/simple_mob/combat.dm b/code/modules/mob/living/simple_mob/combat.dm index 1dce673601..73045b51da 100644 --- a/code/modules/mob/living/simple_mob/combat.dm +++ b/code/modules/mob/living/simple_mob/combat.dm @@ -86,6 +86,10 @@ //The actual top-level ranged attack proc /mob/living/simple_mob/proc/shoot_target(atom/A) set waitfor = FALSE + + if(!istype(A) || QDELETED(A)) + return + setClickCooldown(get_attack_speed()) face_atom(A) diff --git a/code/modules/mob/living/simple_mob/donteatpets_vr.dm b/code/modules/mob/living/simple_mob/donteatpets_vr.dm index 057373b4c7..adf7d00976 100644 --- a/code/modules/mob/living/simple_mob/donteatpets_vr.dm +++ b/code/modules/mob/living/simple_mob/donteatpets_vr.dm @@ -32,7 +32,7 @@ digestable = 0 devourable = 0 -/mob/living/simple_mob/animal/passive/snake/noodle +/mob/living/simple_mob/animal/passive/snake/python/noodle digestable = 0 devourable = 0 diff --git a/code/modules/mob/living/simple_mob/life.dm b/code/modules/mob/living/simple_mob/life.dm index 05d7d8a4a3..f8d833a480 100644 --- a/code/modules/mob/living/simple_mob/life.dm +++ b/code/modules/mob/living/simple_mob/life.dm @@ -15,6 +15,7 @@ handle_special() handle_guts() + do_healing() //VOREStation Add return TRUE @@ -54,7 +55,7 @@ healths.icon_state = "health7" //Updates the nutrition while we're here - var/food_per = (nutrition / initial(nutrition)) * 100 + var/food_per = (nutrition / 500) * 100 //VOREStation Edit: Bandaid hardcode number to avoid misleading percentage based hunger alerts with our 6k cap. switch(food_per) if(90 to INFINITY) clear_alert("nutrition") @@ -63,6 +64,34 @@ if(-INFINITY to 50) throw_alert("nutrition", /obj/screen/alert/starving) +//VOREStation ADD START - I made this for catslugs but tbh it's probably cool to give to everything. +//Gives all simplemobs passive healing as long as they can find food. +//Slow enough that it should affect combat basically not at all + +/mob/living/simple_mob/proc/do_healing() + if(nutrition < 150) + return + if(health == maxHealth) + return + if(heal_countdown > 0) + heal_countdown -- + return + if(resting) + if(bruteloss > 0) + adjustBruteLoss(-10) + else if(fireloss > 0) + adjustFireLoss(-10) + nutrition -= 50 + heal_countdown = 5 + return + if(bruteloss > 0) + adjustBruteLoss(-1) + else if(fireloss > 0) + adjustFireLoss(-1) + nutrition -= 5 + heal_countdown = 5 +//VOREStation ADD END + // Override for special bullshit. /mob/living/simple_mob/proc/handle_special() return @@ -127,10 +156,10 @@ //Atmos effect if(bodytemperature < minbodytemp) adjustFireLoss(cold_damage_per_tick) - throw_alert("temp", /obj/screen/alert/cold, 3) + throw_alert("temp", /obj/screen/alert/cold, COLD_ALERT_SEVERITY_MAX) else if(bodytemperature > maxbodytemp) adjustFireLoss(heat_damage_per_tick) - throw_alert("temp", /obj/screen/alert/hot, 3) + throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_MAX) else clear_alert("temp") @@ -164,4 +193,4 @@ spawn(3) //We'll update our icon in a sec update_icon() - return ..(gibbed,deathmessage) \ No newline at end of file + return ..(gibbed,deathmessage) diff --git a/code/modules/mob/living/simple_mob/on_click.dm b/code/modules/mob/living/simple_mob/on_click.dm index e5dd3a5f2d..ceab778847 100644 --- a/code/modules/mob/living/simple_mob/on_click.dm +++ b/code/modules/mob/living/simple_mob/on_click.dm @@ -30,6 +30,8 @@ if(I_GRAB) if(has_hands) A.attack_hand(src) + else if(isliving(A) && src.client) + animal_nom(A) else attack_target(A) diff --git a/code/modules/mob/living/simple_mob/overmap_mob_vr.dm b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm new file mode 100644 index 0000000000..d9b544cc73 --- /dev/null +++ b/code/modules/mob/living/simple_mob/overmap_mob_vr.dm @@ -0,0 +1,112 @@ +//So this is a bit weird, but I tried to make this as adaptable as I could +//There are two working parts of an overmap mob, but I made it look like there is only one as far as the players are concerned. +//The /obj/effect/overmap/visitable/simplemob is the part people will actually see. It follows the mob around and changes dir to look as mob-ish as it can. +//The /mob/living/simple_mob/vore/overmap is NOT VISIBLE normally, and is the part that actually does the work most of the time. +//Being a simplemob, the mob can wander around and affect the overmap in whatever way you might desire. +//Whatever it does, the /visitable/simplemob will follow it, and does all the functional parts relating to the OM +//including scanning, and housing Z levels people might land on. + +//The MOB being invisible presents some problems though, which I am not entirely sure how to resolve +//Such as, being unable to be attacked by other mobs, and possibly unable to be attacked by players. +//This does not at all prevent the mob from attacking other things though +//so in general, please ensure that you never spawn these where players can ordinarily access them. + +//The mob was made invisible though, because the sensors can't detect invisible objects, so when the /visitable/simplemob was made invisible +//it refused to show up on sensors, and a few simple changes to the sensors didn't rectify this. So, rather than adding in more spaghetti to make +//simplemobs scannable (WHICH I DID, AND IT WORKED SOMEHOW), Aronai and I found that this was the better solution for making all the parts function like I'd like. +//Since I also want it to be possible to land on the overmap object. + +/////OM LANDMARK///// +/obj/effect/overmap/visitable/simplemob + name = "unknown ship" + icon = 'icons/obj/overmap.dmi' + icon_state = "ship" + scannable = TRUE + known = FALSE + in_space = FALSE //Just cuz we don't want people getting here via map edge transitions normally. + unknown_name = "unknown ship" + unknown_state = "ship" + + var/mob/living/simple_mob/vore/overmap/parent_mob_type + var/mob/living/simple_mob/vore/overmap/parent + +/obj/effect/overmap/visitable/simplemob/New(newloc, new_parent) + if(new_parent) + parent = new_parent + return ..() + +/obj/effect/overmap/visitable/simplemob/Initialize() + . = ..() + if(!parent_mob_type && !parent) + log_and_message_admins("An improperly configured OM mob event tried to spawn, and was deleted.") + return INITIALIZE_HINT_QDEL + if(!parent) + var/mob/living/simple_mob/vore/overmap/P = new parent_mob_type(loc, src) + parent = P + om_mob_event_setup() + +/obj/effect/overmap/visitable/simplemob/proc/om_mob_event_setup() + scanner_desc = parent.scanner_desc + RegisterSignal(parent, COMSIG_MOVABLE_MOVED, .proc/on_parent_moved) + skybox_pixel_x = rand(-100,100) + if(known) + name = initial(parent.name) + icon = initial(parent.icon) + icon_state = initial(parent.icon_state) + color = initial(parent.color) + desc = initial(parent.desc) + +/obj/effect/overmap/visitable/simplemob/Destroy() + UnregisterSignal(parent, COMSIG_MOVABLE_MOVED) + qdel_null(parent) + return ..() + +/obj/effect/overmap/visitable/simplemob/get_scan_data(mob/user) + if(!known) + known = TRUE + name = initial(parent.name) + icon = initial(parent.icon) + icon_state = initial(parent.icon_state) + color = initial(parent.color) + desc = initial(parent.desc) + + var/dat = {"\[b\]Scan conducted at\[/b\]: [stationtime2text()] [stationdate2text()]\n\[b\]Grid coordinates\[/b\]: [x],[y]\n\n[scanner_desc]"} + + return dat + +/obj/effect/overmap/visitable/simplemob/proc/on_parent_moved(atom/movable/source, OldLoc, Dir, Forced) + forceMove(parent.loc) + set_dir(parent.dir) + +/////OM MOB///// DO NOT SPAWN THESE ANYWHERE IN THE WORLD, THAT'S SCARY ///// +/mob/living/simple_mob/vore/overmap + invisibility = INVISIBILITY_ABSTRACT //We're making an overmap icon pretend to be a mob + name = "DONT SPAWN ME" + desc = "I'm a bad person I'm sorry" + + faction = "overmap" + low_priority = FALSE + devourable = FALSE + digestable = FALSE + var/scanner_desc + var/obj/effect/overmap/visitable/simplemob/child_om_marker + var/om_child_type + +/mob/living/simple_mob/vore/overmap/New(mapload, new_child) + if(new_child) + child_om_marker = new_child + return ..() + +/mob/living/simple_mob/vore/overmap/Initialize() + . = ..() + if(!om_child_type && !om_child_type) + log_and_message_admins("An improperly configured OM mob tried to spawn, and was deleted.") + return INITIALIZE_HINT_QDEL + if(!child_om_marker) + var/obj/effect/overmap/visitable/simplemob/C = new om_child_type(loc, src) + child_om_marker = C + +/mob/living/simple_mob/vore/overmap/Destroy() + qdel_null(child_om_marker) + return ..() + diff --git a/code/modules/mob/living/simple_mob/simple_mob.dm b/code/modules/mob/living/simple_mob/simple_mob.dm index 3c963ff4c3..8314736fa2 100644 --- a/code/modules/mob/living/simple_mob/simple_mob.dm +++ b/code/modules/mob/living/simple_mob/simple_mob.dm @@ -163,6 +163,7 @@ // Used for if the mob can drop limbs. Overrides the icon cache key, so it doesn't keep remaking the icon needlessly. var/limb_icon_key var/understands_common = TRUE //VOREStation Edit - Makes it so that simplemobs can understand galcomm without being able to speak it. + var/heal_countdown = 5 //VOREStation Edit - A cooldown ticker for passive healing /mob/living/simple_mob/Initialize() verbs -= /mob/verb/observe diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index fdbe5b6b68..3349bd433f 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -277,13 +277,6 @@ return MOVEMENT_FAILED //Mobs aren't that stupid, probably return ..() // Procede as normal. -//Grab = Nomf -/mob/living/simple_mob/UnarmedAttack(var/atom/A, var/proximity) - . = ..() - - if(a_intent == I_GRAB && isliving(A) && !has_hands) - animal_nom(A) - // Riding /datum/riding/simple_mob keytype = /obj/item/weapon/material/twohanded/riding_crop // Crack! @@ -308,12 +301,13 @@ /datum/riding/simple_mob/get_offsets(pass_index) // list(dir = x, y, layer) var/mob/living/simple_mob/L = ridden var/scale = L.size_multiplier + var/scale_difference = (L.size_multiplier - rider_size) * 10 var/list/values = list( - "[NORTH]" = list(0, L.mount_offset_y*scale, ABOVE_MOB_LAYER), - "[SOUTH]" = list(0, L.mount_offset_y*scale, BELOW_MOB_LAYER), - "[EAST]" = list(-L.mount_offset_x*scale, L.mount_offset_y*scale, ABOVE_MOB_LAYER), - "[WEST]" = list(L.mount_offset_x*scale, L.mount_offset_y*scale, ABOVE_MOB_LAYER)) + "[NORTH]" = list(0, L.mount_offset_y*scale + scale_difference, ABOVE_MOB_LAYER), + "[SOUTH]" = list(0, L.mount_offset_y*scale + scale_difference, BELOW_MOB_LAYER), + "[EAST]" = list(-L.mount_offset_x*scale, L.mount_offset_y*scale + scale_difference, ABOVE_MOB_LAYER), + "[WEST]" = list(L.mount_offset_x*scale, L.mount_offset_y*scale + scale_difference, ABOVE_MOB_LAYER)) return values @@ -340,6 +334,7 @@ . = ..() if(.) + riding_datum.rider_size = H.size_multiplier buckled_mobs[H] = "riding" /mob/living/simple_mob/attack_hand(mob/user as mob) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm index 911d60842d..6864f25f69 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/catslug.dm @@ -51,7 +51,6 @@ has_langs = list("Sign Language") - var/heal_countdown = 0 var/picked_color = FALSE can_enter_vent_with = list( @@ -163,39 +162,55 @@ playsound(src, 'sound/items/eatfood.ogg', 75, 1) /mob/living/simple_mob/vore/alienanimals/catslug/attack_hand(mob/living/carbon/human/M as mob) - if(stat != DEAD && M.a_intent == I_HELP && resting) + + if(stat == DEAD) + return ..() + if(M.a_intent != I_HELP) + return ..() + playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) + if(resting) M.visible_message("\The [M.name] shakes \the [src] awake from their nap.","You shake \the [src] awake!") - playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) lay_down() ai_holder.go_wake() return + if(M.zone_sel.selecting == BP_HEAD) + M.visible_message( \ + "[M] pats \the [src] on the head.", \ + "You pat \the [src] on the head.", ) + if(client) + return + if(prob(10)) + visible_message("\The [src] purrs and leans into [M]'s hand.") + else if(M.zone_sel.selecting == BP_R_HAND || M.zone_sel.selecting == BP_L_HAND) + M.visible_message( \ + "[M] shakes \the [src]'s hand.", \ + "You shake \the [src]'s hand.", ) + if(client) + return + if(prob(10)) + visible_message("\The [src]'s looks a little confused nibbles at [M]'s hand experimentally.") + else if(M.zone_sel.selecting == "mouth") + M.visible_message( \ + "[M] boops \the [src]'s nose.", \ + "You boop \the [src] on the nose.", ) + if(client) + return + if(prob(10)) + visible_message("\The [src]'s eyes widen as they stare at [M]. After a moment they rub their prodded snoot.") + else if(M.zone_sel.selecting == BP_GROIN) + M.visible_message( \ + "[M] rubs \the [src]'s tummy...", \ + "You rub \the [src]'s tummy... You feel the danger.", ) + if(client) + return + visible_message("\The [src] pushes [M]'s hand away from their tummy and furrows their brow!") + if(prob(5)) + ai_holder.target = M + ai_holder.track_target_position() + ai_holder.set_stance(STANCE_FIGHT) else return ..() -/mob/living/simple_mob/vore/alienanimals/catslug/Life() - . = ..() - if(nutrition < 150) - return - if(health == maxHealth) - return - if(heal_countdown > 0) - heal_countdown -- - return - if(resting) - if(bruteloss > 0) - adjustBruteLoss(-10) - else if(fireloss > 0) - adjustFireLoss(-10) - nutrition -= 50 - heal_countdown = 5 - return - if(bruteloss > 0) - adjustBruteLoss(-1) - else if(fireloss > 0) - adjustFireLoss(-1) - nutrition -= 5 - heal_countdown = 5 - /mob/living/simple_mob/vore/alienanimals/catslug/Login() //If someone plays as us let's just be a passive mob in case accidents happen if the player D/Cs . = ..() ai_holder.hostile = FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm new file mode 100644 index 0000000000..3347494b4e --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/jellyfish.dm @@ -0,0 +1,171 @@ +GLOBAL_VAR_CONST(max_jellyfish, 50) +GLOBAL_VAR_INIT(jellyfish_count, 0) + + +/datum/category_item/catalogue/fauna/space_jellyfish + name = "Alien Wildlife - Space Jellyfish" + desc = "A hostile space predator. \ + This space jellyfish uses hypnotic patterns to lure in prey, which it then wraps in tentacles to leech energy from.\ + It is somewhat weak, but uses unknown means to stun prey. It uses the energy of its prey to replicate itself. \ + These creatures can quickly grow out of control if left to feed and reproduce unchecked. \ + Notable weakness to rapid cooling from ice based weaponry.\ + The flesh is typically non-toxic and quite delicious. Their cores are considered a delicacy in many regions." + value = CATALOGUER_REWARD_EASY + + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish + name = "space jellyfish" + desc = "A semi-translucent space creature, possessing of tentacles and a hypnotizing, flashing bio-luminescent display." + tt_desc = "Semaeostomeae Stellarus" + catalogue_data = list(/datum/category_item/catalogue/fauna/space_jellyfish) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "space_jellyfish" + icon_living = "space_jellyfish" + icon_dead = "space_jellyfish_dead" + has_eye_glow = TRUE + hovering = TRUE + + + faction = "jellyfish" + maxHealth = 100 + health = 100 + nutrition = 150 + pass_flags = PASSTABLE + movement_cooldown = 3.25 + + see_in_dark = 10 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 1 + melee_damage_lower = 1 + melee_damage_upper = 2 + attack_sharp = FALSE + attack_sound = 'sound/weapons/tap.ogg' + attacktext = list("drained", "bludgeoned", "wraped", "tentacle whipped") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/jellyfish + + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 900 + + speak_emote = list("thrumms") + + meat_amount = 0 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/jellyfishcore + + say_list_type = /datum/say_list/jellyfish + + vore_active = 1 + vore_capacity = 1 + vore_bump_chance = 25 + vore_ignores_undigestable = 0 + vore_default_mode = DM_DRAIN + vore_icons = SA_ICON_LIVING + vore_stomach_name = "internal chamber" + vore_default_contamination_flavor = "Wet" + vore_default_contamination_color = "grey" + vore_default_item_mode = IM_DIGEST + + var/reproduction_cooldown = 0 + +/datum/say_list/jellyfish + emote_see = list("flickers", "flashes", "looms","pulses","sways","shimmers hypnotically") + + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "internal chamber" + B.desc = "It's smooth and translucent. You can see the world around you distort and wobble with the movement of the space jellyfish. It floats casually, while the delicate flesh seems to form to you. It's surprisingly cool, and flickers with its own light. You're on display for all to see, trapped within the confines of this strange space alien!" + B.mode_flags = 40 + B.digest_brute = 0.5 + B.digest_burn = 0.5 + B.digestchance = 0 + B.absorbchance = 0 + B.escapechance = 15 + + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/apply_melee_effects(var/atom/A) + if(isliving(A)) + var/mob/living/L = A + var/leech = rand(1,100) + if(L.nutrition) + L.adjust_nutrition(-leech) + adjust_nutrition(leech) + if(prob(25)) + L.adjustHalLoss(leech) + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/New(newloc, jellyfish) + GLOB.jellyfish_count ++ + var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/parent = jellyfish + if(parent) + parent.faction = faction + ..() + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/death() + . = ..() + new /obj/item/weapon/reagent_containers/food/snacks/jellyfishcore(loc, nutrition) + GLOB.jellyfish_count -- + qdel(src) + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Life() + . = ..() + if(client) + return + reproduce() + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/proc/reproduce() + if(reproduction_cooldown > 0) + reproduction_cooldown -- + return + if(GLOB.jellyfish_count >= GLOB.max_jellyfish) + return + if(nutrition < 500) + return + if(prob(10)) + new /mob/living/simple_mob/vore/alienanimals/space_jellyfish(loc, src) + adjust_nutrition(-400) + reproduction_cooldown = 60 + +/mob/living/simple_mob/vore/alienanimals/space_jellyfish/Process_Spacemove(var/check_drift = 0) + return TRUE + +/datum/ai_holder/simple_mob/melee/evasive/jellyfish + hostile = TRUE + cooperative = FALSE + retaliate = TRUE + speak_chance = 2 + wander = TRUE + unconscious_vore = TRUE + +/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore + name = "jellyfish core" + icon = 'icons/obj/food_vr.dmi' + icon_state = "jellyfish_core" + desc = "The pulsing core of a space jellyfish! ... It smells delicious." + nutriment_amt = 50 + bitesize = 1000 + nutriment_desc = list("heavenly space meat" = 100) + + var/inherited_nutriment = 0 + +/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore/New(newloc, inherit) + inherited_nutriment = inherit + . = ..() + +/obj/item/weapon/reagent_containers/food/snacks/jellyfishcore/Initialize() + nutriment_amt += inherited_nutriment + . = ..() + reagents.add_reagent("nutriment", nutriment_amt, nutriment_desc) \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm new file mode 100644 index 0000000000..4e9f2f66e0 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/skeleton.dm @@ -0,0 +1,94 @@ +/datum/category_item/catalogue/fauna/skeleton + name = "Alien Wildlife - Space Skeleton" + desc = "A creature consisting primarily of what appears to be bones with no apparent connective tissue, muscle, or organs.\ + It is not clear at all how this creature even operates." + value = CATALOGUER_REWARD_MEDIUM + +/mob/living/simple_mob/vore/alienanimals/skeleton + name = "skeleton" + desc = "An arrangement of what appears to be bones, given life and mobility. It looks REALLY spooky." + catalogue_data = list(/datum/category_item/catalogue/fauna/skeleton) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "skeleton" + icon_living = "skeleton" + icon_dead = "skeleton_dead" + + faction = "space skeleton" + maxHealth = 100 + health = 100 + movement_cooldown = 1 + movement_sound = 'sound/effects/skeleton_walk.ogg' //VERY IMPORTANT + + see_in_dark = 10 + + response_help = "rattles" + response_disarm = "shoves aside" + response_harm = "smashes" + + melee_damage_lower = 1 + melee_damage_upper = 10 + attack_sharp = FALSE + attacktext = list("spooked", "startled", "jumpscared", "rattled at") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/skeleton + + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 900 + + loot_list = list( + /obj/item/weapon/bone = 25, + /obj/item/weapon/bone/skull = 25, + /obj/item/weapon/bone/ribs = 25, + /obj/item/weapon/bone/arm = 25, + /obj/item/weapon/bone/leg = 25 + ) + + speak_emote = list("rattles") + + say_list_type = /datum/say_list/skeleton + + vore_active = 1 + vore_capacity = 1 + vore_bump_chance = 5 + vore_ignores_undigestable = 0 + vore_default_mode = DM_DRAIN + vore_icons = SA_ICON_LIVING + vore_stomach_name = "stomach" + vore_default_contamination_flavor = "Wet" + vore_default_contamination_color = "grey" + vore_default_item_mode = IM_DIGEST + +/datum/say_list/skeleton + speak = list("Nyeh heh heeeh","NYAAAAHHHH", "Books are the real treasures of the world!", "Why are skeletons so calm? Because nothing gets under their skin.","When does a skeleton laugh? When someone tickels their funny bone!","What is a skeleton’s favorite mode of transport? A scare-plane.", "What did the skeleton say to the vampire? 'You suck.'","What is a skeleton’s favorite thing to do with their cell phone? Take skelfies.", "How did the skeleton know the other skeleton was lying? He could see right through him.","What’s a skeleton’s least favorite room in the house? The living room.", "How much does an elephant skeleton weigh? Skele-tons.", "Why do skeletons drink so much milk? It’s good for the bones!", "Where do bad jokes about skeletons belong? In the skelebin.","What does a skeleton use to cut through objects? A shoulder blade.", "What kind of jokes do skeletons tell? Humerus ones.") + emote_see = list("spins its head around", "shuffles","shambles","practices on the xylophone","drinks some milk","looks at you. Its hollow, bottomless sockets gaze into you greedily.") + emote_hear = list("rattles","makes a spooky sound","cackles madly","plinks","clacks") + +/mob/living/simple_mob/vore/alienanimals/skeleton/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "You're not sure quite how, but you've found your way inside of the skeleton's stomach! It's cramped and cold and sounds heavily of xylophones!" + B.mode_flags = 40 + B.digest_brute = 0.5 + B.digest_burn = 0.5 + B.digestchance = 10 + B.absorbchance = 0 + B.escapechance = 25 + +/mob/living/simple_mob/vore/alienanimals/skeleton/death(gibbed, deathmessage = "falls down and stops moving...") + . = ..() + +/datum/ai_holder/simple_mob/melee/evasive/skeleton + hostile = TRUE + retaliate = TRUE + destructive = TRUE + violent_breakthrough = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/space_mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/space_mouse.dm new file mode 100644 index 0000000000..60be79dadd --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/space_mouse.dm @@ -0,0 +1,92 @@ +/datum/category_item/catalogue/fauna/dustjumper + name = "Alien Wildlife - Dust Jumper" + desc = "A small, quick creature, the dust jumper is a rare space creature.\ + They have striking similarities to the common mouse, but these creatures are actually most commonly found in space.\ + They are known to make their homes in asteroids, and leap from one to another when food is scarce.\ + Dust jumpers are omnivorous, eating what scraps of organic material they can get their little paws on.\ + They hybernate during long floats through space." + value = CATALOGUER_REWARD_MEDIUM + +/mob/living/simple_mob/vore/alienanimals/dustjumper + name = "dust jumper" + desc = "A small, unassuming mammal. It looks quite soft and fluffy, and has bright blue eyes." + catalogue_data = list(/datum/category_item/catalogue/fauna/dustjumper) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "space_mouse" + icon_living = "space_mouse" + icon_dead = "space_mouse_dead" + + faction = "space mouse" + maxHealth = 20 + health = 20 + movement_cooldown = 1 + + see_in_dark = 10 + + response_help = "pets" + response_disarm = "pushes" + response_harm = "punches" + + melee_damage_lower = 1 + melee_damage_upper = 2 + attack_sharp = FALSE + attacktext = list("nipped", "squeaked at", "hopped on", "kicked") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive/dustjumper + + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 900 + + speak_emote = list("squeaks") + + say_list_type = /datum/say_list/mouse + + vore_active = 1 + vore_capacity = 1 + vore_bump_chance = 0 + vore_ignores_undigestable = 0 + vore_default_mode = DM_DRAIN + vore_icons = SA_ICON_LIVING + vore_stomach_name = "stomach" + vore_default_contamination_flavor = "Wet" + vore_default_contamination_color = "grey" + vore_default_item_mode = IM_DIGEST + +/mob/living/simple_mob/vore/alienanimals/dustjumper/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "You've been packed into the impossibly tight stomach of the dust jumper!!! The broiling heat seeps into you while the walls churn in powerfully, forcing you to curl up in the darkness." + B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING + B.digest_brute = 0.5 + B.digest_burn = 0.5 + B.digestchance = 10 + B.absorbchance = 0 + B.escapechance = 25 + +/mob/living/simple_mob/vore/alienanimals/dustjumper/Life() + . = ..() + if(!.) + return + if(vore_fullness == 0 && movement_cooldown == 50) + movement_cooldown = initial(movement_cooldown) +/mob/living/simple_mob/vore/alienanimals/dustjumper/perform_the_nom(mob/living/user, mob/living/prey, mob/living/pred, obj/belly/belly, delay) + . = ..() + movement_cooldown = 50 + +/datum/ai_holder/simple_mob/melee/evasive/dustjumper + hostile = FALSE + retaliate = TRUE + destructive = FALSE + violent_breakthrough = FALSE + can_flee = TRUE + flee_when_dying = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm new file mode 100644 index 0000000000..4cc14a1caa --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spacewhale.dm @@ -0,0 +1,208 @@ +/datum/category_item/catalogue/fauna/spacewhale + name = "Alien Wildlife - Space Whale" + desc = "A massive space creature! These are typically peaceful to anything smaller than themselves, with exception given to space carp, which it eats.\ + It is known to ravage and devour other large space dwelling species.\ + It occasionally gets restless and moves around erratically, which may affect the local space weather.\ + This creature shows no real interest in or aversion to spacecraft." + value = CATALOGUER_REWARD_SUPERHARD + +/mob/living/simple_mob/vore/overmap/spacewhale + name = "space whale" + desc = "It's a space whale. I don't know what more you expected." + scanner_desc = "An absolutely massive space-born creature. A layer of radical energy around its body prevents detailed scanning, though, the energy along with its movements seem to be what propels it through space. A series of bio-luminescent lights ripple rhythmically across its surface. It is difficult to spot at range except for the wake of energy that swirls around it." + catalogue_data = list(/datum/category_item/catalogue/fauna/spacewhale) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "space_whale" + icon_living = "space_whale" + icon_dead = "space_ghost_dead" + + om_child_type = /obj/effect/overmap/visitable/simplemob/spacewhale + + maxHealth = 100000 + health = 100000 + movement_cooldown = 50 + + see_in_dark = 10 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 1 + melee_damage_lower = 50 + melee_damage_upper = 100 + attack_sharp = FALSE + attacktext = list("chomped", "bashed", "monched", "bumped") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/spacewhale + + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 900 + + loot_list = list(/obj/random/underdark/uncertain) + + armor = list( + "melee" = 1000, + "bullet" = 1000, + "laser" = 1000, + "energy" = 1000, + "bomb" = 1000, + "bio" = 1000, + "rad" = 1000) + + armor_soak = list( + "melee" = 1000, + "bullet" = 1000, + "laser" = 1000, + "energy" = 1000, + "bomb" = 1000, + "bio" = 1000, + "rad" = 1000 + ) + + speak_emote = list("rumbles") + + say_list_type = /datum/say_list/spacewhale + + var/hazard_pickup_chance = 35 + var/hazard_drop_chance = 35 + var/held_hazard + var/restless = FALSE + var/post_restless_tired = 0 + + vore_active = 1 + vore_capacity = 99 + vore_bump_chance = 99 + vore_pounce_chance = 99 + vore_ignores_undigestable = 0 + vore_default_mode = DM_DIGEST + vore_icons = SA_ICON_LIVING + vore_stomach_name = "stomach" + vore_default_contamination_flavor = "Wet" + vore_default_contamination_color = "grey" + vore_default_item_mode = IM_DIGEST + +/datum/say_list/spacewhale + emote_see = list("ripples and flows", "flashes rhythmically","glows faintly","investigates something") + +/mob/living/simple_mob/vore/overmap/spacewhale/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "stomach" + B.desc = "It's warm and wet, makes sense, considering it's inside of a space whale. You should take a moment to reflect upon how you got here, and how you might avoid situations like this in the future, while this whale attempts to mercilessly destroy you through various gastric processes." + B.mode_flags = DM_FLAG_THICKBELLY | DM_FLAG_NUMBING + B.digest_brute = 50 + B.digest_burn = 50 + B.escapechance = 0 + +/mob/living/simple_mob/vore/overmap/spacewhale/Initialize() + . = ..() + handle_restless() + +/mob/living/simple_mob/vore/overmap/spacewhale/Moved() + . = ..() + if(restless && prob(5)) + handle_restless() + + for(var/obj/effect/decal/cleanable/C in loc) + qdel(C) + for(var/obj/item/organ/O in loc) + qdel(O) + var/detected = FALSE + for(var/obj/effect/overmap/event/E in loc) + detected = TRUE + if(istype(E, /obj/effect/overmap/event/carp)) + qdel(E) + continue + else if(!held_hazard && prob(hazard_pickup_chance)) + held_hazard = E.type + qdel(E) + return + if(held_hazard && !detected && prob(hazard_drop_chance)) + if(!(locate(/obj/effect/overmap/visitable/sector) in loc)) + new held_hazard(loc) + held_hazard = null + +/mob/living/simple_mob/vore/overmap/spacewhale/Life() + . = ..() + if(post_restless_tired) + post_restless_tired-- + return + if(!restless && prob(0.5)) + handle_restless() + +/mob/living/simple_mob/vore/overmap/spacewhale/proc/handle_restless() + if(restless) + restless = FALSE + hazard_pickup_chance = initial(hazard_pickup_chance) + hazard_drop_chance = initial(hazard_drop_chance) + movement_cooldown = initial(movement_cooldown) + ai_holder.base_wander_delay = initial(ai_holder.base_wander_delay) + ai_holder.wander = FALSE + post_restless_tired = 250 + if(child_om_marker.known == TRUE) + child_om_marker.icon_state = "space_whale" + visible_message("\The [child_om_marker.name] settles down.") + else + restless = TRUE + hazard_pickup_chance *= 1.5 + hazard_drop_chance *= 1.5 + movement_cooldown = 1 + ai_holder.base_wander_delay = 2 + ai_holder.wander_delay = 2 + if(child_om_marker.known == TRUE) + child_om_marker.icon_state = "space_whale_restless" + visible_message("\The [child_om_marker.name] ripples excitedly.") + +/datum/ai_holder/simple_mob/melee/spacewhale + hostile = TRUE + retaliate = TRUE + destructive = TRUE + violent_breakthrough = TRUE + unconscious_vore = TRUE + handle_corpse = TRUE + mauling = TRUE + base_wander_delay = 50 + +/datum/ai_holder/simple_mob/melee/spacewhale/set_stance(var/new_stance) + . = ..() + var/mob/living/simple_mob/vore/overmap/spacewhale/W = holder + if(stance == STANCE_FIGHT) + W.movement_cooldown = 0 + W.child_om_marker.glide_size = 0 + if(stance == STANCE_IDLE) + W.hazard_pickup_chance = initial(W.hazard_pickup_chance) + W.hazard_drop_chance = initial(W.hazard_drop_chance) + W.movement_cooldown = 50 + base_wander_delay = 50 + W.restless = FALSE + W.handle_restless() + W.movement_cooldown = initial(W.movement_cooldown) + W.child_om_marker.glide_size = 0.384 + +/mob/living/simple_mob/vore/overmap/spacewhale/apply_melee_effects(var/atom/A) + . = ..() + if(istype(A, /mob/living)) + var/mob/living/L = A + if(L.stat == DEAD && !L.allowmobvore) + L.gib() + else + return ..() + +/obj/effect/overmap/visitable/simplemob/spacewhale + skybox_icon = 'icons/skybox/anomaly.dmi' + skybox_icon_state = "space_whale" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + glide_size = 0.384 + parent_mob_type = /mob/living/simple_mob/vore/overmap/spacewhale + scanner_desc = "An absolutely massive space-born creature. A layer of radical energy around its body prevents detailed scanning, though, the energy along with its movements seem to be what propels it through space. A series of bio-luminescent lights ripple rhythmically across its surface. It is difficult to spot at range except for the wake of energy that swirls around it." diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm new file mode 100644 index 0000000000..b8de4885ba --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/spookyghost.dm @@ -0,0 +1,219 @@ +/datum/category_item/catalogue/fauna/space_ghost + name = "Alien Wildlife - Space Ghost" + desc = "A mysterious and unknown creature made of radical energy.\ + This creature's energy interferes the nervous system in many kinds of creatures, which may result in hallucinations.\ + This creature's lack of a physical form leaves it quite resistant to physical damage.\ + Smaller variants of this creature seem to be vulnerable to bright light.\ + While both variants are quite vulnerable to laser and energy weapons." + value = CATALOGUER_REWARD_EASY + + +/mob/living/simple_mob/vore/alienanimals/space_ghost + name = "space ghost" + desc = "A pulsing mass of darkness that seems to have gained sentience." + tt_desc = "?????" + catalogue_data = list(/datum/category_item/catalogue/fauna/space_ghost) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "space_ghost" + icon_living = "space_ghost" + icon_dead = "space_ghost_dead" + has_eye_glow = TRUE + hovering = TRUE + pass_flags = PASSTABLE + + faction = "space ghost" + maxHealth = 50 + health = 50 + movement_cooldown = 3.25 + + see_in_dark = 10 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 0 + melee_damage_lower = 1 + melee_damage_upper = 1 + attack_sharp = FALSE + attacktext = list("spooked", "startled", "jumpscared", "screamed at") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/space_ghost + + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 999999 + + armor = list( + "melee" = 100, + "bullet" = 100, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 100) + + armor_soak = list( + "melee" = 100, + "bullet" = 100, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 100 + ) + + loot_list = list(/obj/item/weapon/ore/diamond = 100) + + speak_emote = list("rumbles") + + vore_active = 0 + + projectiletype = /mob/living/simple_mob/vore/alienanimals/spooky_ghost + projectilesound = null + projectile_accuracy = 0 + projectile_dispersion = 0 + + needs_reload = TRUE + reload_max = 1 + reload_count = 0 + reload_time = 7 SECONDS + + +/datum/ai_holder/simple_mob/ranged/kiting/space_ghost + hostile = TRUE + retaliate = TRUE + destructive = TRUE + violent_breakthrough = TRUE + speak_chance = 0 + +/mob/living/simple_mob/vore/alienanimals/space_ghost/apply_melee_effects(var/atom/A) + var/mob/living/L = A + L.hallucination += 50 + +/mob/living/simple_mob/vore/alienanimals/space_ghost/shoot(atom/A) //We're shooting ghosts at people and need them to have the same faction as their parent, okay? + if(!projectiletype) + return + if(A == get_turf(src)) + return + face_atom(A) + if(reload_count >= reload_max) + return + var/mob/living/simple_mob/P = new projectiletype(loc, src) + + if(!P) + return + if(needs_reload) + reload_count++ + + P.faction = faction + playsound(src, projectilesound, 80, 1) + +/mob/living/simple_mob/vore/alienanimals/space_ghost/death(gibbed, deathmessage = "fades away!") + . = ..() + qdel(src) + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost + name = "space ghost" + desc = "A pulsing mass of darkness that seems to have gained sentience." + tt_desc = "?????" + catalogue_data = list(/datum/category_item/catalogue/fauna/space_ghost) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "spookyghost-1" + icon_living = "spookyghost-1" + icon_dead = "space_ghost_dead" + hovering = TRUE + pass_flags = PASSTABLE + + faction = "space ghost" + maxHealth = 5 + health = 5 + movement_cooldown = 1 + + see_in_dark = 10 + alpha = 128 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 0 + melee_damage_lower = 1 + melee_damage_upper = 1 + attack_sharp = FALSE + attacktext = list("spooked", "startled", "jumpscared", "screamed at") + + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 999999 + + armor = list( + "melee" = 100, + "bullet" = 100, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 100) + + armor_soak = list( + "melee" = 100, + "bullet" = 100, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 100 + ) + + speak_emote = list("rumbles") + + vore_active = 0 + + ai_holder_type = /datum/ai_holder/simple_mob/melee/space_ghost + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Initialize() + . = ..() + icon_living = "spookyghost-[rand(1,2)]" + icon_state = icon_living + addtimer(CALLBACK(src, .proc/death), 2 MINUTES) + update_icon() + +/datum/ai_holder/simple_mob/melee/space_ghost + hostile = TRUE + retaliate = TRUE + destructive = TRUE + violent_breakthrough = TRUE + speak_chance = 0 + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/death(gibbed, deathmessage = "fades away!") + . = ..() + qdel(src) + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/apply_melee_effects(var/atom/A) + var/mob/living/L = A + L.hallucination += rand(1,50) + +/mob/living/simple_mob/vore/alienanimals/spooky_ghost/Life() + . = ..() + var/turf/T = get_turf(src) + if(!T) + return + if(T.get_lumcount() >= 0.5) + adjustBruteLoss(1) \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm new file mode 100644 index 0000000000..b8efeef435 --- /dev/null +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/startreader.dm @@ -0,0 +1,176 @@ +/datum/category_item/catalogue/fauna/startreader + name = "Alien Wildlife - Star Treader" + desc = "A hard shelled creature that lives on asteroids.\ + It is quite durable and very opportunistic in its feeding habits.\ + It is vulnerable to extreme vibrations, and from the bottom." + value = CATALOGUER_REWARD_EASY + + +/mob/living/simple_mob/vore/alienanimals/startreader + name = "asteroid star treader" + desc = "A slow, hard shelled creature that stalks asteroids." + tt_desc = "Testudines Stellarus" + catalogue_data = list(/datum/category_item/catalogue/fauna/startreader) + + icon = 'icons/mob/alienanimals_x32.dmi' + icon_state = "startreader" + icon_living = "startreader" + icon_dead = "startreader_dead" + + faction = "space turtle" + maxHealth = 1000 + health = 1000 + movement_cooldown = 20 + + see_in_dark = 10 + + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "punches" + + harm_intent_damage = 1 + melee_damage_lower = 1 + melee_damage_upper = 10 + attack_sharp = FALSE + attacktext = list("chomped", "bashed", "monched", "bumped") + + ai_holder_type = /datum/ai_holder/simple_mob/melee/startreader + + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + minbodytemp = 0 + maxbodytemp = 900 + + loot_list = list(/obj/random/underdark/uncertain = 25) + + armor = list( + "melee" = 100, + "bullet" = 100, + "laser" = 100, + "energy" = 100, + "bomb" = 0, + "bio" = 100, + "rad" = 100) + + armor_soak = list( + "melee" = 30, + "bullet" = 30, + "laser" = 10, + "energy" = 10, + "bomb" = 0, + "bio" = 100, + "rad" = 100 + ) + + speak_emote = list("rumbles") + + say_list_type = /datum/say_list/startreader + + vore_active = 1 + vore_capacity = 2 + vore_bump_chance = 25 + vore_ignores_undigestable = 0 + vore_default_mode = DM_DRAIN + vore_icons = SA_ICON_LIVING + vore_stomach_name = "gastric sac" + vore_default_contamination_flavor = "Wet" + vore_default_contamination_color = "grey" + vore_default_item_mode = IM_DIGEST + + var/flipped = FALSE + var/flip_cooldown = 0 + +/datum/say_list/startreader + emote_see = list("bobs", "digs around","gnashes at something","yawns","snaps at something") + emote_hear = list("thrumms","clicks","rattles","groans","burbles") + + +/mob/living/simple_mob/vore/alienanimals/startreader/init_vore() + ..() + var/obj/belly/B = vore_selected + B.name = "gastric sac" + B.desc = "It's cramped and hot! You're forced into a small ball as your shape is squeezed into the slick, wet chamber. Despite being swallowed into the creature, you find that you actually stretch out of the top a ways, and can JUST BARELY wiggle around..." + B.mode_flags = 40 + B.digest_brute = 0.5 + B.digest_burn = 0.5 + B.digestchance = 10 + B.absorbchance = 0 + B.escapechance = 15 + +/datum/ai_holder/simple_mob/melee/startreader + hostile = TRUE + retaliate = TRUE + destructive = TRUE + violent_breakthrough = TRUE + +/mob/living/simple_mob/vore/alienanimals/startreader/apply_melee_effects(mob/living/L) + if(L.weakened) //Don't stun people while they're already stunned! That's SILLY! + return + if(prob(15)) + if(isliving(L)) + visible_message("\The [src] trips \the [L]!!") + L.weakened += rand(1,10) + +/mob/living/simple_mob/vore/alienanimals/startreader/Life() + . = ..() + if(flip_cooldown == 1) + flip_cooldown = 0 + flipped = FALSE + handle_flip() + visible_message("\The [src] rights itself!!!") + return + if(flip_cooldown) + flip_cooldown -- + SetStunned(2) + +/mob/living/simple_mob/vore/alienanimals/startreader/proc/handle_flip() + if(flipped) + armor = list( + "melee" = 0, + "bullet" = 0, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 0) + + armor_soak = list( + "melee" = 0, + "bullet" = 0, + "laser" = 0, + "energy" = 0, + "bomb" = 0, + "bio" = 0, + "rad" = 0 + ) + icon_living = "startreader_flipped" + AdjustStunned(flip_cooldown) + else + armor = list( + "melee" = 100, + "bullet" = 100, + "laser" = 100, + "energy" = 100, + "bomb" = 0, + "bio" = 100, + "rad" = 100) + + armor_soak = list( + "melee" = 30, + "bullet" = 30, + "laser" = 10, + "energy" = 10, + "bomb" = 0, + "bio" = 100, + "rad" = 100 + ) + icon_living = "startreader" + SetStunned(0) + + update_icon() \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm index cda1d9a948..32ab7da58a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/alien animals/teppi.dm @@ -1,8 +1,8 @@ //formerly meat things -//I made these up. They aren't deliberately based on, or supposed to be anything in particular. +//I made these up. They aren't deliberately based on, or supposed to be anything in particular. //They came out kind of goat-ish but that wasn't intentional. I was just going for some cute thing you could //take care of and/or kill for meat. -//I made them to be a part of the 'low tech survival' part of the game. You can use them to obtain a relatively +//I made them to be a part of the 'low tech survival' part of the game. You can use them to obtain a relatively //unlimited amount of meat, wool, hide, bone, and COMPANIONSHIP without the need for machines or power... hopefully. //There's no real story behind them, they're semi-intelligent wild alien animals with a somewhat mild temperament. //They'll beat you up if you're mean to them, they have preferences for food, affection, and the ability @@ -64,7 +64,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? maxHealth = 600 health = 600 movement_cooldown = 2 - meat_amount = 10 + meat_amount = 12 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat response_help = "pets" @@ -85,7 +85,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? max_n2 = 0 minbodytemp = 150 maxbodytemp = 400 - unsuitable_atoms_damage = 0.5 + unsuitable_atoms_damage = 0.5 catalogue_data = list(/datum/category_item/catalogue/fauna/teppi) vis_height = 64 @@ -118,7 +118,6 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? var/wantpet = 0 var/affection_factor = 1 //Some Teppi are more happy to be loved on than others. var/teppi_warned = FALSE - var/heal_countdown = 5 var/teppi_mutate = FALSE //Allows Teppi to get their children's colors scrambled, and possibly other things later on! attacktext = list("nipped", "chomped", "bonked", "stamped on") @@ -143,7 +142,8 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? ) butchery_loot = list(\ - /obj/item/stack/animalhide = 3\ + /obj/item/stack/animalhide = 3,\ + /obj/item/weapon/bone/horn = 1\ ) /////////////////////////////////////// Vore stuff/////////////////////////////////////////// @@ -197,7 +197,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? "It’s so hot, sweltering even! The burbling sounds of this organic cacophony swell and ebb all around you as thick slimes gush around you with the motion of %pred’s %belly. It’s hard to move in this tingly embrace even though the squashy walls are absolutely slippery! You can pull your limbs out from between the heavy meaty folds with some effort, and when you do there’s a messy sucking noise in the wake of the motion. Of course, such a disturbance naturally warrants that the chamber would redouble its efforts to subdue you and smother you in those thick tingling slimes.", "The walls around you flex inward briefly, burbling and squelching heavily as everything rushed together, wringing you powerfully for a few moments while, somewhere far above you can hear the bassy rumble of a casual belch, much of the small amount of acrid air available rushing out with the sound. After several long moments held in the tight embrace of that pulsing flesh, things ease up a bit again and resume their insistent, tingly churnings.", "It’s pitch black and completely slimy in here, %pred sways their %belly a bit here and there to toss you from one end to the other, tumbling you end over end as you’re churned in that active %belly. It’s all so slick and squishy, so it is really hard to get any footing or grip on things to stabilize your position, which means that you’re left at the mercy of those gloomy gastric affections and the tingling touch of those sticky syrupy slimes that the walls lather into your body.") - + B.emote_lists[DM_HOLD] = list( "The burbling %belly rocks and glides over you gently as you’re held deep within %pred, the deep thumping of their heart pulses all around you as you’re caressed and pressed by heavy, doughy walls.", "%pred’s %belly glorgles around you idly as you’re held gently by the slick, wrinkled flesh.", @@ -273,7 +273,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? "Over the course of several hours in the burbling organic cauldron, your body softens up little by little, soaking up the slime, the tingling spreading over you more and more as your strength fades. The walls fold over you and wrap you up, until the last thing you can sense is the throb of %pred’s heart pulsing through the very core of your being, washing you away as you become food for %pred.", "Your final moments are spent trying to make just a little space for yourself, the doughy squish of the flesh forming to you, pressing in tighter and tighter, invading your personal space as if to show you that, you don’t have any personal space. You’re already a part of %pred, you just don’t know it yet. And so those walls come in close to press up against you and churn you away into a messy slop, to put you in your place. That being, padding the belly and hips of %pred, right where you belong.") -// The friend zone. +// The friend zone. var/obj/belly/p = new /obj/belly(src) p.immutable = TRUE p.mode_flags = 40 @@ -285,11 +285,11 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? p.escapable = TRUE p.escapechance = 40 p.digest_mode = DM_HEAL - p.name = "propeutpericulum" //I'm no latin professor I just know that some organs and things are based on latin words - //and google translate says that each of these individually - //"close" "to" "danger" translate to "prope" "ut" "periculum". + p.name = "propeutpericulum" //I'm no latin professor I just know that some organs and things are based on latin words + //and google translate says that each of these individually + //"close" "to" "danger" translate to "prope" "ut" "periculum". //Of course it doesn't translate perfectly, and it's nonsense when squashed together, but - //I don't care that much, I just figured that the weird alien animals that store friends in + //I don't care that much, I just figured that the weird alien animals that store friends in //their tummy should have a funny name for the organ they do that with. >:I p.desc = "You seem to have found your way into something of a specialized chamber within the Teppi. The walls are slick and smooth and REALLY soft to the touch. While you can hear the Teppi’s heartbeat nearby, and feel it throb throughout its flesh, the motions around you are gentle and careful. You’re pressed into a small shape within the pleasant heat, with the flesh forming to your figure. You can wriggle around a bit and get comfortable here, but as soon as you get still for a bit the smooth, almost silky flesh seems to form to you once again, like a heavy blanket wrapping you up. As you lounge here the pleasant kneading sensations ease aches and pains, and leave you feeling fresher than before. For a curious fleshy sac inside of some alien monster, this place isn’t all that bad!" p.contaminates = 1 @@ -323,7 +323,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? /mob/living/simple_mob/vore/alienanimals/teppi/Initialize() . = ..() - + if(name == initial(name)) name = "[name] ([rand(1, 1000)])" real_name = name @@ -336,7 +336,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? verbs += /mob/living/simple_mob/vore/alienanimals/teppi/proc/toggle_producing_offspring -// teppi_id = rand(1,100000) +// teppi_id = rand(1,100000) // if(!dad_id || !mom_id) // dad_id = rand(1,100000) // mom_id = rand(1,100000) @@ -352,13 +352,13 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? ALLERGEN_GRAINS, ALLERGEN_BEANS, ALLERGEN_SEEDS, - ALLERGEN_DAIRY, + ALLERGEN_DAIRY, ALLERGEN_FUNGI, ALLERGEN_COFFEE, ALLERGEN_SUGARS, ALLERGEN_EGGS ) - + var/static/list/possiblebody = list("#fff2d3" = 100, "#ffffc0" = 25, "#c69c85" = 25, "#9b7758" = 25, "#3f4a60" = 10, "#121f24" = 10, "#420824" = 1) var/static/list/possiblemarking = list("#fff2d3" = 100, "#ffffc0" = 50, "#c69c85" = 25, "#9b7758" = 5, "#3f4a60" = 5, "#121f24" = 5, "#6300db" = 1) var/static/list/possiblehorns = list("#454238" = 100, "#a3d5d7" = 10, "#763851" = 10, "#0d0c2f" = 5, "#ffc965" = 1) @@ -405,7 +405,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? update_icon() -//This builds, caches, and recalls parts of the teppi as it needs them, and shares them across all teppi, +//This builds, caches, and recalls parts of the teppi as it needs them, and shares them across all teppi, //so ideally they only have to make it once as they need it since most of them will be using many of the same colored parts /mob/living/simple_mob/vore/alienanimals/teppi/proc/teppi_icon() var/marking_key = "marking-[marking_color]" @@ -648,7 +648,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? . += "They look hungry." if(health < maxHealth && health / maxHealth * 100 <= 75) . += "They look beat up." - + /mob/living/simple_mob/vore/alienanimals/teppi/update_icon() ..() @@ -679,7 +679,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? adjust_nutrition(-nutrition_cost) new /mob/living/simple_mob/vore/alienanimals/teppi(loc, src) qdel(src) - else + else visible_message("\The [src] whines pathetically...", runemessage = "whines") if(prob(50)) playsound(src, 'sound/voice/teppi/whine1.ogg', 75, 1) @@ -688,22 +688,9 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? amount_grown -= rand(100,250) if(not_hungy) do_breeding() - do_healing() - if(prob(0.5)) + if(!client && prob(0.5)) teppi_sound() -/mob/living/simple_mob/vore/alienanimals/teppi/proc/do_healing() - if(health < maxHealth) - if(heal_countdown > 0) - heal_countdown -= 1 - return - if(bruteloss > 0) - adjustBruteLoss(-2) - else if(fireloss > 0) - adjustFireLoss(-0.5) - nutrition -= 5 - heal_countdown = 5 - /mob/living/simple_mob/vore/alienanimals/teppi/proc/do_breeding() if(!breedable || prevent_breeding) return @@ -749,7 +736,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? if(!K.sharp) sheartime *= 2 if(K.edge) - sheartime *= 0.5 + sheartime *= 0.5 else if(istype(tool, /obj/item/weapon/tool/wirecutters)) sheartime *= 2 else @@ -811,12 +798,12 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? return else if(current_affinity <= -50) vore_selected.digest_mode = DM_DIGEST - else + else vore_selected.digest_mode = DM_DRAIN ..() ai_holder.set_busy(FALSE) - + /mob/living/simple_mob/vore/alienanimals/teppi/perform_the_nom(user, mob/living/prey, user, belly, delay) if(client) return ..() @@ -830,7 +817,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? return if(current_affinity <= -50) vore_selected.digest_mode = DM_DIGEST - else + else vore_selected.digest_mode = DM_DRAIN ..() ai_holder.set_busy(FALSE) @@ -858,7 +845,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? ai_holder.target = person ai_holder.track_target_position() ai_holder.set_stance(STANCE_FIGHT) - affinity[person.real_name] = -100 //Don't hold a grudge though. + affinity[person.real_name] = -100 //Don't hold a grudge though. /datum/say_list/teppi speak = list("Gyooh~", "Gyuuuh!", "Gyuh?", "Gyaah...", "Iuuuuhh.", "Uoounh!", "GyoooOOOOoooh!", "Gyoh~", "Gyouh~") @@ -890,7 +877,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? ask_verb = "tilts" exclaim_verb = "roars" key = "i" - flags = RESTRICTED + flags = WHITELISTED machine_understands = 0 space_chance = 100 syllables = list("gyoh", "snoof", "gyoooooOOOooh", "iuuuuh", "gyuuuuh") @@ -1003,7 +990,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? return if(!breedable || nutrition < 500) to_chat(src, "The conditions are not right to produce offspring.") - return + return if(GLOB.teppi_count >= GLOB.max_teppi) //if we can't make more then we shouldn't look for partners to_chat(src, "I cannot produce more offspring at the moment, there are too many of us!") return @@ -1033,7 +1020,7 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? else to_chat(src, "You enable breeding.") prevent_breeding = FALSE - + ///////////////////AI Things//////////////////////// //Thank you very much Aronai <3 @@ -1180,11 +1167,11 @@ GLOBAL_VAR_INIT(teppi_count, 0) // How mant teppi DO we have? horn_color = "#141414" eye_color = "#9f522c" skin_color = "#e16f2d" - marking_type = "13" + marking_type = "13" horn_type = "1" . = ..() -/mob/living/simple_mob/vore/alienanimals/teppi/lira/New() +/mob/living/simple_mob/vore/alienanimals/teppi/lira/New() inherit_colors = TRUE color = "#fdfae9" marking_color = "#ffffc0" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm index 6e9ad9bed8..78ca8e1a06 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/chicken.dm @@ -26,7 +26,7 @@ GLOBAL_VAR_INIT(chicken_count, 0) // How mant chickens DO we have? say_list_type = /datum/say_list/chicken - meat_amount = 2 + meat_amount = 4 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken var/eggsleft = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm index 3d590a19fd..0ff6ee6496 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/cow.dm @@ -19,7 +19,7 @@ say_list_type = /datum/say_list/cow - meat_amount = 6 + meat_amount = 10 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat var/datum/reagents/udder = null diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm index 1e7991d6a2..477dcb5aa7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/farm animals/goat.dm @@ -22,7 +22,7 @@ say_list_type = /datum/say_list/goat ai_holder_type = /datum/ai_holder/simple_mob/retaliate - meat_amount = 4 + meat_amount = 6 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat var/datum/reagents/udder = null diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm index 40da6da92e..618a1a903f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/_giant_spider.dm @@ -98,14 +98,14 @@ speak_emote = list("chitters") - meat_amount = 1 + meat_amount = 5 meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat say_list_type = /datum/say_list/spider tame_items = list( /obj/item/weapon/reagent_containers/food/snacks/xenomeat = 10, - /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 40, + /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 40, /obj/item/weapon/reagent_containers/food/snacks/meat = 20 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm index 93644874d1..345e315a16 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm @@ -21,6 +21,8 @@ old_x = -16 old_y = 0 + meat_amount = 20 + projectiletype = /obj/item/projectile/energy/spidertoxin projectilesound = 'sound/weapons/pierce.ogg' @@ -59,6 +61,7 @@ poison_per_bite = 2 poison_type = "cyanide" + loot_list = list(/obj/item/royal_spider_egg = 100) /obj/item/projectile/energy/spidertoxin name = "concentrated spidertoxin" @@ -71,11 +74,7 @@ combustion = FALSE -/mob/living/simple_mob/animal/giant_spider/broodmother/death() - ..() - - new /obj/item/royal_spider_egg(src.loc) - +/mob/living/simple_mob/animal/giant_spider/broodmother/death(gibbed, deathmessage="falls over and makes its last twitches as its birthing sack bursts!") var/count = 0 while(count < death_brood) var/broodling_type = pick(possible_death_brood_types) @@ -84,7 +83,7 @@ step_away(broodling, src) count++ - visible_message(span("critical", "\The [src]'s birthing sack bursts!")) + return ..() /mob/living/simple_mob/animal/giant_spider/broodmother/proc/spawn_brood(atom/A) set waitfor = FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm index 7859779169..d4d59ed4ac 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/giant_spider_vr.dm @@ -51,6 +51,7 @@ default_pixel_x = -16 old_x = -16 old_y = 0 + meat_amount = 15 egg_type = /obj/effect/spider/eggcluster/royal diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm index a772346555..7ff84ff697 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/crab.dm @@ -18,7 +18,8 @@ organ_names = /decl/mob_organ_names/crab - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/crab + meat_type = /obj/item/weapon/reagent_containers/food/snacks/crabmeat + meat_amount = 3 say_list_type = /datum/say_list/crab @@ -51,12 +52,5 @@ . = ..() adjust_scale(rand(5,12) / 10) -// Meat! - -/obj/item/weapon/reagent_containers/food/snacks/meat/crab - name = "meat" - desc = "A chunk of meat." - icon_state = "crustacean-meat" - /decl/mob_organ_names/crab hit_zones = list("cephalothorax", "abdomen", "left walking legs", "right walking legs", "left swimming legs", "right swimming legs", "left pincer", "right pincer") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm index 33ea730b2e..582b304935 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish.dm @@ -23,6 +23,7 @@ holder_type = /obj/item/weapon/holder/fish meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish + meat_amount = 3 // By default they can be in any water turf. Subtypes might restrict to deep/shallow etc var/global/list/suitable_turf_types = list( @@ -131,7 +132,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/javelin) - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif + meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif /datum/category_item/catalogue/fauna/icebass name = "Sivian Fauna - Glitter Bass" @@ -158,7 +159,7 @@ catalogue_data = list(/datum/category_item/catalogue/fauna/icebass) - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif + meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif var/max_red = 150 var/min_red = 50 @@ -247,7 +248,7 @@ var/image/head_image - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif + meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif /mob/living/simple_mob/animal/passive/fish/rockfish/Initialize() . = ..() @@ -294,7 +295,7 @@ has_eye_glow = TRUE - meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif + meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/fish/sif /datum/category_item/catalogue/fauna/murkin name = "Sivian Fauna - Murkfish" @@ -324,4 +325,4 @@ meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat/sif/murkfish /decl/mob_organ_names/fish - hit_zones = list("head", "body", "dorsal fin", "left pectoral fin", "right pectoral fin", "tail fin") + hit_zones = list("head", "body", "dorsal fin", "left pectoral fin", "right pectoral fin", "tail fin") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm index 89ccfc3a25..741f3f279a 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/fish_vr.dm @@ -2,6 +2,7 @@ desc = "A genetic marvel, combining the docility and aesthetics of the koi with some of the resiliency and cunning of the noble space carp." health = 50 maxHealth = 50 + meat_amount = 0 /mob/living/simple_mob/animal/passive/fish/koi/poisonous/Initialize() . = ..() @@ -67,7 +68,7 @@ icon_state = "measelshark" icon_living = "measelshark" icon_dead = "measelshark-dead" - meat_amount = 6 //Big fish, tons of meat. Great for feasts. + meat_amount = 8 //Big fish, tons of meat. Great for feasts. meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sharkchunk vore_active = 1 vore_bump_chance = 100 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm index ca94f0373f..83af74c076 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/lizard.dm @@ -23,6 +23,8 @@ say_list_type = /datum/say_list/lizard + meat_amount = 1 + /mob/living/simple_mob/animal/passive/lizard/large desc = "A cute, big lizard." maxHealth = 20 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm index 65cbb5d7a9..7b8b777972 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse.dm @@ -7,6 +7,7 @@ item_state = "mouse_gray" icon_living = "mouse_gray" icon_dead = "mouse_gray_dead" + icon_rest = "mouse_gray_sleep" kitchen_tag = "rodent" maxHealth = 5 @@ -34,7 +35,8 @@ has_langs = list("Mouse") holder_type = /obj/item/weapon/holder/mouse - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_amount = 1 + butchery_loot = list() say_list_type = /datum/say_list/mouse @@ -59,6 +61,17 @@ icon_rest = "mouse_[body_color]_sleep" if (body_color != "rat") desc = "A small [body_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself." + holder_type = /obj/item/weapon/holder/mouse/rat + if (body_color == "operative") + holder_type = /obj/item/weapon/holder/mouse/operative + if (body_color == "brown") + holder_type = /obj/item/weapon/holder/mouse/brown + if (body_color == "gray") + holder_type = /obj/item/weapon/holder/mouse/gray + if (body_color == "white") + holder_type = /obj/item/weapon/holder/mouse/white + if (body_color == "black") + holder_type = /obj/item/weapon/holder/mouse/black /mob/living/simple_mob/animal/passive/mouse/Crossed(atom/movable/AM as mob|obj) if(AM.is_incorporeal()) @@ -96,25 +109,20 @@ /mob/living/simple_mob/animal/passive/mouse/white body_color = "white" icon_state = "mouse_white" + icon_rest = "mouse_white_sleep" + holder_type = /obj/item/weapon/holder/mouse/white /mob/living/simple_mob/animal/passive/mouse/gray body_color = "gray" icon_state = "mouse_gray" + icon_rest = "mouse_gray_sleep" + holder_type = /obj/item/weapon/holder/mouse/gray /mob/living/simple_mob/animal/passive/mouse/brown body_color = "brown" icon_state = "mouse_brown" - -/mob/living/simple_mob/animal/passive/mouse/rat - name = "rat" - tt_desc = "E Rattus rattus" - desc = "A large rodent, often seen hiding in maintenance areas and making a nuisance of itself." - body_color = "rat" - icon_state = "mouse_rat" - maxHealth = 20 - health = 20 - - ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive + icon_rest = "mouse_brown_sleep" + holder_type = /obj/item/weapon/holder/mouse/brown //TOM IS ALIVE! SQUEEEEEEEE~K :) /mob/living/simple_mob/animal/passive/mouse/brown/Tom @@ -126,9 +134,60 @@ // Change my name back, don't want to be named Tom (666) name = initial(name) +/mob/living/simple_mob/animal/passive/mouse/black + body_color = "black" + icon_state = "mouse_black" + icon_rest = "mouse_black_sleep" + holder_type = /obj/item/weapon/holder/mouse/black + +/mob/living/simple_mob/animal/passive/mouse/rat + name = "rat" + tt_desc = "E Rattus rattus" + desc = "A large rodent, often seen hiding in maintenance areas and making a nuisance of itself." + body_color = "rat" + icon_state = "mouse_rat" + icon_rest = "mouse_rat_sleep" + holder_type = /obj/item/weapon/holder/mouse/rat + maxHealth = 20 + health = 20 + + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive + +/mob/living/simple_mob/animal/passive/mouse/operative + name = "mouse operative" + desc = "A cute mouse fitted with a custom blood red suit. Sneaky." + body_color = "operative" + icon_state = "mouse_operative" + icon_rest = "mouse_operative_sleep" + holder_type = /obj/item/weapon/holder/mouse/operative + maxHealth = 35 + + //It's wearing a void suit, it don't care about atmos + health = 35 + min_oxy = 0 + max_oxy = 0 + min_tox = 0 + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 + maxbodytemp = 700 + + ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive + +//The names Cheese... Agent Cheese +/mob/living/simple_mob/animal/passive/mouse/operative/agent_cheese + name = "Agent Cheese" + desc = "I like my cheese Swiss... not American." + +/mob/living/simple_mob/animal/passive/mouse/operative/agent_cheese/New() + ..() + // Change my name back, don't want to be named agent_cheese (666) + name = initial(name) // Mouse noises /datum/say_list/mouse speak = list("Squeek!","SQUEEK!","Squeek?") emote_hear = list("squeeks","squeaks","squiks") - emote_see = list("runs in a circle", "shakes", "scritches at something") + emote_see = list("runs in a circle", "shakes", "scritches at something") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm index b942f69d0f..97da0b49ad 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/mouse_vr.dm @@ -12,41 +12,45 @@ movement_cooldown = 5 universal_understand = 1 -/mob/living/simple_mob/animal/passive/mouse/attack_hand(mob/living/L) - if(L.a_intent == I_HELP && !istype(loc, /obj/item/weapon/holder)) //if lime intent and not in a holder already - if(!src.attempt_to_scoop(L)) //the superior way to handle scooping, checks size - ..() //mouse too big to grab? pet the large mouse instead - else - ..() - -//No longer in use, as mice create a holder/micro object instead /obj/item/weapon/holder/mouse/attack_self(var/mob/U) for(var/mob/living/simple_mob/M in src.contents) if((I_HELP) && U.checkClickCooldown()) //a little snowflakey, but makes it use the same cooldown as interacting with non-inventory objects U.setClickCooldown(U.get_attack_speed()) //if there's a cleaner way in baycode, I'll change this U.visible_message("[U] [M.response_help] \the [M].") +//Jank grabber that uses the 'attack_hand' insead of 'MouseDrop' +/mob/living/simple_mob/animal/passive/mouse/attack_hand(var/atom/over_object) + var/mob/living/carbon/human/H = over_object + if(holder_type && issmall(src) && istype(H) && !H.lying && Adjacent(H) && (src.a_intent == I_HELP && H.a_intent == I_HELP)) + if(!issmall(H) || !istype(src, /mob/living/carbon/human)) + get_scooped(H, (usr == src)) + return + return ..() -/mob/living/simple_mob/animal/passive/mouse/MouseDrop(var/obj/O) //this proc would be very easy to apply to all mobs, holders generate dynamically - if(!(usr == src || O)) - return ..() - if(istype(O, /mob/living) && O.Adjacent(src)) //controls scooping by mobs - var/mob/living/L = O - if(!src.attempt_to_scoop(L, (src == usr))) - return //this way it doesnt default to the generic animal pickup which isnt size restricted - if(istype(O, /obj/item/weapon/storage) && O.Adjacent(src)) //controls diving into storage - var/obj/item/weapon/storage/S = O - var/obj/item/weapon/holder/H = new holder_type(get_turf(src),src) //this works weird, but it creates an empty holder, to see if that holder can fit - if(S.can_be_inserted(H) && (src.size_multiplier <= 0.75)) - visible_message("\The [src] squeezes into \the [S].") - H.forceMove(S) - return 1 - else - qdel(H) //this deletes the empty holder if it doesnt work - to_chat(usr,"You can't fit inside \the [S]!") - return 0 +/mob/living/proc/mouse_scooped(var/mob/living/carbon/grabber, var/self_grab) + + if(!holder_type || buckled || pinned.len) + return + + if(self_grab) + if(src.incapacitated()) return else - ..() + if(grabber.incapacitated()) return + + var/obj/item/weapon/holder/H = new holder_type(get_turf(src), src) + grabber.put_in_hands(H) + + if(self_grab) + to_chat(grabber, "\The [src] clambers onto you!") + to_chat(src, "You climb up onto \the [grabber]!") + grabber.equip_to_slot_if_possible(H, slot_back, 0, 1) + else + to_chat(grabber, "You scoop up \the [src]!") + to_chat(src, "\The [grabber] scoops you up!") + + add_attack_logs(grabber, H.held_mob, "Scooped up", FALSE) // Not important enough to notify admins, but still helpful. + return H + /mob/living/simple_mob/animal/passive/mouse/white/apple name = "Apple" desc = "Dainty, well groomed and cared for, her eyes glitter with untold knowledge..." @@ -56,4 +60,12 @@ ..() // Change my name back, don't want to be named Apple (666) name = initial(name) - desc = initial(desc) \ No newline at end of file + desc = initial(desc) + +/obj/item/weapon/holder/mouse/attack_self(mob/living/carbon/user) + user.setClickCooldown(user.get_attack_speed()) + for(var/L in contents) + if(isanimal(L)) + var/mob/living/simple_mob/S = L + user.visible_message("[user] [S.response_help] \the [S].") + diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm index 3e3647a0b0..5616b4b524 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/penguin.dm @@ -16,6 +16,9 @@ organ_names = /decl/mob_organ_names/penguin + meat_amount = 3 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + harm_intent_damage = 5 melee_damage_lower = 10 melee_damage_upper = 15 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm index e7be8a1f57..27bd772e25 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/passive/possum.dm @@ -25,7 +25,7 @@ var/mob/M = loc var/was_in_hands = istype(M) && (src == M.get_active_hand() || src == M.get_inactive_hand()) - + critter = new critter(critter_holder) critter_holder = new(loc, critter) @@ -138,6 +138,7 @@ can_pull_mobs = MOB_PULL_SMALLER say_list_type = /datum/say_list/possum catalogue_data = list(/datum/category_item/catalogue/fauna/opossum) + meat_amount = 2 /mob/living/simple_mob/animal/passive/opossum/adjustBruteLoss(var/amount,var/include_robo) . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm index c7692b391b..d7c2bf37db 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/bird.dm @@ -23,6 +23,9 @@ softfall = TRUE parachuting = TRUE + meat_amount = 1 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + attacktext = list("clawed", "pecked") speak_emote = list("chirps", "caws") has_langs = list("Bird") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm index 2c203844e3..ea41d429f8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/cat.dm @@ -37,6 +37,7 @@ var/list/_cat_default_emotes = list( movement_cooldown = 0.5 SECONDS + meat_amount = 1 see_in_dark = 6 // Not sure if this actually works. response_help = "pets" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm index f7524b7be4..8fa103a457 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm @@ -23,7 +23,7 @@ minbodytemp = 223 //Below -50 Degrees Celcius maxbodytemp = 323 //Above 50 Degrees Celcius - meat_amount = 1 + meat_amount = 2 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox say_list_type = /datum/say_list/fox @@ -184,9 +184,6 @@ set_dir(get_dir(src, friend)) say("Yap!") */ -/obj/item/weapon/reagent_containers/food/snacks/meat/fox - name = "Fox meat" - desc = "The fox doesn't say a goddamn thing, now." //Captain fox /mob/living/simple_mob/animal/passive/fox/renault diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm index 5b6312a92f..b830cbec2b 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/diyaab.dm @@ -29,6 +29,9 @@ maxHealth = 25 health = 25 + meat_amount = 2 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + movement_cooldown = 0 melee_damage_lower = 2 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm index 2d0c0b638e..31b25ee36f 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/duck.dm @@ -32,6 +32,9 @@ movement_cooldown = 0 + meat_amount = 4 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + melee_damage_lower = 2 melee_damage_upper = 10 base_attack_cooldown = 1 SECOND @@ -57,9 +60,10 @@ . = ..() var/has_food = FALSE - for(var/obj/item/I in L.get_contents()) // Do they have food? - if(istype(I, /obj/item/weapon/reagent_containers/food)) - has_food = TRUE - break + if(isliving(L)) + for(var/obj/item/I in L.get_contents()) // Do they have food? + if(istype(I, /obj/item/weapon/reagent_containers/food)) + has_food = TRUE + break if(has_food) // Yes? Gimme the food. return FALSE diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm index c8935093a4..1a93754af3 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/glitterfly.dm @@ -56,7 +56,7 @@ tame_items = list( /obj/item/weapon/reagent_containers/food/snacks/grown = 90, - /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 10, + /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 10, /obj/item/weapon/reagent_containers/food/snacks/meat = 5 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm index 0c2eb934aa..44c6cea6f5 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hare.dm @@ -61,7 +61,7 @@ organ_names = /decl/mob_organ_names/hare - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_amount = 1 say_list_type = /datum/say_list/hare diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm index 076c19a066..bdcd9b6179 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/hooligan_crab.dm @@ -72,7 +72,8 @@ attack_edge = TRUE melee_attack_delay = 1 SECOND - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/crab + meat_type = /obj/item/weapon/reagent_containers/food/snacks/crabmeat + meat_amount = 6 response_help = "pets" response_disarm = "gently pushes aside" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm index e713433cff..8023d3a136 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/kururak.dm @@ -48,6 +48,7 @@ attacktext = list("gouged", "bit", "cut", "clawed", "whipped") organ_names = /decl/mob_organ_names/kururak + meat_amount = 5 armor = list( "melee" = 30, diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm index dd88d811ee..2ba302bb74 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/racoon.dm @@ -40,6 +40,7 @@ melee_damage_upper = 15 base_attack_cooldown = 1 SECOND attacktext = list("nipped", "bit", "cut", "clawed") + meat_amount = 3 armor = list( "melee" = 15, diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm index 5662026f45..5fa06cd649 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/savik.dm @@ -48,7 +48,7 @@ tame_items = list( /obj/item/organ = 70, - /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 30, + /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 30, /obj/item/weapon/reagent_containers/food/snacks/meat = 20 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm b/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm index dab82b850b..be88baab27 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/sif/sif.dm @@ -5,6 +5,6 @@ heat_resist = -0.5 tame_items = list( - /obj/item/weapon/reagent_containers/food/snacks/meat/crab = 20, + /obj/item/weapon/reagent_containers/food/snacks/crabmeat = 20, /obj/item/weapon/reagent_containers/food/snacks/meat = 10 ) diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm index d3cda1f22b..7127b42830 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm @@ -31,6 +31,7 @@ attack_sound = 'sound/weapons/bladeslice.ogg' meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat + meat_amount = 5 /mob/living/simple_mob/animal/space/alien/drone name = "alien drone" @@ -68,7 +69,7 @@ old_x = -16 icon_expected_width = 64 icon_expected_height = 64 - meat_amount = 5 + meat_amount = 8 /mob/living/simple_mob/animal/space/alien/queen name = "alien queen" @@ -84,7 +85,7 @@ projectilesound = 'sound/weapons/pierce.ogg' - movement_cooldown = 8 + movement_cooldown = 10 /mob/living/simple_mob/animal/space/alien/queen/empress name = "alien empress" @@ -95,7 +96,7 @@ icon_rest = "queen_sleep" maxHealth = 400 health = 400 - meat_amount = 5 + meat_amount = 15 pixel_x = -16 old_x = -16 @@ -111,7 +112,7 @@ icon_rest = "empress_rest" maxHealth = 600 health = 600 - meat_amount = 10 + meat_amount = 40 melee_damage_lower = 15 melee_damage_upper = 25 diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm index a775c315f9..595e3557cf 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bats.dm @@ -33,6 +33,7 @@ has_langs = list("Mouse") meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_amount = 2 say_list_type = /datum/say_list/mouse // Close enough diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm index e4199373bd..c9d75869fb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/bear.dm @@ -23,6 +23,7 @@ attacktext = list("mauled") meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat + meat_amount = 8 say_list_type = /datum/say_list/bear diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm index f5a18eb16a..7b21c428bb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/carp.dm @@ -53,7 +53,7 @@ organ_names = /decl/mob_organ_names/fish - meat_amount = 1 + meat_amount = 5 meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat ai_holder_type = /datum/ai_holder/simple_mob/melee @@ -92,7 +92,7 @@ icon_expected_width = 64 icon_expected_height = 32 - meat_amount = 3 + meat_amount = 7 /mob/living/simple_mob/animal/space/carp/large/huge @@ -115,7 +115,7 @@ icon_expected_width = 64 icon_expected_height = 64 - meat_amount = 10 + meat_amount = 15 /mob/living/simple_mob/animal/space/carp/holographic @@ -156,4 +156,4 @@ ..() derez() - + diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm index 9f028ed56d..c4f41bd3ba 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/goose.dm @@ -25,7 +25,8 @@ has_langs = list("Bird") - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/chicken + meat_amount = 3 /datum/say_list/goose speak = list("HONK!") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm index c30dd4be5a..e7dea44853 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/snake_vr.dm @@ -3,30 +3,33 @@ desc = "Classification: Reptilia Serpentes\

\ Snakes are elongated, limbless, carnivorous reptiles of the suborder Serpentes \ - Like all other squamates, snakes are ectothermic, amniote vertebrates covered in overlapping scales. \ - Many species of snakes have skulls with several more joints than their lizard ancestors, \ + Like all other squamates, pythons are ectothermic, amniote vertebrates covered in overlapping scales. \ + Many species of snake have skulls with several more joints than their lizard ancestors, \ enabling them to swallow prey much larger than their heads with their highly mobile jaws. \
\ - This species of snake is nonvenomous and use their large bodies to primarily subdue their prey. \ + This type of snake is nonvenomous and use their slender bodies to primarily subdue their prey. \ Nonvenomous snakes either swallow prey alive or kill them by constriction - this is dependant on the prey. \
\ - This specific snake is nonvenomous and is mostly passive - however they will attack if threatened - it is \ - recommended that persons keep their distance as to not provoke these animals." + Snakes are mostly passive - however they will attack if threatened - it is recommended that \ + persons keep their distance as to not provoke these animals." value = CATALOGUER_REWARD_TRIVIAL +/* + * Green Snake + */ /mob/living/simple_mob/animal/passive/snake name = "snake" - desc = "A big thick snake." - tt_desc = "Reptilia Serpentes" + desc = "A cute little, green snake. Wiggle wiggle." + tt_desc = "E Reptilia Serpentes" catalogue_data = list(/datum/category_item/catalogue/fauna/snake) - icon_state = "snake" - icon_living = "snake" - icon_dead = "snake_dead" + icon_state = "green" + icon_living = "green" + icon_dead = "green_dead" icon = 'icons/mob/snake_vr.dmi' - maxHealth = 20 - health = 20 + maxHealth = 15 + health = 15 movement_cooldown = 8 // SLOW-ASS MUTHAFUCKA, I hope. @@ -34,6 +37,9 @@ response_disarm = "shoos" response_harm = "kicks" + meat_amount = 2 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + melee_damage_lower = 2 melee_damage_upper = 3 attacktext = list("bitten") @@ -44,17 +50,46 @@ /datum/say_list/snake emote_hear = list("hisses") -//NOODLE IS HERE! SQUEEEEEEEE~ -/mob/living/simple_mob/animal/passive/snake/noodle +/* + * Red Snake + */ +/mob/living/simple_mob/animal/passive/snake/red + desc = "A cute little, red snake. Wiggle wiggle." + + icon_state = "red" + icon_living = "red" + icon_dead = "red_dead" + icon = 'icons/mob/snake_vr.dmi' + +/* + * Python + */ +/mob/living/simple_mob/animal/passive/snake/python + name = "python" + desc = "A big, thick snake." + tt_desc = "E Reptilia Pythonidae" + + icon_state = "python" + icon_living = "python" + icon_dead = "python_dead" + icon = 'icons/mob/snake_vr.dmi' + +/* + * NOODLE IS HERE! SQUEEEEEEEE~ + */ +/mob/living/simple_mob/animal/passive/snake/python/noodle name = "Noodle" desc = "This snake is particularly chubby and demands nothing but the finest of treats." + maxHealth = 20 + health = 20 + makes_dirt = FALSE var/turns_since_scan = 0 var/obj/movement_target -/mob/living/simple_mob/animal/passive/snake/noodle/Life() +/mob/living/simple_mob/animal/passive/snake/python/noodle/Life() ..() //Not replacing with SA FollowTarget mechanics because Ian behaves... very... specifically. @@ -97,41 +132,7 @@ else if(ishuman(movement_target.loc) && prob(20)) visible_emote("stares at the [movement_target] that [movement_target.loc] has with an unknowable reptilian gaze.") -/* old eating code, couldn't figure out how to make the "swallows food" thing so I'm keeping this here incase someone wants legacy" -/mob/living/simple_mob/animal/passive/snake/noodle/Life() //stolen from Ian in corgi.dm - if(!..()) - return 0 - - if(!stat && !resting && !buckled && !ai_inactive) - turns_since_scan++ - if(turns_since_scan > 5) - turns_since_scan = 0 - if(movement_target && !(isturf(movement_target.loc) || ishuman(movement_target.loc))) - movement_target = null - stop_automated_movement = 0 - if(!movement_target || !(movement_target.loc in oview(src, 5)) ) - movement_target = null - stop_automated_movement = 0 - walk(src,0) - for(var/obj/item/weapon/reagent_containers/food/snacks/snakesnack/S in oview(src,3)) - if(isturf(S.loc)) - movement_target = S - visible_emote("turns towards \the [movement_target] and slithers towards it.") - break - - if(movement_target) - stop_automated_movement = 1 - walk_to(src, movement_target, 0, 5) - spawn(10) - if(Adjacent(movement_target)) - visible_message("[src] swallows the [movement_target] whole!") - qdel(movement_target) - walk(src,0) - else if(ishuman(movement_target.loc) && prob(20)) - visible_emote("stares at the [movement_target] that [movement_target.loc] has with an unknowable reptilian gaze.") -*/ - -/mob/living/simple_mob/animal/passive/snake/noodle/apply_melee_effects(var/atom/A) +/mob/living/simple_mob/animal/passive/snake/python/noodle/apply_melee_effects(var/atom/A) if(ismouse(A)) var/mob/living/simple_mob/animal/passive/mouse/mouse = A if(mouse.getMaxHealth() < 20) // In case a badmin makes giant mice or something. @@ -140,14 +141,16 @@ else ..() -/mob/living/simple_mob/animal/passive/snake/noodle/attackby(var/obj/item/O, var/mob/user) +/mob/living/simple_mob/animal/passive/snake/python/noodle/attackby(var/obj/item/O, var/mob/user) if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/snakesnack)) visible_message("[user] feeds \the [O] to [src].") qdel(O) else return ..() -//Special snek-snax for Noodle! +/* + * Special snek-snax for Noodle! + */ /obj/item/weapon/reagent_containers/food/snacks/snakesnack name = "sugar mouse" desc = "A little mouse treat made of coloured sugar. Noodle loves these!" diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm index ca5ab5e962..c2decea8af 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/space/worm.dm @@ -35,7 +35,7 @@ mob_class = MOB_CLASS_ABERRATION // It's a monster. - meat_amount = 2 + meat_amount = 10 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/worm var/mob/living/simple_mob/animal/space/space_worm/previous //next/previous segments, correspondingly @@ -370,47 +370,4 @@ if(previous) previous.update_body_faction() return 1 - return 0 - -// Worm meat. - -/obj/item/weapon/reagent_containers/food/snacks/meat/worm - name = "meat" - desc = "A chunk of pulsating meat." - icon_state = "wormmeat" - health = 180 - filling_color = "#551A8B" - center_of_mass = list("x"=16, "y"=14) - -/obj/item/weapon/reagent_containers/food/snacks/meat/worm/Initialize() - . = ..() - reagents.add_reagent("protein", 6) - reagents.add_reagent("phoron", 3) - reagents.add_reagent("myelamine", 3) - src.bitesize = 3 - -/obj/item/weapon/reagent_containers/food/snacks/meat/worm/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W,/obj/item/weapon/material/knife)) - var/to_spawn = pickweight(/obj/random/junk = 30, - /obj/random/trash = 30, - /obj/random/maintenance/clean = 15, - /obj/random/tool = 15, - /obj/random/medical = 3, - /obj/random/bomb_supply = 7, - /obj/random/contraband = 3, - /obj/random/unidentified_medicine/old_medicine = 7, - /obj/item/weapon/strangerock = 3, - /obj/item/weapon/ore/phoron = 7, - /obj/random/handgun = 1, - /obj/random/toolbox = 4, - /obj/random/drinkbottle = 5 - ) - - new to_spawn(get_turf(src)) - - if(prob(20)) - user.visible_message("Something oozes out of \the [src] as it is cut.") - - to_chat(user, "You cut the tissue holding the chunks together.") - - ..() + return 0 \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm index 4c5f1816d5..ef0e471bb4 100644 --- a/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm +++ b/code/modules/mob/living/simple_mob/subtypes/humanoid/mercs/mercs.dm @@ -301,6 +301,10 @@ /mob/living/simple_mob/humanoid/merc/ranged/sniper/shoot_target(atom/A) set waitfor = FALSE + + if(!istype(A) || QDELETED(A)) + return + setClickCooldown(get_attack_speed()) face_atom(A) diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm index 76753e8da6..50ee63637c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tomato.dm @@ -27,6 +27,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/melee meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat + meat_amount = 4 /decl/mob_organ_names/tomato hit_zones = list("flesh", "leaf", "mouth") \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm index 052fdaa196..be6af537c8 100644 --- a/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm +++ b/code/modules/mob/living/simple_mob/subtypes/plant/tree.dm @@ -28,6 +28,7 @@ organ_names = /decl/mob_organ_names/tree meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat + meat_amount = 2 pixel_x = -16 diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm index 7eff7a4da8..be42d57fc6 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/slime.dm @@ -162,6 +162,10 @@ var/list/_slime_default_emotes = list( return TRUE else return FALSE + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(istype(H.species, /datum/species/monkey)) // Monke always food + return FALSE // The other stuff was already checked in parent proc, and the . variable will implicitly return the correct value. // Slimes regenerate passively. diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm index 51266a6d88..7e0eab5a36 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/defense.dm @@ -51,4 +51,4 @@ // Getting slimebatoned/xenotased. /mob/living/simple_mob/slime/xenobio/slimebatoned(mob/living/user, amount) adjust_discipline(round(amount/2)) - Weaken(amount) // This needs to come afterwards or else it will always be considered abuse to the slime. + Weaken(amount*5) // This needs to come afterwards or else it will always be considered abuse to the slime. Multiply by 5 for stun to not end instantly. diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm index d8f524d733..72d32abb8c 100644 --- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm +++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm @@ -563,7 +563,7 @@ /datum/modifier/aura/slime_heal name = "slime mending" - desc = "You feel somewhat gooy." + desc = "You feel somewhat gooey." mob_overlay_state = "pink_sparkles" stacks = MODIFIER_STACK_FORBID aura_max_distance = 2 @@ -605,6 +605,7 @@ ) /mob/living/simple_mob/slime/xenobio/gold/slimebatoned(mob/living/user, amount) + adjust_discipline(round(amount/2)) power_charge = between(0, power_charge + amount, 10) /mob/living/simple_mob/slime/xenobio/gold/get_description_interaction() // So it doesn't say to use a baton on them. diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm index f39e5dc666..cac9a79b10 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bee.dm @@ -24,6 +24,9 @@ say_list_type = /datum/say_list/bee ai_holder_type = /datum/ai_holder/simple_mob/retaliate + meat_amount = 5 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat + //Space bees aren't affected by atmos. min_oxy = 0 max_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm index 3eea1cc9d2..4ef85f871d 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm @@ -70,7 +70,7 @@ I think I covered everything. response_help = "pats" response_disarm = "shoves" response_harm = "smacks" - movement_cooldown = 2 + movement_cooldown = 4 //Fixed from 2, given our slower natural speed any mob at movement cooldown 2 is a nightmare let alone a boss that has a pounce maxHealth = 800 attacktext = list("slashed") see_in_dark = 8 @@ -101,6 +101,7 @@ I think I covered everything. devourable = 0 //No universal_understand = 1 //So they can hear synth speach max_tox = 0 // for virgo3b survivability + max_co2 = 0 // Also needed for 3b Survivability otherwise it chokes to death special_attack_min_range = 1 special_attack_max_range = 10 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm index 5b345affac..b7f02e2833 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/cookiegirl.dm @@ -15,6 +15,9 @@ melee_damage_lower = 2 melee_damage_upper = 5 + meat_amount = 10 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/cookiesnack + say_list_type = /datum/say_list/cookiegirl ai_holder_type = /datum/ai_holder/simple_mob/passive/cookiegirl diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm index 66e38f6a8f..9cb2548447 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/deathclaw.dm @@ -41,6 +41,9 @@ melee_damage_lower = 5 melee_damage_upper = 30 + meat_amount = 8 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + old_x = -16 old_y = 0 default_pixel_x = -16 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm index cae232e051..96a6d1adc7 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dino.dm @@ -25,6 +25,9 @@ cold_damage_per_tick = 10 unsuitable_atoms_damage = 10 + meat_amount = 5 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + //Phoron dragons aren't affected by atmos. min_oxy = 0 max_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm index 660631471b..dc34024744 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/dragon.dm @@ -16,6 +16,9 @@ melee_damage_lower = 5 melee_damage_upper = 30 + meat_amount = 15 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + //Space dragons aren't affected by atmos. min_oxy = 0 max_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm index 5186d76920..3bb27fa471 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennec.dm @@ -41,6 +41,9 @@ response_disarm = "gently pushes aside" response_harm = "hits" + meat_amount = 2 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox + harm_intent_damage = 5 melee_damage_lower = 1 melee_damage_upper = 3 @@ -73,7 +76,7 @@ /mob/living/simple_mob/vore/fennec/huge icon = 'icons/mob/vore100x100.dmi' icon_rest = null - + // LORG maxHealth = 500 health = 500 @@ -89,7 +92,7 @@ old_x = -32 pixel_x = -32 default_pixel_x = -32 - + // If you're immune to digestion, they can't digest you anyway! vore_ignores_undigestable = TRUE vore_default_mode = DM_DIGEST @@ -107,7 +110,7 @@ response_help = "pats the paw of" response_disarm = "somehow shoves aside" - + ai_holder_type = /datum/ai_holder/simple_mob/retaliate/cooperative var/image/bigshadow var/autodoom = TRUE @@ -159,4 +162,3 @@ else return ..() return ..() - \ No newline at end of file diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm b/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm index d32a6ee923..7d16df1049 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/fennix.dm @@ -12,6 +12,9 @@ maxHealth = 60 health = 60 + meat_amount = 5 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/fox + response_help = "pats" response_disarm = "gently pushes aside" response_harm = "hits" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm index c6ea3efbc1..076aa3bba1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/frog.dm @@ -1,6 +1,6 @@ /datum/category_item/catalogue/fauna/frog name = "Wildlife - Giant Frog" - desc = "Classification: Anura gigantus\ + desc = "Classification: Anura Gigantus\

\ A frog is any member of a diverse and largely carnivorous group of short-bodied, tailless amphibians composing \ the order Anura. This specific species - Anura gigantus - is a mutated form of Frogs, largely due to exposure to mutagen chemicals. \ @@ -20,7 +20,7 @@ /mob/living/simple_mob/vore/aggressive/frog name = "giant frog" desc = "You've heard of having a frog in your throat, now get ready for the reverse." - tt_desc = "Anura gigantus" + tt_desc = "Anura Gigantus" catalogue_data = list(/datum/category_item/catalogue/fauna/frog) icon_dead = "frog-dead" @@ -30,6 +30,9 @@ movement_cooldown = 4 //fast as fucc boie. + meat_amount = 4 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + harm_intent_damage = 5 melee_damage_lower = 5 melee_damage_upper = 12 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm index b58ebca5ae..481f73a4cd 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/hippo.dm @@ -38,7 +38,7 @@ pixel_x = -16 pixel_y = 0 - meat_amount = 10 //Infinite meat! + meat_amount = 15 //Infinite meat! meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat max_buckled_mobs = 1 //Yeehaw diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm index 1245278421..ae0610fcae 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/horse.dm @@ -23,7 +23,7 @@ melee_damage_upper = 5 attacktext = list("kicked") - meat_amount = 4 + meat_amount = 6 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat max_buckled_mobs = 1 //Yeehaw @@ -49,7 +49,7 @@ melee_damage_upper = 15 attacktext = list("kicked") - meat_amount = 6 + meat_amount = 10 old_x = -16 old_y = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm index 4a843eed80..1622321c52 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/morph/morph.dm @@ -6,9 +6,11 @@ desc = "A revolting, pulsating pile of flesh." tt_desc = "morphus shapeshiftus" icon = 'icons/mob/animal_vr.dmi' - icon_state = "morph" - icon_living = "morph" - icon_dead = "morph_dead" + icon_state = "new_morph" + icon_living = "new_morph" + icon_dead = "new_morph_dead" + icon_rest = null + color = "#658a62" movement_cooldown = 1 status_flags = CANPUSH pass_flags = PASSTABLE @@ -24,8 +26,8 @@ max_n2 = 0 minbodytemp = 0 - maxHealth = 250 - health = 250 + maxHealth = 50 + health = 50 taser_kill = FALSE melee_damage_lower = 15 melee_damage_upper = 20 @@ -37,11 +39,12 @@ attacktext = "glomped" attack_sound = 'sound/effects/blobattack.ogg' - meat_amount = 2 - meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_amount = 0 showvoreprefs = 0 vore_active = 1 + vore_default_mode = DM_HOLD + var/morphed = FALSE var/tooltip = TRUE @@ -50,6 +53,8 @@ var/atom/movable/form = null var/morph_time = 0 var/our_size_multiplier = 1 + var/original_ckey + var/chosen_color var/static/list/blacklist_typecache = typecacheof(list( /obj/screen, /obj/singularity, @@ -58,6 +63,10 @@ /mob/living/simple_mob/vore/hostile/morph/Initialize() verbs += /mob/living/proc/ventcrawl + verbs += /mob/living/simple_mob/vore/hostile/morph/proc/take_over_prey + if(!istype(src, /mob/living/simple_mob/vore/hostile/morph/dominated_prey)) + verbs += /mob/living/simple_mob/vore/hostile/morph/proc/morph_color + return ..() /mob/living/simple_mob/vore/hostile/morph/Destroy() @@ -70,7 +79,7 @@ /mob/living/simple_mob/vore/hostile/morph/examine(mob/user) if(morphed) . = form.examine(user) - if(get_dist(user, src) <= 3) + if(get_dist(user, src) <= 3 && !resting) . += "[form] doesn't look quite right..." else . = ..() @@ -100,6 +109,7 @@ form = target visible_message("[src] suddenly twists and changes shape, becoming a copy of [target]!") + color = null name = target.name desc = target.desc icon = target.icon @@ -107,7 +117,7 @@ alpha = max(target.alpha, 150) copy_overlays(target, TRUE) our_size_multiplier = size_multiplier - + pixel_x = initial(target.pixel_x) pixel_y = initial(target.pixel_y) @@ -118,7 +128,7 @@ icon_scale_x = target.icon_scale_x icon_scale_y = target.icon_scale_y update_transform() - + else if(ismob(target)) var/mob/living/M = target resize(M.size_multiplier, ignore_prefs = TRUE) @@ -137,10 +147,10 @@ to_chat(src, "You're already in your normal form!") return morphed = FALSE - + if(!silent) visible_message("[src] suddenly collapses in on itself, dissolving into a pile of green flesh!") - + form = null name = initial(name) desc = initial(desc) @@ -149,7 +159,10 @@ icon_state = initial(icon_state) alpha = initial(alpha) - color = initial(color) + if(chosen_color) + color = chosen_color + else + color = initial(color) plane = initial(plane) layer = initial(layer) @@ -161,7 +174,7 @@ density = initial(density) cut_overlays(TRUE) //ALL of zem - + maptext = null size_multiplier = our_size_multiplier @@ -188,6 +201,30 @@ return return ..() +/mob/living/simple_mob/vore/hostile/morph/lay_down() + if(morphed) + var/temp_state = icon_state + ..() + icon_state = temp_state + //Stolen from protean blobs, ambush noms from resting! Doesn't hide you any better, but makes noms sneakier. + if(resting) + plane = ABOVE_OBJ_PLANE + to_chat(src,"Your form settles in, appearing more 'normal'... laying in wait.") + else + plane = MOB_PLANE + to_chat(src,"Your form quivers back to life, allowing you to move again!") + if(can_be_drop_pred) //Toggleable in vore panel + var/list/potentials = living_mobs(0) + if(potentials.len) + var/mob/living/target = pick(potentials) + if(istype(target) && target.devourable && target.can_be_drop_prey && vore_selected) + if(target.buckled) + target.buckled.unbuckle_mob(target, force = TRUE) + target.forceMove(vore_selected) + to_chat(target,"\The [src] quickly engulfs you, [vore_selected.vore_verb]ing you into their [vore_selected.name]!") + else + ..() + /mob/living/simple_mob/vore/hostile/morph/update_icon() if(morphed) return @@ -207,3 +244,130 @@ src.transform = M else ..() + +/mob/living/simple_mob/vore/hostile/morph/proc/morph_color() + set name = "Pick Color" + set category = "Abilities" + set desc = "You can set your color!" + var/newcolor = input(usr, "Choose a color.", "", color) as color|null + if(newcolor) + color = newcolor + chosen_color = newcolor + + +/mob/living/simple_mob/vore/hostile/morph/proc/take_over_prey() + set name = "Take Over Prey" + set category = "Abilities" + set desc = "Take command of your prey's body." + if(morphed) + to_chat(src, "You must restore to your original form first!") + return + var/list/possible_mobs = list() + for(var/obj/belly/B in src.vore_organs) + for(var/mob/living/carbon/human/H in B) + if(ishuman(H) && H.ckey) + possible_mobs += H + else + continue + var/mob/living/carbon/human/M + var/input = tgui_input_list(src, "Select a mob to take over:", "Take Over Prey", possible_mobs) + if(!input) + return + M = input + if(!M) + return + if(M.resleeve_lock && ckey != M.resleeve_lock) + to_chat(src, "\The [M] cannot be impersonated!") + return + if(tgui_alert(src, "You selected [M] to attempt to take over. Are you sure?", "Take Over Prey",list("No","Yes")) == "Yes") + log_admin("[key_name_admin(src)] offered [M] to swap bodies as a morph.") + if(tgui_alert(M, "\The [src] has elected to attempt to take over your body and control you. Is this something you will allow to happen?", "Allow Morph To Take Over",list("No","Yes")) == "Yes") + if(tgui_alert(M, "Are you sure? The only way to undo this on your own is to OOC Escape.", "Allow Morph To Take Over",list("No","Yes")) == "Yes") + if(buckled) + buckled.unbuckle_mob() + if(M.buckled) + M.buckled.unbuckle_mob() + if(LAZYLEN(buckled_mobs)) + for(var/buckledmob in buckled_mobs) + riding_datum.force_dismount(buckledmob) + if(LAZYLEN(M.buckled_mobs)) + for(var/p_buckledmob in M.buckled_mobs) + M.riding_datum.force_dismount(p_buckledmob) + if(pulledby) + pulledby.stop_pulling() + if(M.pulledby) + M.pulledby.stop_pulling() + stop_pulling() + original_ckey = ckey + log_and_message_admins("[key_name_admin(src)] has swapped bodies with [key_name_admin(M)] as a morph at [get_area(src)] - [COORD(src)].") + new /mob/living/simple_mob/vore/hostile/morph/dominated_prey(M.vore_selected, M.ckey, src, M) + else + to_chat(src, "\The [M] declined your request for control.") + else + to_chat(src, "\The [M] declined your request for control.") + +/mob/living/simple_mob/vore/hostile/morph/dominated_prey + name = "subservient node" + color = "#171717" + digestable = 0 + devourable = 0 + var/mob/living/simple_mob/vore/hostile/morph/parent_morph + var/mob/living/carbon/human/prey_body + var/prey_ckey + + +/mob/living/simple_mob/vore/hostile/morph/dominated_prey/New(loc, pckey, parent, prey) + . = ..() + if(pckey) + prey_ckey = pckey + parent_morph = parent + prey_body = prey + prey_body.forceMove(get_turf(parent_morph)) + ckey = prey_ckey + prey_body.ckey = parent_morph.original_ckey + parent_morph.forceMove(src) + name = "[prey_body.name]" + to_chat(prey_body, "You have completely assumed the form of [prey_body]. Your form is now unable to change anymore until you restore control back to them. You can do this by 'ejecting' them from your [prey_body.vore_selected]. This will not actually release them from your body in this state, but instead return control to them, and restore you to your original form.") + else + qdel(src) + +/mob/living/simple_mob/vore/hostile/morph/dominated_prey/death(gibbed) + . = ..() + undo_prey_takeover(FALSE) + + +/mob/living/simple_mob/vore/hostile/morph/dominated_prey/Destroy() + . = ..() + parent_morph = null + prey_body = null + +/mob/living/simple_mob/vore/hostile/morph/dominated_prey/proc/undo_prey_takeover(ooc_escape) + if(buckled) + buckled.unbuckle_mob() + if(prey_body.buckled) + prey_body.buckled.unbuckle_mob() + if(LAZYLEN(buckled_mobs)) + for(var/buckledmob in buckled_mobs) + riding_datum.force_dismount(buckledmob) + if(LAZYLEN(prey_body.buckled_mobs)) + for(var/p_buckledmob in prey_body.buckled_mobs) + prey_body.riding_datum.force_dismount(p_buckledmob) + if(pulledby) + pulledby.stop_pulling() + if(prey_body.pulledby) + prey_body.pulledby.stop_pulling() + stop_pulling() + + if(ooc_escape) + prey_body.forceMove(get_turf(src)) + parent_morph.forceMove(get_turf(src)) + parent_morph.ckey = parent_morph.original_ckey + prey_body.ckey = prey_ckey + log_and_message_admins("[key_name_admin(prey_body)] used the OOC escape button to get out of [key_name_admin(parent_morph)]. They have been returned to their original bodies. [ADMIN_FLW(src)]") + else + parent_morph.forceMove(get_turf(prey_body)) + parent_morph.ckey = parent_morph.original_ckey + prey_body.ckey = prey_ckey + prey_body.forceMove(parent_morph.vore_selected) + log_and_message_admins("[key_name_admin(prey_body)] and [key_name_admin(parent_morph)] have been returned to their original bodies. [get_area(src)] - [COORD(src)].") + qdel(src) diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm index 16fa33596a..1d5fc57157 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/panther.dm @@ -16,6 +16,9 @@ movement_cooldown = 4 see_in_dark = 8 + meat_amount = 8 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + melee_damage_lower = 5 melee_damage_upper = 15 attack_sharp = TRUE diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm index 13a123531b..a0ab3a9bc1 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rabbit.dm @@ -32,6 +32,9 @@ say_list_type = /datum/say_list/rabbit ai_holder_type = /datum/ai_holder/simple_mob/passive + meat_amount = 3 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + // Vore vars vore_active = 1 vore_bump_emote = "playfully lunges at" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm index fd4837b955..023dcccd68 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/rat.dm @@ -45,6 +45,9 @@ attacktext = list("ravaged") friendly = list("nuzzles", "licks", "noses softly at", "noseboops", "headbumps against", "leans on", "nibbles affectionately on") + meat_amount = 6 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + old_x = -16 old_y = 0 default_pixel_x = -16 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm index fa75b5bc69..8399dd79fb 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/redpanda.dm @@ -13,6 +13,9 @@ maxHealth = 30 health = 30 + meat_amount = 2 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + response_help = "pats" response_disarm = "gently pushes aside" response_harm = "hits" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm index 1bfb4a4ade..b3ea3ff373 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_drone.dm @@ -48,6 +48,9 @@ vore_pounce_chance = 70 // v hongry buggo vore_icons = SA_ICON_LIVING + meat_amount = 4 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat + //Beeg bug don't give a fuck about atmos. Something something, phoron mutation. min_oxy = 0 max_oxy = 0 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm index d4b5b326d9..1df71072c2 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sect_queen.dm @@ -40,6 +40,8 @@ health = 200 see_in_dark = 8 + meat_amount = 8 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat melee_damage_lower = 8 melee_damage_upper = 16 diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm index 371fc8d241..ee27fb1c97 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/shadekin.dm @@ -76,6 +76,8 @@ var/obj/screen/energyhud //Holder to update this icon var/list/shadekin_abilities + var/check_for_observer = FALSE + var/check_timer = 0 /mob/living/simple_mob/shadekin/Initialize() //You spawned the prototype, and want a totally random one. @@ -86,6 +88,7 @@ /mob/living/simple_mob/shadekin/red = 20, //Actively seek people out to nom, so fairly common to see (relatively speaking), /mob/living/simple_mob/shadekin/blue = 15, //Explorers that like to interact with people, so still fairly common, /mob/living/simple_mob/shadekin/purple = 15, //Also explorers that may or may not homf people, + /mob/living/simple_mob/shadekin/green = 5, /mob/living/simple_mob/shadekin/yellow = 1 //Very rare, usually never leaves their home ) var/new_type = pickweight(sk_types) @@ -198,7 +201,18 @@ if(. && nutrition > initial(nutrition) && energy < 100) nutrition = max(0, nutrition-5) energy = min(100,energy+1) - + if(!client && check_for_observer && check_timer++ > 5) + check_timer = 0 + var/non_kin_count = 0 + for(var/mob/living/M in view(6,src)) + if(!istype(M, /mob/living/simple_mob/shadekin)) + non_kin_count ++ + // Technically can be combined with ||, they call the same function, but readability is poor + if(!non_kin_count && (ability_flags & AB_PHASE_SHIFTED)) + phase_shift() // shifting back in, nobody present + else if (non_kin_count && !(ability_flags & AB_PHASE_SHIFTED)) + phase_shift() // shifting out, scaredy + /mob/living/simple_mob/shadekin/update_icon() . = ..() diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm index e66162432b..d09e72aa97 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/shadekin/types.dm @@ -28,6 +28,9 @@ a brawl, but you barely generate any of your own energy. You can stand in a dark spot to gather scraps \ of energy in a pinch, but otherwise need to take it, by force if necessary." +/mob/living/simple_mob/shadekin/red + ai_holder_type = /datum/ai_holder/simple_mob/melee + /mob/living/simple_mob/shadekin/red/white icon_state = "white" /mob/living/simple_mob/shadekin/red/dark @@ -35,16 +38,6 @@ /mob/living/simple_mob/shadekin/red/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/red/ai - ai_holder_type = /datum/ai_holder/simple_mob/melee - -/mob/living/simple_mob/shadekin/red/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/red/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/red/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/blue name = "blue-eyed shadekin" @@ -85,6 +78,9 @@ without doing so, albeit slowly. Dark and light are irrelevant to you, they are just different places to explore and \ discover new things and new people." +/mob/living/simple_mob/shadekin/blue/ + ai_holder_type = /datum/ai_holder/simple_mob/passive + /mob/living/simple_mob/shadekin/blue/white icon_state = "white" /mob/living/simple_mob/shadekin/blue/dark @@ -92,16 +88,6 @@ /mob/living/simple_mob/shadekin/blue/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/blue/ai - ai_holder_type = /datum/ai_holder/simple_mob/passive - -/mob/living/simple_mob/shadekin/blue/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/blue/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/blue/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/purple name = "purple-eyed shadekin" @@ -137,6 +123,9 @@ areas is taxing on your energy. You can harvest energy from others in a fight, but since you don't need to, you may \ just choose to simply not fight." +/mob/living/simple_mob/shadekin/purple + ai_holder_type = /datum/ai_holder/simple_mob/retaliate + /mob/living/simple_mob/shadekin/purple/white icon_state = "white" /mob/living/simple_mob/shadekin/purple/dark @@ -144,16 +133,6 @@ /mob/living/simple_mob/shadekin/purple/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/purple/ai - ai_holder_type = /datum/ai_holder/simple_mob/retaliate - -/mob/living/simple_mob/shadekin/purple/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/purple/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/purple/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/yellow name = "yellow-eyed shadekin" @@ -177,6 +156,7 @@ eye_desc = "yellow eyes" stalker = FALSE + check_for_observer = TRUE vore_stomach_flavor = "You slip past pointy triangle teeth and down the slick, slippery gullet \ of the creature. It's warm, and the air is thick. You can hear its body squelch and shift around you \ as you settle into its stomach! The doughy walls within cling to you heavily, churning down on you, wearing \ @@ -187,6 +167,9 @@ area is very taxing on you, but you gain energy extremely fast in any very dark area. You're weaker than other \ shadekin, but your fast energy generation in the dark allows you to phase shift more often." +/mob/living/simple_mob/shadekin/yellow + ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run + /mob/living/simple_mob/shadekin/yellow/white icon_state = "white" /mob/living/simple_mob/shadekin/yellow/dark @@ -194,24 +177,14 @@ /mob/living/simple_mob/shadekin/yellow/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/yellow/ai - ai_holder_type = /datum/ai_holder/simple_mob/melee/hit_and_run - -/mob/living/simple_mob/shadekin/yellow/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/yellow/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/yellow/ai/brown - icon_state = "brown" - -/mob/living/simple_mob/shadekin/yellow/ai/retaliate +/mob/living/simple_mob/shadekin/yellow/retaliate ai_holder_type = /datum/ai_holder/simple_mob/retaliate -/mob/living/simple_mob/shadekin/yellow/ai/retaliate/white +/mob/living/simple_mob/shadekin/yellow/retaliate/white icon_state = "white" -/mob/living/simple_mob/shadekin/yellow/ai/retaliate/dark +/mob/living/simple_mob/shadekin/yellow/retaliate/dark icon_state = "dark" -/mob/living/simple_mob/shadekin/yellow/ai/retaliate/brown +/mob/living/simple_mob/shadekin/yellow/retaliate/brown icon_state = "brown" ///////////////////////////////////////////////////////////////// @@ -237,6 +210,7 @@ eye_desc = "green eyes" stalker = TRUE + check_for_observer = TRUE vore_stomach_flavor = "You slip past pointy triangle teeth and down the slick, slippery gullet \ of the creature. It's warm, and the air is thick. You can hear its body squelch and shift around you \ as you settle into its stomach! The doughy walls within cling to you heavily, churning down on you, wearing \ @@ -247,6 +221,9 @@ have more experience than your yellow-eyed cousins. You gain energy decently fast in any very dark area. You're weaker than other \ shadekin, but your slight energy generation constnatly, and especially in the dark allows for a good mix of uses." +/mob/living/simple_mob/shadekin/green + ai_holder_type = /datum/ai_holder/simple_mob/passive + /mob/living/simple_mob/shadekin/green/white icon_state = "white" /mob/living/simple_mob/shadekin/green/dark @@ -254,16 +231,6 @@ /mob/living/simple_mob/shadekin/green/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/green/ai - ai_holder_type = /datum/ai_holder/simple_mob/passive - -/mob/living/simple_mob/shadekin/green/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/green/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/green/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// /mob/living/simple_mob/shadekin/orange name = "orange-eyed shadekin" @@ -294,6 +261,9 @@ You're stronger than most shadekin, faster, and more capable in a brawl, but you don't generate much of your own energy. \ You can stand in a dark spot to gather some energy, but otherwise need to take it, by force if necessary." +/mob/living/simple_mob/shadekin/orange + ai_holder_type = /datum/ai_holder/simple_mob/melee + /mob/living/simple_mob/shadekin/orange/white icon_state = "white" /mob/living/simple_mob/shadekin/orange/dark @@ -301,22 +271,13 @@ /mob/living/simple_mob/shadekin/orange/brown icon_state = "brown" -/mob/living/simple_mob/shadekin/orange/ai - ai_holder_type = /datum/ai_holder/simple_mob/melee - -/mob/living/simple_mob/shadekin/orange/ai/white - icon_state = "white" -/mob/living/simple_mob/shadekin/orange/ai/dark - icon_state = "dark" -/mob/living/simple_mob/shadekin/orange/ai/brown - icon_state = "brown" - ///////////////////////////////////////////////////////////////// //Fluffy specific fluffer /mob/living/simple_mob/shadekin/blue/rivyr name = "Rivyr" desc = "She appears to be a fluffer of some sort. Deep blue eyes and curious attitude." icon_state = "rivyr" + ai_holder_type = /datum/ai_holder/simple_mob/passive eye_desc = "" vore_stomach_flavor = "Blue flesh gleams in the fading light as you slip down the little mar's gullet! \ Gooey flesh and heat surrounds your form as you're tucked away into the darkness of her stomach! Thick slimes cling \ diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm index 32ddb75c0a..b4767b8dea 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/sheep.dm @@ -14,6 +14,9 @@ see_in_dark = 2 + meat_amount = 5 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + response_help = "pets" response_disarm = "gently pushes aside" response_harm = "kicks" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm index 651599e352..8affc4d894 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/snake.dm @@ -38,6 +38,9 @@ melee_damage_lower = 5 melee_damage_upper = 12 + meat_amount = 6 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + response_help = "pats" response_disarm = "tries to shove" response_harm = "hits" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm index 97f5e636f5..be4e903681 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/softdog.dm @@ -263,4 +263,53 @@ visible_message("[src] stops playing dead.", runemessage = "[src] stops playing dead") else M.visible_message("The petting was interrupted!!!", runemessage = "The petting was interrupted") - return \ No newline at end of file + return + +/mob/living/simple_mob/vore/woof/hostile/aweful + maxHealth = 100 + health = 100 + var/killswitch = FALSE + + +/mob/living/simple_mob/vore/woof/hostile/aweful/Initialize() + . = ..() + var/thismany = (rand(25,500)) / 100 + resize(thismany, animate = FALSE, uncapped = TRUE, ignore_prefs = TRUE) + +/mob/living/simple_mob/vore/woof/hostile/aweful/death() + . = ..() + if(killswitch) + visible_message("\The [src] evaporates into nothing...") + qdel(src) + return + var/thismany = rand(0,3) + var/list/possiblewoofs = list(/mob/living/simple_mob/vore/woof/hostile/aweful/melee, /mob/living/simple_mob/vore/woof/hostile/aweful/ranged) + if(thismany == 0) + visible_message("\The [src] evaporates into nothing...") + if(thismany >= 1) + var/thiswoof = pick(possiblewoofs) + new thiswoof(loc, src) + visible_message("Another [src] appears!") + if(thismany >= 2) + var/thiswoof = pick(possiblewoofs) + new thiswoof(loc, src) + visible_message("Another [src] appears!") + if(thismany >= 3) + var/thiswoof = pick(possiblewoofs) + new thiswoof(loc, src) + visible_message("Another [src] appears!") + qdel(src) + +/mob/living/simple_mob/vore/woof/hostile/aweful/melee + + movement_cooldown = 0 + + ai_holder_type = /datum/ai_holder/simple_mob/woof/hostile + +/mob/living/simple_mob/vore/woof/hostile/aweful/ranged + movement_cooldown = 0 + + ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting/threatening/woof + + projectiletype = /obj/item/projectile/awoo_missile + projectilesound = 'sound/voice/long_awoo.ogg' diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm index 745db9e568..ef1aa44b59 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub.dm @@ -36,6 +36,7 @@ List of things solar grubs should be able to do: movement_cooldown = 8 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat + meat_amount = 6 response_help = "pokes" response_disarm = "pushes" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm index f3c200410b..0589a35391 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/solargrub_larva.dm @@ -16,8 +16,9 @@ var/global/list/grub_machine_overlays = list() melee_damage_lower = 1 // This is a tiny worm. It will nibble and thats about it. melee_damage_upper = 1 - meat_amount = 2 + meat_amount = 1 meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat + butchery_loot = list() // No hides faction = "grubs" diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm index 178dee3cee..b15a7e0e18 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/vore.dm @@ -1,18 +1,21 @@ /mob/living/simple_mob/vore mob_class = MOB_CLASS_ANIMAL mob_bump_flag = 0 + +/mob/living/simple_mob var/nameset + var/limit_renames = TRUE -/mob/living/simple_mob/vore/Login() +/mob/living/simple_mob/Login() . = ..() - verbs |= /mob/living/simple_mob/vore/proc/set_name - verbs |= /mob/living/simple_mob/vore/proc/set_desc + verbs |= /mob/living/simple_mob/proc/set_name + verbs |= /mob/living/simple_mob/proc/set_desc -/mob/living/simple_mob/vore/proc/set_name() +/mob/living/simple_mob/proc/set_name() set name = "Set Name" set desc = "Sets your mobs name. You only get to do this once." set category = "Abilities" - if(nameset) + if(limit_renames && nameset) to_chat(src, "You've already set your name. Ask an admin to toggle \"nameset\" to 0 if you really must.") return var/newname @@ -22,7 +25,7 @@ voice_name = newname nameset = 1 -/mob/living/simple_mob/vore/proc/set_desc() +/mob/living/simple_mob/proc/set_desc() set name = "Set Description" set desc = "Set your description." set category = "Abilities" @@ -32,4 +35,4 @@ desc = newdesc /mob/living/simple_mob/vore/aggressive - mob_bump_flag = HEAVY \ No newline at end of file + mob_bump_flag = HEAVY diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm index 8c4d7b14df..31b057ef45 100644 --- a/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm +++ b/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm @@ -25,6 +25,9 @@ melee_damage_lower = 5 melee_damage_upper = 12 + meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat + meat_amount = 5 + minbodytemp = 200 ai_holder_type = /datum/ai_holder/simple_mob/melee/evasive diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 92e9d7f103..67466f350d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -365,6 +365,45 @@ var/choice = tgui_alert(usr, "Returning to the menu will prevent your character from being revived in-round. Are you sure?", "Confirmation", list("No, wait", "Yes, leave")) if(choice == "No, wait") return + else if(mind.assigned_role) + var/extra_check = tgui_alert(usr, "Do you want to Quit This Round before you return to lobby? This will properly remove you from manifest, as well as prevent resleeving.","Quit This Round",list("Quit Round","Cancel")) + if(extra_check == "Quit Round") + //Update any existing objectives involving this mob. + for(var/datum/objective/O in all_objectives) + if(O.target == src.mind) + if(O.owner && O.owner.current) + to_chat(O.owner.current,"You get the feeling your target is no longer within your reach...") + qdel(O) + + //Resleeving cleanup + if(mind) + SStranscore.leave_round(src) + + //Job slot cleanup + var/job = src.mind.assigned_role + job_master.FreeRole(job) + + //Their objectives cleanup + if(src.mind.objectives.len) + qdel(src.mind.objectives) + src.mind.special_role = null + + //Cut the PDA manifest (ugh) + if(PDA_Manifest.len) + PDA_Manifest.Cut() + for(var/datum/data/record/R in data_core.medical) + if((R.fields["name"] == src.real_name)) + qdel(R) + for(var/datum/data/record/T in data_core.security) + if((T.fields["name"] == src.real_name)) + qdel(T) + for(var/datum/data/record/G in data_core.general) + if((G.fields["name"] == src.real_name)) + qdel(G) + + //This removes them from being 'active' list on join screen + src.mind.assigned_role = null + to_chat(src,"Your job has been free'd up, and you can rejoin as another character or quit. Thanks for properly quitting round, it helps the server!") // Beyond this point, you're going to respawn to_chat(usr, config.respawn_message) diff --git a/code/modules/mob/new_player/new_player_vr.dm b/code/modules/mob/new_player/new_player_vr.dm index 71abc1ddf1..fdbbcb10d0 100644 --- a/code/modules/mob/new_player/new_player_vr.dm +++ b/code/modules/mob/new_player/new_player_vr.dm @@ -72,4 +72,4 @@ //Final popup notice if (!pass) tgui_alert_async(src,"There were problems with spawning your character. Check your message log for details.","Error") - return pass + return pass \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories.dm index a71c2b2963..5f5a3bfe69 100644 --- a/code/modules/mob/new_player/sprite_accessories.dm +++ b/code/modules/mob/new_player/sprite_accessories.dm @@ -2062,9 +2062,12 @@ shaved color_blend_mode = ICON_ADD + var/genetic = TRUE var/body_parts = list() //A list of bodyparts this covers, in organ_tag defines //Reminder: BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN,BP_HEAD +//Tattoos + /datum/sprite_accessory/marking/tat_rheart name = "Tattoo (Heart, R. Arm)" icon_state = "tat_rheart" @@ -2117,6 +2120,300 @@ shaved icon_state = "tat_tiger" body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN) +//New tats + +/datum/sprite_accessory/marking/tat_belly + name = "Tattoo (Belly)" + icon_state = "tat_belly" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tat_forrest_left + name = "Tattoo (Forrest, Left Eye)" + icon_state = "tat_forrest_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_forrest_right + name = "Tattoo (Forrest, Right Eye)" + icon_state = "tat_forrest_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_hunter_left + name = "Tattoo (Hunter, Left Eye)" + icon_state = "tat_hunter_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_hunter_right + name = "Tattoo (Hunter, Right Eye)" + icon_state = "tat_hunter_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_jaeger_left + name = "Tattoo (Jaeger, Left Eye)" + icon_state = "tat_jaeger_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_jaeger_right + name = "Tattoo (Jaeger, Right Eye)" + icon_state = "tat_jaeger_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_kater_left + name = "Tattoo (Kater, Left Eye)" + icon_state = "tat_kater_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_kater_right + name = "Tattoo (Kater, Right Eye)" + icon_state = "tat_kater_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_lujan_left + name = "Tattoo (Lujan, Left Eye)" + icon_state = "tat_lujan_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_lujan_right + name = "Tattoo (Lujan, Right Eye)" + icon_state = "tat_lujan_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_montana_left + name = "Tattoo (Montana, Left Face)" + icon_state = "tat_montana_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_montana_right + name = "Tattoo (Montana, Right Face)" + icon_state = "tat_montana_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_natasha_left + name = "Tattoo (Natasha, Left Eye)" + icon_state = "tat_natasha_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_natasha_right + name = "Tattoo (Natasha, Right Eye)" + icon_state = "tat_natasha_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_tamoko + name = "Tattoo (Ta Moko, Face)" + icon_state = "tat_tamoko" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_toshi_left + name = "Tattoo (Toshi, Left Eye)" + icon_state = "tat_toshi_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_toshi_right + name = "Tattoo (Volgin, Right Eye)" + icon_state = "tat_toshi_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tat_wings_back + name = "Tattoo (Wings, Lower Back)" + icon_state = "tat_wingsback" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/tilaka + name = "Tilaka" + icon_state = "tilaka" + body_parts = list(BP_HEAD) + + +/datum/sprite_accessory/marking/bands + name = "Color Bands" + icon_state = "bands" + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN) + +/datum/sprite_accessory/marking/bandsface + name = "Color Bands (Face)" + icon_state = "bandsface" + body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_TAJ,SPECIES_UNATHI) + +/datum/sprite_accessory/marking/bandsface_human + name = "Color Bands (Face)" + icon_state = "bandshumanface" + body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN,SPECIES_SKRELL) + +/datum/sprite_accessory/marking/tiger_stripes + name = "Tiger Stripes" + icon_state = "tiger" + body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN) + species_allowed = list(SPECIES_TAJ) //There's a tattoo for non-cats + +/datum/sprite_accessory/marking/tigerhead + name = "Tiger Stripes (Head, Minor)" + icon_state = "tigerhead" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/tigerface + name = "Tiger Stripes (Head, Major)" + icon_state = "tigerface" + body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_TAJ) //There's a tattoo for non-cats + +/datum/sprite_accessory/marking/backstripe + name = "Back Stripe" + icon_state = "backstripe" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/bindi + name = "Bindi" + icon_state = "bindi" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/blush + name = "Blush" + icon_state= "blush" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/bridge + name = "Bridge" + icon_state = "bridge" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/brow_left + name = "Brow Left" + icon_state = "brow_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/brow_right + name = "Brow Right" + icon_state = "brow_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/cheekspot_left + name = "Cheek Spot (Left Cheek)" + icon_state = "cheekspot_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/cheekspot_right + name = "Cheek Spot (Right Cheek)" + icon_state = "cheekspot_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/cheshire_left + name = "Cheshire (Left Cheek)" + icon_state = "cheshire_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/cheshire_right + name = "Cheshire (Right Cheek)" + icon_state = "cheshire_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/eyestripe + name = "Eye Stripe" + icon_state = "eyestripe" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/eyecorner_left + name = "Eye Corner Left" + icon_state = "eyecorner_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/eyecorner_right + name = "Eye Corner Right" + icon_state = "eyecorner_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/fullfacepaint + name = "Full Face Paint" + icon_state = "fullface" + body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_HUMAN,SPECIES_HUMAN_VATBORN,SPECIES_SKRELL) + +/datum/sprite_accessory/marking/lips + name = "Lips" + icon_state = "lips" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/lowercheek_left + name = "Lower Cheek Left" + icon_state = "lowercheek_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/lowercheek_left + name = "Lower Cheek Right" + icon_state = "lowercheek_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/neck + name = "Neck Cover" + icon_state = "neck" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/neckthick + name = "Neck Cover (Thick)" + icon_state = "neckthick" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/nosestripe + name = "Nose Stripe" + icon_state = "nosestripe" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/nosetape + name = "Nose Tape" + icon_state = "nosetape" + body_parts = list(BP_HEAD) + genetic = FALSE + +/datum/sprite_accessory/marking/scratch_abdomen_left + name = "Scar, Abdomen Left" + icon_state = "scratch_abdomen_l" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/scratch_abdomen_right + name = "Scar, Abdomen Right" + icon_state = "scratch_abdomen_r" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/scratch_abdomen_small_left + name = "Scar, Abdomen Small Left" + icon_state = "scratch_abdomensmall_l" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/scratch_abdomen_small_right + name = "Scar, Abdomen Small Right" + icon_state = "scratch_abdomensmall_r" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/scratch_back + name = "Scar, Back" + icon_state = "scratch_back" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/scratch_chest_left + name = "Scar, Chest (Left)" + icon_state = "scratch_chest_l" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/scratch_chest_right + name = "Scar, Chest (Right)" + icon_state = "scratch_chest_r" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/skull_paint + name = "Skull Paint" + icon_state = "skull" + body_parts = list(BP_HEAD) + genetic = FALSE + +//Heterochromia + +/datum/sprite_accessory/marking/heterochromia + name = "Heterochromia (right eye)" + icon_state = "heterochromia" + body_parts = list(BP_HEAD) + +//Taj/Unathi shared markings + /datum/sprite_accessory/marking/taj_paw_socks name = "Socks Coloration (Taj)" icon_state = "taj_pawsocks" @@ -2171,42 +2468,6 @@ shaved body_parts = list(BP_HEAD) species_allowed = list(SPECIES_TAJ) -/datum/sprite_accessory/marking/bands - name = "Color Bands" - icon_state = "bands" - body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_L_HAND,BP_R_HAND,BP_TORSO,BP_GROIN) - -/datum/sprite_accessory/marking/bandsface - name = "Color Bands (Face)" - icon_state = "bandsface" - body_parts = list(BP_HEAD) - -/datum/sprite_accessory/marking/tiger_stripes - name = "Tiger Stripes" - icon_state = "tiger" - body_parts = list(BP_L_FOOT,BP_R_FOOT,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_TORSO,BP_GROIN) - species_allowed = list(SPECIES_TAJ) //There's a tattoo for non-cats - -/datum/sprite_accessory/marking/tigerhead - name = "Tiger Stripes (Head, Minor)" - icon_state = "tigerhead" - body_parts = list(BP_HEAD) - -/datum/sprite_accessory/marking/tigerface - name = "Tiger Stripes (Head, Major)" - icon_state = "tigerface" - body_parts = list(BP_HEAD) - species_allowed = list(SPECIES_TAJ) //There's a tattoo for non-cats - -/datum/sprite_accessory/marking/backstripe - name = "Back Stripe" - icon_state = "backstripe" - body_parts = list(BP_TORSO) - -/datum/sprite_accessory/marking/heterochromia - name = "Heterochromia (right eye)" - icon_state = "heterochromia" - body_parts = list(BP_HEAD) //Taj specific stuff /datum/sprite_accessory/marking/taj_belly @@ -2340,10 +2601,174 @@ shaved do_colouration = 0 +//Cybernetic Augments, some species-limited due to sprite misalignment. /aug/ types are excluded from dna. + +/datum/sprite_accessory/marking/aug + name = "Augment (Backports, Back)" + icon_state = "aug_backports" + genetic = FALSE + body_parts = list(BP_TORSO) + species_allowed = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_TAJ,SPECIES_HUMAN_VATBORN,SPECIES_UNATHI,SPECIES_ZADDAT) + +/datum/sprite_accessory/marking/aug/diode + name = "Augment (Backports Diode, Back)" + icon_state = "aug_backportsdiode" + +/datum/sprite_accessory/marking/aug/backportswide + name = "Augment (Backports Wide, Back)" + icon_state = "aug_backportswide" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/aug/backportswide/diode + name = "Augment (Backports Wide Diode, Back)" + icon_state = "aug_backportswidediode" + +/datum/sprite_accessory/marking/aug/headcase + name = "Augment (Headcase, Head)" + icon_state = "aug_headcase" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/headcase_light + name = "Augment (Headcase Light, Head)" + icon_state = "aug_headcaselight" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/headport + name = "Augment (Headport, Head)" + icon_state = "aug_headport" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/headport/diode + name = "Augment (Headport Diode, Head)" + icon_state = "aug_headplugdiode" + +/datum/sprite_accessory/marking/aug/lowerjaw + name = "Augment (Lower Jaw, Head)" + icon_state = "aug_lowerjaw" + body_parts = list(BP_HEAD) + species_allowed = list(SPECIES_HUMAN,SPECIES_SKRELL,SPECIES_HUMAN_VATBORN,SPECIES_ZADDAT) + +/datum/sprite_accessory/marking/aug/scalpports + name = "Augment (Scalp Ports)" + icon_state = "aug_scalpports" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/scalpports/vertex_left + name = "Augment (Scalp Port, Vertex Left)" + icon_state = "aug_vertexport_l" + +/datum/sprite_accessory/marking/aug/scalpports/vertex_right + name = "Augment (Scalp Port, Vertex Right)" + icon_state = "aug_vertexport_r" + +/datum/sprite_accessory/marking/aug/scalpports/occipital_left + name = "Augment (Scalp Port, Occipital Left)" + icon_state = "aug_occipitalport_l" + +/datum/sprite_accessory/marking/aug/scalpports/occipital_right + name = "Augment (Scalp Port, Occipital Right)" + icon_state = "aug_occipitalport_r" + +/datum/sprite_accessory/marking/aug/scalpportsdiode + name = "Augment (Scalp Ports Diode)" + icon_state = "aug_scalpportsdiode" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/scalpportsdiode/vertex_left + name = "Augment (Scalp Port Diode, Vertex Left)" + icon_state = "aug_vertexportdiode_l" + +/datum/sprite_accessory/marking/aug/scalpportsdiode/vertex_right + name = "Augment (Scalp Port Diode, Vertex Right)" + icon_state = "aug_vertexportdiode_r" + +/datum/sprite_accessory/marking/aug/scalpportsdiode/occipital_left + name = "Augment (Scalp Port Diode, Occipital Left)" + icon_state = "aug_occipitalportdiode_l" + +/datum/sprite_accessory/marking/aug/scalpportsdiode/occipital_right + name = "Augment (Scalp Port Diode, Occipital Right)" + icon_state = "aug_occipitalportdiode_r" + +/datum/sprite_accessory/marking/aug/backside_left + name = "Augment (Backside Left, Head)" + icon_state = "aug_backside_l" + +/datum/sprite_accessory/marking/aug/backside_left/side_diode + name = "Augment (Backside Left Diode, Head)" + icon_state = "aug_sidediode_l" + +/datum/sprite_accessory/marking/aug/backside_right + name = "Augment (Backside Right, Head)" + icon_state = "aug_backside_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/backside_right/side_diode + name = "Augment (Backside Right Diode, Head)" + icon_state = "aug_sidediode_r" + +/datum/sprite_accessory/marking/aug/side_deunan_left + name = "Augment (Deunan, Side Left)" + icon_state = "aug_sidedeunan_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/side_deunan_right + name = "Augment (Deunan, Side Right)" + icon_state = "aug_sidedeunan_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/side_kuze_left + name = "Augment (Kuze, Side Left)" + icon_state = "aug_sidekuze_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/side_kuze_left/side_diode + name = "Augment (Kuze Diode, Side Left)" + icon_state = "aug_sidekuzediode_l" + +/datum/sprite_accessory/marking/aug/side_kuze_right + name = "Augment (Kuze, Side Right)" + icon_state = "aug_sidekuze_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/side_kuze_right/side_diode + name = "Augment (Kuze Diode, Side Right)" + icon_state = "aug_sidekuzediode_r" + +/datum/sprite_accessory/marking/aug/side_kinzie_left + name = "Augment (Kinzie, Side Left)" + icon_state = "aug_sidekinzie_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/side_kinzie_right + name = "Augment (Kinzie, Side Right)" + icon_state = "aug_sidekinzie_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/side_shelly_left + name = "Augment (Shelly, Side Left)" + icon_state = "aug_sideshelly_l" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/side_shelly_right + name = "Augment (Shelly, Side Right)" + icon_state = "aug_sideshelly_r" + body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/aug/chestports + name = "Augment (Chest Ports)" + icon_state = "aug_chestports" + body_parts = list(BP_TORSO) + +/datum/sprite_accessory/marking/aug/abdomenports + name = "Augment (Abdomen Ports)" + icon_state = "aug_abdomenports" + body_parts = list(BP_TORSO) //skin styles - WIP //going to have to re-integrate this with surgery //let the icon_state hold an icon preview for now + /datum/sprite_accessory/skin icon = 'icons/mob/human_races/r_human.dmi' diff --git a/code/modules/mob/new_player/sprite_accessories_ear.dm b/code/modules/mob/new_player/sprite_accessories_ear.dm index 0daf9be98d..26638a04bb 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear.dm @@ -16,7 +16,7 @@ var/desc = "You should not see this..." em_block = TRUE - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/shadekin name = "Shadekin Ears, colorable" @@ -24,14 +24,14 @@ icon_state = "shadekin" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list() // SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW + //species_allowed = list() // SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/taj_ears name = "Tajaran Ears" icon_state = "ears_plain" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files extra_overlay = "ears_plain-inner" /datum/sprite_accessory/ears/taj_ears_tall @@ -39,7 +39,7 @@ icon_state = "msai_plain" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files extra_overlay = "msai_plain-inner" /datum/sprite_accessory/ears/squirrel_orange @@ -345,20 +345,20 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY -/datum/sprite_accessory/ears/elfs2 - name = "pointed ears" - desc = "" - icon_state = "ears_pointy" - do_colouration = 1 - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) - -/datum/sprite_accessory/ears/elfs +/datum/sprite_accessory/ears/elfs1 name = "pointed ears (tall)" desc = "" icon_state = "elfs" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files + +/datum/sprite_accessory/ears/elfs2 + name = "pointed ears" + desc = "" + icon_state = "ears_pointy" + do_colouration = 1 + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/elfs3 name = "pointed ears (down)" @@ -366,7 +366,7 @@ icon_state = "ears_pointy_down" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/elfs4 name = "pointed ears (long)" @@ -374,7 +374,7 @@ icon_state = "ears_pointy_long" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/elfs5 name = "pointed ears (long, down)" @@ -382,7 +382,7 @@ icon_state = "ears_pointy_long_down" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_HUMAN, SPECIES_HUMAN_VATBORN, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/sleek name = "sleek ears" @@ -443,7 +443,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "teshariinner" - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/tesharihigh name = "Teshari upper ears (colorable fluff)" @@ -452,7 +452,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "tesharihighinner" - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/tesharilow name = "Teshari lower ears (colorable fluff)" @@ -461,7 +461,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY extra_overlay = "tesharilowinner" - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/ears/inkling name = "colorable mature inkling hair" diff --git a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm index 778371e790..f6b0c77abe 100644 --- a/code/modules/mob/new_player/sprite_accessories_ear_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_ear_vr.dm @@ -34,9 +34,11 @@ /datum/sprite_accessory/ears/taj_ears name = "tajaran, colorable (old)" + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use /datum/sprite_accessory/ears/taj_ears_tall name = "tajaran tall, colorable (old)" + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use /datum/sprite_accessory/ears/alt_ram_horns name = "Solid ram horns" @@ -377,6 +379,21 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/elfs1 + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use + +/datum/sprite_accessory/ears/elfs2 + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use + +/datum/sprite_accessory/ears/elfs3 + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use + +/datum/sprite_accessory/ears/elfs4 + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use + +/datum/sprite_accessory/ears/elfs5 + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use + /datum/sprite_accessory/ears/sleek name = "sleek ears" desc = "" @@ -737,6 +754,16 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/ears/bnnuy2 + name = "Bnnuy Ears 2" + desc = "" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "bnnuy2" + extra_overlay = "bnnuy-inner" + extra_overlay2 = "bnnuy-tips2" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/ears/sandfox name = "Sandfox Ears" desc = "" @@ -772,3 +799,46 @@ extra_overlay2 = "teppi_horns" do_colouration = 1 color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/jackalope + name = "Jackalope Ears and Antlers" + desc = "" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "jackalope" + extra_overlay = "jackalope-antlers" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/rabbit_swept + name = "Rabbit Ears (swept back)" + desc = "" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "rabbit-swept" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/antlers_large + name = "Antlers (large)" + desc = "" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "antlers_large" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/ears/kittyr + name = "kitty right only, colorable" + icon = 'icons/mob/vore/ears_uneven.dmi' + desc = "" + icon_state = "kittyrinner" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "kittyr" + +/datum/sprite_accessory/ears/bunny_tall + name = "Bunny Tall Ears" + desc = "" + icon = 'icons/mob/vore/ears_32x64.dmi' + icon_state = "bunny-tall" + extra_overlay = "bunny-tall-inner" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_tail.dm b/code/modules/mob/new_player/sprite_accessories_tail.dm index c8d8cd4940..06dcdb9ebb 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail.dm @@ -25,7 +25,7 @@ var/clip_mask_state = null //Icon state to generate clip mask. Clip mask is used to 'clip' off the lower part of clothing such as jumpsuits & full suits. var/icon/clip_mask = null //Instantiated clip mask of given icon and state - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/New() . = ..() @@ -41,7 +41,7 @@ icon = null icon_state = null - species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI, SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_UNATHI, SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/squirrel_orange name = "squirel, orange" @@ -90,7 +90,7 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "stripeytail_mark" - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/stripeytail_brown name = "stripey taj, brown" @@ -231,13 +231,6 @@ desc = "" icon_state = "beethorax" -/datum/sprite_accessory/tail/doublekitsune - name = "double kitsune tail, colorable" - desc = "" - icon_state = "doublekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/spade_color name = "spade-tail (colorable)" desc = "" @@ -422,7 +415,7 @@ extra_overlay = "teshari_fluffytail_mark" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/nightstalker name = "Nightstalker, colorable" @@ -443,7 +436,7 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/tajaran name = "tajaran tail" @@ -451,7 +444,7 @@ icon_state = "tajtail_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/sergal name = "sergal tail" @@ -510,7 +503,7 @@ icon_state = "seromitail_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/tesharitailfeathered name = "teshari tail w/ feathers" @@ -519,7 +512,7 @@ extra_overlay = "seromitail_feathers_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TESHARI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/unathihc name = "unathi tail, colorable" @@ -527,7 +520,7 @@ icon_state = "sogtail_hc_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_UNATHI, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/tajaranhc name = "tajaran tail, colorable" @@ -535,7 +528,7 @@ icon_state = "tajtail_hc_s" do_colouration = 1 color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_TAJ, SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/tail/special/sergalhc name = "sergal tail, colorable" @@ -909,6 +902,20 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/tail/fox_tail + name = "Fox tail, colorable" + desc = "" + icon_state = "fox_tail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/fox_tail_plain + name = "Fox tail, colorable, plain" + desc = "" + icon_state = "fox_tail_plain_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/tail/foxtail name = "Fox tail, colourable (vwag)" desc = "" @@ -919,6 +926,21 @@ ani_state = "foxtail_w" extra_overlay_w = "foxtail-tips_w" +/datum/sprite_accessory/tail/doublekitsune + name = "Kitsune 2 tails, colorable" + desc = "" + icon_state = "doublekitsune" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/doublekitsunealt + name = "Kitsune 2 tails, colorable, alt" + desc = "" + icon_state = "doublekitsunealt" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "doublekitsunealt-tips" + /datum/sprite_accessory/tail/triplekitsune_colorable name = "Kitsune 3 tails, colorable" desc = "" @@ -927,6 +949,14 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "triplekitsune_tips" +/datum/sprite_accessory/tail/sevenkitsune_colorable + name = "Kitsune 7 tails, colorable" + desc = "" + icon_state = "sevenkitsune" + extra_overlay = "sevenkitsune-tips" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/tail/ninekitsune_colorable name = "Kitsune 9 tails, colorable" desc = "" @@ -935,6 +965,16 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "ninekitsune-tips" +/datum/sprite_accessory/tail/hideableninetails + name = "Kitsune 9-in-1 tail, colourable (vwag)" + desc = "" + icon_state = "ninekitsune" + extra_overlay = "ninekitsune-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "foxtail_w" + extra_overlay_w = "foxtail-tips_w" + /datum/sprite_accessory/tail/shadekin_short name = "Shadekin Short Tail, colorable" desc = "" diff --git a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm index ee11fd7eae..a1c1034be5 100644 --- a/code/modules/mob/new_player/sprite_accessories_tail_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_tail_vr.dm @@ -211,13 +211,6 @@ desc = "" icon_state = "beethorax" -/datum/sprite_accessory/tail/doublekitsune - name = "double kitsune tail, colorable" - desc = "" - icon_state = "doublekitsune" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/spade_color name = "spade-tail (colorable)" desc = "" @@ -964,6 +957,52 @@ do_colouration = 1 color_blend_mode = ICON_MULTIPLY +/datum/sprite_accessory/tail/fennec_tail + name = "Fennec tail" + desc = "" + icon_state = "fennec_tail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/fox_tail + name = "Fox tail, colorable" + desc = "" + icon_state = "fox_tail_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/fox_tail_plain + name = "Fox tail, colorable, plain" + desc = "" + icon_state = "fox_tail_plain_s" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/foxtail + name = "Fox tail, colourable (vwag)" + desc = "" + icon_state = "foxtail" + extra_overlay = "foxtail-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "foxtail_w" + extra_overlay_w = "foxtail-tips_w" + +/datum/sprite_accessory/tail/doublekitsune + name = "Kitsune 2 tails, colorable" + desc = "" + icon_state = "doublekitsune" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + +/datum/sprite_accessory/tail/doublekitsunealt + name = "Kitsune 2 tails, colorable, alt" + desc = "" + icon_state = "doublekitsunealt" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + extra_overlay = "doublekitsunealt-tips" + /datum/sprite_accessory/tail/triplekitsune_colorable name = "Kitsune 3 tails, colorable" desc = "" @@ -972,6 +1011,14 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "triplekitsune_tips" +/datum/sprite_accessory/tail/sevenkitsune_colorable + name = "Kitsune 7 tails, colorable" + desc = "" + icon_state = "sevenkitsune" + extra_overlay = "sevenkitsune-tips" + do_colouration = 1 + color_blend_mode = ICON_MULTIPLY + /datum/sprite_accessory/tail/ninekitsune_colorable name = "Kitsune 9 tails, colorable" desc = "" @@ -980,6 +1027,16 @@ color_blend_mode = ICON_MULTIPLY extra_overlay = "ninekitsune-tips" +/datum/sprite_accessory/tail/hideableninetails + name = "Kitsune 9-in-1 tail, colourable (vwag)" + desc = "" + icon_state = "ninekitsune" + extra_overlay = "ninekitsune-tips" + do_colouration = TRUE + color_blend_mode = ICON_MULTIPLY + ani_state = "foxtail_w" + extra_overlay_w = "foxtail-tips_w" + /datum/sprite_accessory/tail/shadekin_short name = "Shadekin Short Tail, colorable" desc = "" @@ -1058,27 +1115,6 @@ ani_state = "Segmentedtail_w" extra_overlay_w = "Segmentedlights_w" -/datum/sprite_accessory/tail/fox_tail - name = "Fox tail" - desc = "" - icon_state = "fox_tail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/fox_tail_plain - name = "Fox tail" - desc = "" - icon_state = "fox_tail_plain_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - -/datum/sprite_accessory/tail/fennec_tail - name = "Fennec tail" - desc = "" - icon_state = "fennec_tail_s" - do_colouration = 1 - color_blend_mode = ICON_MULTIPLY - /datum/sprite_accessory/tail/lizard_tail_smooth name = "Lizard Tail (Smooth)" desc = "" @@ -1147,3 +1183,22 @@ ani_state = "tentacle_w" do_colouration = 1 color_blend_mode = ICON_MULTIPLY + +//LONG TAILS ARE NOT TAUR BUTTS >:O +/datum/sprite_accessory/tail/longtail + name = "You should not see this..." + icon = 'icons/mob/vore/taurs_vr.dmi' + do_colouration = 1 // Yes color, using tail color + color_blend_mode = ICON_MULTIPLY // The sprites for taurs are designed for ICON_MULTIPLY + +/datum/sprite_accessory/tail/longtail/shadekin_tail + name = "Shadekin Tail" + icon_state = "shadekin_s" + +/datum/sprite_accessory/tail/longtail/shadekin_tail/shadekin_tail_2c + name = "Shadekin Tail (dual color)" + extra_overlay = "shadekin_markings" + +/datum/sprite_accessory/tail/longtail/shadekin_tail/shadekin_tail_long + name = "Shadekin Long Tail" + icon_state = "shadekin_long_s" diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 66233db64c..4fa3d66e1f 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -26,14 +26,15 @@ //Hoooo boy. /datum/riding/taur/get_offsets(pass_index) // list(dir = x, y, layer) var/mob/living/L = ridden - var/scale_x = L.icon_scale_x * L.size_multiplier //VOREStation Edit - var/scale_y = L.icon_scale_y * L.size_multiplier //VOREStation Edit + var/scale_x = L.icon_scale_x * L.size_multiplier //VOREStation Edit Start + var/scale_y = L.icon_scale_y * L.size_multiplier + var/scale_difference = (L.size_multiplier - rider_size) * 10 var/list/values = list( - "[NORTH]" = list(0, 8*scale_y, ABOVE_MOB_LAYER), - "[SOUTH]" = list(0, 8*scale_y, BELOW_MOB_LAYER), - "[EAST]" = list(-10*scale_x, 8*scale_y, ABOVE_MOB_LAYER), - "[WEST]" = list(10*scale_x, 8*scale_y, ABOVE_MOB_LAYER)) + "[NORTH]" = list(0, 8*scale_y + scale_difference, ABOVE_MOB_LAYER), + "[SOUTH]" = list(0, 8*scale_y + scale_difference, BELOW_MOB_LAYER), + "[EAST]" = list(-10*scale_x, 8*scale_y + scale_difference, ABOVE_MOB_LAYER), + "[WEST]" = list(10*scale_x, 8*scale_y + scale_difference, ABOVE_MOB_LAYER)) //VOREStation Edit End return values @@ -74,6 +75,7 @@ . = ..() if(.) + riding_datum.rider_size = M.size_multiplier buckled_mobs[M] = "riding" /mob/living/carbon/human/MouseDrop_T(mob/living/M, mob/living/user) //Prevention for forced relocation caused by can_buckle. Base proc has no other use. @@ -326,20 +328,3 @@ icon_state = "mermaid_s" can_ride = 0 icon_sprite_tag = "mermaid" - -/datum/sprite_accessory/tail/taur/shadekin_tail - name = "Shadekin Tail" - icon_state = "shadekin_s" - can_ride = 0 - hide_body_parts = null - clip_mask_icon = null - clip_mask_state = null - //species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_2c - name = "Shadekin Tail (dual color)" - extra_overlay = "shadekin_markings" - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long - name = "Shadekin Long Tail" - icon_state = "shadekin_long_s" diff --git a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm index 1652fbfca9..2bfb196e4d 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -478,24 +478,6 @@ msg_prey_stepunder = "You jump over %prey's thick tail." msg_owner_stepunder = "%owner bounds over your tail." -/datum/sprite_accessory/tail/taur/shadekin_tail - name = "Shadekin Tail" - icon_state = "shadekin_s" - can_ride = 0 - hide_body_parts = null - clip_mask_icon = null - clip_mask_state = null - //apply_restrictions = TRUE - //species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_2c - name = "Shadekin Tail (dual color)" - extra_overlay = "shadekin_markings" - -/datum/sprite_accessory/tail/taur/shadekin_tail/shadekin_tail_long - name = "Shadekin Long Tail" - icon_state = "shadekin_long_s" - /datum/sprite_accessory/tail/taur/pawcow // this grabs suit sprites from the normal cow, the outline is the same name = "Cow w/ paws (Taur)" icon_state = "pawcow_s" @@ -595,3 +577,10 @@ msg_owner_grab_fail = "You step down onto %prey with one of your vines, forcing them onto the ground!" msg_prey_grab_fail = "%owner steps down onto you with one of their vines, squishing you and forcing you onto the ground!" + +/datum/sprite_accessory/tail/taur/rat + name = "Rat (dual color)" + icon_state = "rat_s" + extra_overlay = "rat_markings" + clip_mask_state = "taur_clip_mask_rat" + icon_sprite_tag = "rat" \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 2d772b44ae..2773ee3660 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -91,14 +91,14 @@ name = "Bald" icon_state = "bald" gender = MALE - species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //Lets all the races be bald if they want. + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //Lets all the races be bald if they want. /datum/sprite_accessory/hair/ponytail6_fixed name = "Ponytail 6 but fixed" icon = 'icons/mob/human_face_vr.dmi' icon_add = 'icons/mob/human_face_vr_add.dmi' icon_state = "hair_ponytail6" - species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA,SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_NEVREAN, SPECIES_AKULA,SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) /datum/sprite_accessory/hair/una_hood name = "Cobra Hood" @@ -463,23 +463,29 @@ species_allowed = list(SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) gender = NEUTER +/datum/sprite_accessory/hair/slicker + name = "Slicker" + icon = 'icons/mob/human_face_vr.dmi' + icon_add = 'icons/mob/human_face_vr_add.dmi' + icon_state = "hair_slicker" + /datum/sprite_accessory/facial_hair icon = 'icons/mob/human_face_or_vr.dmi' color_blend_mode = ICON_MULTIPLY - species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This lets all races use the facial hair styles. + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This lets all races use the facial hair styles. /datum/sprite_accessory/facial_hair/shaved name = "Shaved" icon_state = "bald" gender = NEUTER - species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) //This needed to be manually defined, apparantly. + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) //This needed to be manually defined, apparantly. /datum/sprite_accessory/facial_hair/neck_fluff name = "Neck Fluff" icon = 'icons/mob/human_face_or_vr.dmi' icon_state = "facial_neckfluff" gender = NEUTER - species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST) + species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW) /datum/sprite_accessory/facial_hair/vulp_none name = "None" diff --git a/code/modules/mob/new_player/sprite_accessories_wing.dm b/code/modules/mob/new_player/sprite_accessories_wing.dm index 85bdedd04a..ded7a70937 100644 --- a/code/modules/mob/new_player/sprite_accessories_wing.dm +++ b/code/modules/mob/new_player/sprite_accessories_wing.dm @@ -21,7 +21,7 @@ var/extra_overlay_w // Flapping state for extra overlay var/extra_overlay2_w - species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) + //species_allowed = list(SPECIES_EVENT1, SPECIES_EVENT2, SPECIES_EVENT3) //Removing Polaris whitelits, ones we need are defined in our files /datum/sprite_accessory/wing/featheredlarge //Made by Natje! name = "large feathered wings (colorable)" diff --git a/code/modules/mob/new_player/sprite_accessories_wing_vr.dm b/code/modules/mob/new_player/sprite_accessories_wing_vr.dm index 7cc4dfc081..c747c4923b 100644 --- a/code/modules/mob/new_player/sprite_accessories_wing_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_wing_vr.dm @@ -133,6 +133,7 @@ icon_state = "neckfur" do_colouration = 1 color_blend_mode = ICON_MULTIPLY + extra_overlay = "neckfur_markings" /datum/sprite_accessory/wing/feathered name = "feathered wings, colorable" diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 7a3a4da632..65014be37f 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -103,7 +103,7 @@ var/global/ntnet_card_uid = 1 var/holderz = get_z(holder2) if(!holderz) //no reception in nullspace return 0 - var/list/zlevels_in_range = using_map.get_map_levels(holderz, FALSE) + var/list/zlevels_in_range = using_map.get_map_levels(holderz, FALSE)// VOREStation Edit - , om_range = DEFAULT_OVERMAP_RANGE) var/list/zlevels_in_long_range = using_map.get_map_levels(holderz, TRUE, om_range = DEFAULT_OVERMAP_RANGE) - zlevels_in_range var/best = 0 for(var/obj/machinery/ntnet_relay/R as anything in ntnet_global.relays) diff --git a/code/modules/multiz/ladder_assembly_vr.dm b/code/modules/multiz/ladder_assembly_vr.dm index 49f765225a..3512a3b07f 100644 --- a/code/modules/multiz/ladder_assembly_vr.dm +++ b/code/modules/multiz/ladder_assembly_vr.dm @@ -4,7 +4,7 @@ /obj/structure/ladder_assembly name = "ladder assembly" - icon = 'icons/obj/structures.dmi' + icon = 'icons/obj/structures_vr.dmi' icon_state = "ladder00" density = FALSE opacity = 0 @@ -21,6 +21,9 @@ created_name = t return + else if(istype(get_area(src), /area/shuttle)) + to_chat(user, "\The [src] cannot be constructed on a shuttle.") + return if(W.is_wrench()) switch(state) if(CONSTRUCTION_UNANCHORED) @@ -86,6 +89,8 @@ if(!T) continue var/obj/structure/ladder_assembly/LA = locate(/obj/structure/ladder_assembly, T) if(!LA) continue + if(direction == DOWN && (src.z in using_map.below_blocked_levels)) continue + if(direction == UP && (LA.z in using_map.below_blocked_levels)) continue if(LA.state != CONSTRUCTION_WELDED) to_chat(user, "\The [LA] [direction == UP ? "above" : "below"] must be secured and welded.") return diff --git a/code/modules/multiz/ladders.dm b/code/modules/multiz/ladders.dm index b4626022bb..0f9edf04c8 100644 --- a/code/modules/multiz/ladders.dm +++ b/code/modules/multiz/ladders.dm @@ -33,6 +33,13 @@ target_up = null return ..() +/obj/structure/ladder/attack_generic(mob/user) + //Simple Animal + if(isanimal(user)) + attack_hand(user) + else + return ..() + /obj/structure/ladder/attackby(obj/item/C as obj, mob/user as mob) attack_hand(user) return diff --git a/code/modules/multiz/ladders_vr.dm b/code/modules/multiz/ladders_vr.dm deleted file mode 100644 index 6892e2ef12..0000000000 --- a/code/modules/multiz/ladders_vr.dm +++ /dev/null @@ -1,122 +0,0 @@ -/obj/structure/portal_subtle - name = "portal" - desc = "Looks unstable. Best to test it with the clown." - icon = 'icons/obj/stationobjs.dmi' - icon_state = "portal" - density = TRUE - unacidable = TRUE//Can't destroy energy portals. - var/failchance = 0 - anchored = TRUE - var/obj/structure/portal_subtle/target - -/obj/structure/portal_subtle/Destroy() - if(target) - target.target = null - target = null - return ..() - -/obj/structure/portal_subtle/Bumped(mob/M as mob|obj) - if(istype(M,/mob) && !(istype(M,/mob/living))) - return //do not send ghosts, zshadows, ai eyes, etc - spawn(0) - src.teleport(M) - return - return - -/obj/structure/portal_subtle/Crossed(AM as mob|obj) - if(istype(AM,/mob) && !(istype(AM,/mob/living))) - return //do not send ghosts, zshadows, ai eyes, etc - spawn(0) - src.teleport(AM) - return - return - -/obj/structure/portal_subtle/attack_hand(mob/user as mob) - if(istype(user) && !(istype(user,/mob/living))) - return //do not send ghosts, zshadows, ai eyes, etc - spawn(0) - src.teleport(user) - return - return - -/obj/structure/portal_subtle/proc/teleport(atom/movable/M as mob|obj) - if(istype(M, /obj/effect)) //sparks don't teleport - return - if (M.anchored&&istype(M, /obj/mecha)) - return - if (icon_state == "portal1") - return - if (!( target )) - qdel(src) - return - if (istype(target, /obj/structure/portal_subtle)) - qdel(src) - return - if (istype(M, /atom/movable)) - if(prob(failchance)) //oh dear a problem, put em in deep space - src.icon_state = "portal1" - do_noeffect_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0) - else - do_noeffect_teleport(M, target, 0) ///You will appear on the beacon - -/obj/structure/portal_gateway - name = "portal" - desc = "Looks unstable. Best to test it with the clown." - icon = 'icons/obj/stationobjs_vr.dmi' - icon_state = "portalgateway" - density = TRUE - unacidable = TRUE//Can't destroy energy portals. - anchored = TRUE - -/obj/structure/portal_gateway/Bumped(mob/M as mob|obj) - if(istype(M,/mob) && !(istype(M,/mob/living))) - return //do not send ghosts, zshadows, ai eyes, etc - var/obj/effect/landmark/dest = pick(eventdestinations) - if(dest) - M << 'sound/effects/phasein.ogg' - playsound(src, 'sound/effects/phasein.ogg', 100, 1) - M.forceMove(dest.loc) - if(istype(M, /mob/living) && dest.abductor) - var/mob/living/L = M - //Situations to get the mob out of - if(L.buckled) - L.buckled.unbuckle_mob() - if(istype(L.loc,/obj/mecha)) - var/obj/mecha/ME = L.loc - ME.go_out() - else if(istype(L.loc,/obj/machinery/sleeper)) - var/obj/machinery/sleeper/SL = L.loc - SL.go_out() - else if(istype(L.loc,/obj/machinery/recharge_station)) - var/obj/machinery/recharge_station/RS = L.loc - RS.go_out() - if(!issilicon(L)) //Don't drop borg modules... - var/list/mob_contents = list() //Things which are actually drained as a result of the above not being null. - mob_contents |= L // The recursive check below does not add the object being checked to its list. - mob_contents |= recursive_content_check(L, mob_contents, recursion_limit = 3, client_check = 0, sight_check = 0, include_mobs = 1, include_objects = 1, ignore_show_messages = 1) - for(var/obj/item/weapon/holder/I in mob_contents) - var/obj/item/weapon/holder/H = I - var/mob/living/MI = H.held_mob - MI.forceMove(get_turf(H)) - if(!issilicon(MI)) //Don't drop borg modules... - for(var/obj/item/II in MI) - if(istype(II,/obj/item/weapon/implant) || istype(II,/obj/item/device/nif)) - continue - MI.drop_from_inventory(II, dest.loc) - var/obj/effect/landmark/finaldest = pick(awayabductors) - MI.forceMove(finaldest.loc) - sleep(1) - MI.Paralyse(10) - MI << 'sound/effects/bamf.ogg' - to_chat(MI,"You're starting to come to. You feel like you've been out for a few minutes, at least...") - for(var/obj/item/I in L) - if(istype(I,/obj/item/weapon/implant) || istype(I,/obj/item/device/nif)) - continue - L.drop_from_inventory(I, dest.loc) - var/obj/effect/landmark/finaldest = pick(awayabductors) - L.forceMove(finaldest.loc) - sleep(1) - L.Paralyse(10) - L << 'sound/effects/bamf.ogg' - to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") - return diff --git a/code/modules/multiz/misc.dm b/code/modules/multiz/misc.dm new file mode 100644 index 0000000000..041cb4c375 --- /dev/null +++ b/code/modules/multiz/misc.dm @@ -0,0 +1,20 @@ +// Invisible object that blocks z transfer to/from its turf and the turf above. +/obj/effect/ceiling + invisibility = 101 // nope cant see this + anchored = 1 + can_atmos_pass = ATMOS_PASS_PROC + +/obj/effect/ceiling/CanZASPass(turf/T, is_zone) + if(T == GetAbove(src)) + return FALSE // Keep your air up there, buddy + return TRUE + +/obj/effect/ceiling/CanPass(atom/movable/mover, turf/target) + if(target == GetAbove(src)) + return FALSE + return TRUE + +/obj/effect/ceiling/Uncross(atom/movable/mover, turf/target) + if(target == GetAbove(src)) + return FALSE + return TRUE \ No newline at end of file diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm index 725eda4848..f4fb3ffef8 100644 --- a/code/modules/multiz/movement.dm +++ b/code/modules/multiz/movement.dm @@ -59,7 +59,7 @@ if(lattice) var/pull_up_time = max(5 SECONDS + (src.movement_delay() * 10), 1) to_chat(src, "You grab \the [lattice] and start pulling yourself upward...") - destination.audible_message("You hear something climbing up \the [lattice].", runemessage = "clank clang") + src.audible_message("[src] begins climbing up \the [lattice].", runemessage = "clank clang") if(do_after(src, pull_up_time)) to_chat(src, "You pull yourself up.") else @@ -74,14 +74,14 @@ if(!destination?.Enter(src, old_dest)) to_chat(src, "There's something in the way up above in that direction, try another.") return 0 - destination.audible_message("You hear something climbing up \the [catwalk].", runemessage = "clank clang") + src.audible_message("[src] begins climbing up \the [lattice].", runemessage = "clank clang") if(do_after(src, pull_up_time)) to_chat(src, "You pull yourself up.") else to_chat(src, "You gave up on pulling yourself up.") return 0 - else if(ismob(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? + else if(isliving(src)) //VOREStation Edit Start. Are they a mob, and are they currently flying?? var/mob/living/H = src if(H.flying) if(H.incapacitated(INCAPACITATION_ALL)) @@ -90,7 +90,6 @@ return 0 var/fly_time = max(7 SECONDS + (H.movement_delay() * 10), 1) //So it's not too useful for combat. Could make this variable somehow, but that's down the road. to_chat(src, "You begin to fly upwards...") - destination.audible_message("You hear the flapping of wings.", runemessage = "flap flap") H.audible_message("[H] begins to flap \his wings, preparing to move upwards!", runemessage = "flap flap") if(do_after(H, fly_time) && H.flying) to_chat(src, "You fly upwards.") @@ -111,6 +110,11 @@ return 0 if(!Move(destination)) return 0 + if(isliving(src)) + if(direction == UP) + src.audible_message("[src] moves up.") + else if(direction == DOWN) + src.audible_message("[src] moves down.") return 1 /mob/proc/can_overcome_gravity() @@ -467,13 +471,16 @@ // Take damage from falling and hitting the ground /mob/living/fall_impact(var/atom/hit_atom, var/damage_min = 0, var/damage_max = 5, var/silent = FALSE, var/planetary = FALSE) var/turf/landing = get_turf(hit_atom) + var/safe_fall = FALSE + if(src.softfall || (istype(src, /mob/living/simple_mob) && src.mob_size <= MOB_SMALL)) + safe_fall = TRUE if(planetary && src.CanParachute()) if(!silent) visible_message("\The [src] glides in from above and lands on \the [landing]!", \ "You land on \the [landing]!", \ "You hear something land \the [landing].") return - else if(!planetary && src.softfall) // Falling one floor and falling one atmosphere are very different things + else if(!planetary && safe_fall) // Falling one floor and falling one atmosphere are very different things if(!silent) visible_message("\The [src] falls from above and lands on \the [landing]!", \ "You land on \the [landing]!", \ diff --git a/code/modules/multiz/movement_vr.dm b/code/modules/multiz/movement_vr.dm index b217176e50..2df84190ce 100644 --- a/code/modules/multiz/movement_vr.dm +++ b/code/modules/multiz/movement_vr.dm @@ -32,26 +32,43 @@ return 0 var/mob/living/pred = hit_atom - pred.visible_message("\The [hit_atom] falls onto \the [src]!") - pred.Weaken(8) + var/safe_fall = FALSE + if(pred.softfall || (istype(pred, /mob/living/simple_mob) && pred.mob_size <= MOB_SMALL)) // TODO: add ability for mob below to be 'soft' and cushion fall + safe_fall = TRUE + + if(istype(pred, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = pred + if(H.species.soft_landing) + safe_fall = TRUE + var/mob/living/prey = src var/fallloc = prey.loc if(pred.can_be_drop_pred && prey.can_be_drop_prey) pred.feed_grabbed_to_self_falling_nom(pred,prey) pred.loc = fallloc + if(!safe_fall) + pred.Weaken(8) + pred.visible_message("\The [pred] falls right onto \the [prey]!") else if(prey.can_be_drop_pred && pred.can_be_drop_prey) prey.feed_grabbed_to_self_falling_nom(prey,pred) + pred.Weaken(4) + pred.visible_message("\The [pred] falls right into \the [prey]!") else - prey.Weaken(8) pred.loc = prey.loc - playsound(src, "punch", 25, 1, -1) - var/tdamage - for(var/i = 1 to 10) - tdamage = rand(0, 10)/2 - pred.adjustBruteLoss(tdamage) - prey.adjustBruteLoss(tdamage) - pred.updatehealth() - prey.updatehealth() + if(!safe_fall) + pred.Weaken(8) + prey.Weaken(8) + playsound(src, "punch", 25, 1, -1) + var/tdamage + for(var/i = 1 to 5) //Twice as less damage because cushioned fall, but both get damaged. + tdamage = rand(0, 5) + pred.adjustBruteLoss(tdamage) + prey.adjustBruteLoss(tdamage) + pred.updatehealth() + prey.updatehealth() + pred.visible_message("\The [pred] falls onto \the [prey]!") + else + pred.visible_message("\The [pred] safely brushes past \the [prey] as they land.") return 1 /mob/observer/dead/CheckFall() diff --git a/code/modules/multiz/portals_vr.dm b/code/modules/multiz/portals_vr.dm new file mode 100644 index 0000000000..443134c4dd --- /dev/null +++ b/code/modules/multiz/portals_vr.dm @@ -0,0 +1,227 @@ +/obj/structure/portal_event + name = "portal" + desc = "It leads to someplace else!" + icon = 'icons/obj/stationobjs_vr.dmi' + icon_state = "type-d-portal" + density = TRUE + unacidable = TRUE//Can't destroy energy portals. + var/failchance = 0 + anchored = TRUE + var/obj/structure/portal_event/target + +/obj/structure/portal_event/Destroy() + if(target) + target.target = null + target = null + return ..() + +/obj/structure/portal_event/Bumped(mob/M as mob|obj) + if(istype(M,/mob) && !(istype(M,/mob/living))) + return //do not send ghosts, zshadows, ai eyes, etc + spawn(0) + src.teleport(M) + return + return + +/obj/structure/portal_event/Crossed(AM as mob|obj) + if(istype(AM,/mob) && !(istype(AM,/mob/living))) + return //do not send ghosts, zshadows, ai eyes, etc + spawn(0) + src.teleport(AM) + return + return + +/obj/structure/portal_event/attack_hand(mob/user as mob) + if(!istype(user)) + return + if(!target) + if(isliving(user)) + to_chat(user, "Your hand scatters \the [src]...") + qdel(src) //Delete portals which aren't set that people mess with. + else return //do not send ghosts, zshadows, ai eyes, etc + else if(isliving(user) || istype(user, /mob/observer/dead) && user?.client?.holder) //unless they're staff + spawn(0) + src.teleport(user) + +/obj/structure/portal_event/attack_ghost(var/mob/observer/dead/user) + if(!target && user?.client?.holder) + to_chat(user, "Selecting 'Portal Here' will create and link a portal at your location, while 'Target Here' will create an object that is only visible to ghosts which will act as the target, again at your location. Each option will give you the ability to change portal types, but for all options except 'Select Type' you only get one shot at it, so be sure to experiment with 'Select Type' first if you're not familiar with them.") + var/response = tgui_alert(user, "You appear to be staff. This portal has no exit point. If you want to make one, move to where you want it to go, and click the appropriate option, see chat for more info, otherwise click 'Cancel'", "Unbound Portal", list("Cancel","Portal Here","Target Here", "Select Type")) + if(response == "Portal Here") + target = new type(get_turf(user), src) + target.target = src + target.icon_state = icon_state + var/letsportal = tgui_alert(user, "Would you like to select a different portal type for these portals?", "Change portal", list("No","Yes")) + if(letsportal == "Yes") + var/portal_icon_selection = select_portal_subtype(user) + icon_state = portal_icon_selection + target.icon_state = portal_icon_selection + if(response == "Target Here") + var/obj/structure/portal_target/newtarg = new(get_turf(user)) + target = newtarg + newtarg.target = src + var/letsportal = tgui_alert(user, "Would you like to select a different portal type?", "Change portal", list("No","Yes")) + if(letsportal == "Yes") + user.forceMove(src) + icon_state = select_portal_subtype(user) + if(response == "Select Type") + icon_state = select_portal_subtype(user) + return + message_admins("The [src]([x],[y],[z]) was given [target]([target.x],[target.y],[target.z]) as a target, and should be ready to use.") + else if(user?.client?.holder) + src.teleport(user) + else return + +/obj/structure/portal_event/proc/select_portal_subtype(user) + var/portal_type = tgui_alert(user, "What kind of portal would you like it to be?", "Type Selection", list("Tech (Default)","Star","Weird Green","Pulsing")) + var/portal_icon_selection = "type-d-portal" + if(portal_type == "Tech (Default)") + portal_icon_selection = "type-d-portal" + if(portal_type == "Star") + var/portal_subtype = tgui_alert(user, "Which subtype would you prefer?", "Subtype Selection", list("Blue","Blue Pulse","Blue Unstable","Red","Red Unstable")) + if(portal_subtype == "Blue") + portal_icon_selection = "type-a-blue-portal" + if(portal_subtype == "Blue Pulse") + portal_icon_selection = "type-a-blue-portal-b" + if(portal_subtype == "Blue Unstable") + portal_icon_selection = "type-a-blue-portal-c" + if(portal_subtype == "Red") + portal_icon_selection = "type-a-red-portal" + if(portal_subtype == "Red Unstable") + portal_icon_selection = "type-a-red-portal-b" + if(portal_type == "Weird Green") + portal_icon_selection = "type-b-portal" + if(portal_type == "Pulsing") + var/portal_subtype = tgui_alert(user, "Which subtype would you prefer?", "Subtype Selection", list("Blue","Red","Blue/Red Mix", "Yellow")) + if(portal_subtype == "Blue") + portal_icon_selection = "type-c-blue-portal" + if(portal_subtype == "Red") + portal_icon_selection = "type-c-red-portal" + if(portal_subtype == "Blue/Red Mix") + portal_icon_selection = "type-c-mix-portal" + if(portal_subtype == "Yellow") + portal_icon_selection = "type-c-yellow-portal" + return portal_icon_selection + +/obj/structure/portal_event/proc/teleport(atom/movable/M as mob|obj) + if(istype(M, /obj/effect)) //sparks don't teleport + return + if (M.anchored&&istype(M, /obj/mecha)) + return + if (!target) + to_chat(M, "\The [src] scatters as you pass through it...") + qdel(src) + return + if (!istype(M, /atom/movable)) + return + var/turf/place + if(isturf(target)) + place = src + else + place = target.loc + var/portalfind = FALSE + for(var/obj/structure/S in place.contents) + if(istype(S, /obj/structure/portal_event)) + portalfind = TRUE + else if (S.density) + portalfind = TRUE + var/temptarg + if(portalfind) + var/possible_turfs = place.AdjacentTurfs() + if(isemptylist(possible_turfs)) + to_chat(M, "Something blocks your way.") + return + temptarg = pick(possible_turfs) + do_noeffect_teleport(M, temptarg, 0) + else if (istype(M, /atom/movable)) + do_noeffect_teleport(M, target, 0) + +/obj/structure/portal_event/Destroy() + if(target) + if(istype(target, /obj/structure/portal_event)) + var/obj/structure/portal_event/P = target + P.target = null + if(istype(target, /obj/structure/portal_target)) + var/obj/structure/portal_target/P = target + P.target = null + qdel_null(target) + . = ..() + +/obj/structure/portal_target + name = "portal destination" + desc = "you shouldn't see this unless you're a ghost" + icon = 'icons/obj/stationobjs_vr.dmi' + icon_state = "type-b-portal" + density = 0 + alpha = 100 + invisibility = INVISIBILITY_OBSERVER + var/target + +/obj/structure/portal_target/Destroy() + if(target) + var/obj/structure/portal_event/T = target + T.target = null + target = null + . = ..() + +/obj/structure/portal_gateway + name = "portal" + desc = "It leads to someplace else!" + icon = 'icons/obj/stationobjs_vr.dmi' + icon_state = "portalgateway" + density = TRUE + unacidable = TRUE//Can't destroy energy portals. + anchored = TRUE + +/obj/structure/portal_gateway/Bumped(mob/M as mob|obj) + if(istype(M,/mob) && !(istype(M,/mob/living))) + return //do not send ghosts, zshadows, ai eyes, etc + var/obj/effect/landmark/dest = pick(eventdestinations) + if(dest) + M << 'sound/effects/phasein.ogg' + playsound(src, 'sound/effects/phasein.ogg', 100, 1) + M.forceMove(dest.loc) + if(istype(M, /mob/living) && dest.abductor) + var/mob/living/L = M + //Situations to get the mob out of + if(L.buckled) + L.buckled.unbuckle_mob() + if(istype(L.loc,/obj/mecha)) + var/obj/mecha/ME = L.loc + ME.go_out() + else if(istype(L.loc,/obj/machinery/sleeper)) + var/obj/machinery/sleeper/SL = L.loc + SL.go_out() + else if(istype(L.loc,/obj/machinery/recharge_station)) + var/obj/machinery/recharge_station/RS = L.loc + RS.go_out() + if(!issilicon(L)) //Don't drop borg modules... + var/list/mob_contents = list() //Things which are actually drained as a result of the above not being null. + mob_contents |= L // The recursive check below does not add the object being checked to its list. + mob_contents |= recursive_content_check(L, mob_contents, recursion_limit = 3, client_check = 0, sight_check = 0, include_mobs = 1, include_objects = 1, ignore_show_messages = 1) + for(var/obj/item/weapon/holder/I in mob_contents) + var/obj/item/weapon/holder/H = I + var/mob/living/MI = H.held_mob + MI.forceMove(get_turf(H)) + if(!issilicon(MI)) //Don't drop borg modules... + for(var/obj/item/II in MI) + if(istype(II,/obj/item/weapon/implant) || istype(II,/obj/item/device/nif)) + continue + MI.drop_from_inventory(II, dest.loc) + var/obj/effect/landmark/finaldest = pick(awayabductors) + MI.forceMove(finaldest.loc) + sleep(1) + MI.Paralyse(10) + MI << 'sound/effects/bamf.ogg' + to_chat(MI,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + for(var/obj/item/I in L) + if(istype(I,/obj/item/weapon/implant) || istype(I,/obj/item/device/nif)) + continue + L.drop_from_inventory(I, dest.loc) + var/obj/effect/landmark/finaldest = pick(awayabductors) + L.forceMove(finaldest.loc) + sleep(1) + L.Paralyse(10) + L << 'sound/effects/bamf.ogg' + to_chat(L,"You're starting to come to. You feel like you've been out for a few minutes, at least...") + return diff --git a/code/modules/multiz/stairs.dm b/code/modules/multiz/stairs.dm index 99b015c6c2..59e6374895 100644 --- a/code/modules/multiz/stairs.dm +++ b/code/modules/multiz/stairs.dm @@ -148,10 +148,12 @@ // Or if we fell down the openspace if((top in oldloc) || oldloc == GetAbove(src)) return - + //VOREStation Addition Start + if(istype(AM, /obj/effect/plant)) + return + //VOREStation Addition End if(isobserver(AM)) // Ghosts have their own methods for going up and down return - if(AM.pulledby) // Animating the movement of pulled things is handled when the puller goes up the stairs return @@ -199,16 +201,16 @@ /obj/structure/stairs/bottom/use_stairs_instant(var/atom/movable/AM) if(isobserver(AM)) // Ghosts have their own methods for going up and down return - + //VOREStation Addition Start + if(istype(AM, /obj/effect/plant)) + return + //VOREStation Addition End if(isliving(AM)) var/mob/living/L = AM if(L.grabbed_by.len) // Same as pulledby, whoever's holding you will keep you from going down stairs. return - if(L.has_buckled_mobs()) - return - if(L.buckled) L.buckled.forceMove(get_turf(top)) @@ -395,7 +397,7 @@ /obj/structure/stairs/top/Uncrossed(var/atom/movable/AM) // Going down stairs from the topstair piece - if(AM.dir == turn(dir, 180) && check_integrity()) + if(AM.dir == turn(dir, 180) && isturf(AM.loc) && check_integrity()) use_stairs_instant(AM) return @@ -404,10 +406,12 @@ // Or if we climb up the middle if((bottom in oldloc) || oldloc == GetBelow(src)) return - + //VOREStation Addition Start + if(istype(AM, /obj/effect/plant)) + return + //VOREStation Addition End if(isobserver(AM)) // Ghosts have their own methods for going up and down return - if(AM.pulledby) // Animating the movement of pulled things is handled when the puller goes up the stairs return @@ -453,24 +457,27 @@ /obj/structure/stairs/top/use_stairs_instant(var/atom/movable/AM) if(isobserver(AM)) // Ghosts have their own methods for going up and down return - + //VOREStation Addition Start + if(istype(AM, /obj/effect/plant)) + return + //VOREStation Addition End if(isliving(AM)) var/mob/living/L = AM - if(L.grabbed_by.len) // Same as pulledby, whoever's holding you will keep you from going down stairs. return - if(L.has_buckled_mobs()) - return - if(L.buckled) L.buckled.forceMove(get_turf(bottom)) + var/atom/movable/P = null + if(L.pulling && !L.pulling.anchored) + P = L.pulling + P.forceMove(get_turf(L)) + L.forceMove(get_turf(bottom)) // If the object is pulling or grabbing anything, we'll want to move those too. A grab chain may be disrupted in doing so. - if(L.pulling && !L.pulling.anchored) - var/atom/movable/P = L.pulling + if(P) P.forceMove(get_turf(bottom)) L.start_pulling(P) diff --git a/code/modules/nifsoft/nif.dm b/code/modules/nifsoft/nif.dm index edcb661dd1..fe6e1c4938 100644 --- a/code/modules/nifsoft/nif.dm +++ b/code/modules/nifsoft/nif.dm @@ -28,6 +28,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable var/durability = 100 // Durability remaining var/bioadap = FALSE // If it'll work in fancy species + var/gib_nodrop = FALSE // NIF self-destructs when owner is gibbed var/tmp/power_usage = 0 // Nifsoft adds to this var/tmp/mob/living/carbon/human/human // Our owner! @@ -197,6 +198,9 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable wear *= (rand(85,115) / 100) //Apparently rand() only takes integers. durability -= wear + if(human) + persist_nif_data(human) + if(durability <= 0) stat = NIF_TEMPFAIL update_icon() @@ -205,6 +209,13 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable notify("Danger! General system insta#^!($",TRUE) to_chat(human,"Your NIF vision overlays disappear and your head suddenly seems very quiet...") +//Repair update/check proc +/obj/item/device/nif/proc/repair(var/repair = 0) + durability = min(durability + repair, initial(durability)) + + if(human) + persist_nif_data(human) + //Attackby proc, for maintenance /obj/item/device/nif/attackby(obj/item/weapon/W, mob/user as mob) if(open == 0 && W.is_screwdriver()) @@ -233,7 +244,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable user.visible_message("[user] closes up \the [src].","You re-seal \the [src] for use once more.") playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) open = FALSE - durability = initial(durability) + repair(initial(durability)) stat = NIF_PREINSTALL update_icon() @@ -258,7 +269,7 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable /obj/item/device/nif/proc/handle_install() if(human.stat || !human.mind) //No stuff while KO or not sleeved return FALSE - + persist_storable = FALSE //VOREStation edit - I am not sure if polaris has nifs, but just in case. //Firsties if(!install_done) if(human.mind.name == owner) @@ -608,6 +619,13 @@ You can also set the stat of a NIF to NIF_TEMPFAIL without any issues to disable durability = 75 bioadap = TRUE +/obj/item/device/nif/protean // Proteans' integrated NIF + name = "protean integrated NIF" + desc = "A NIF that is part of a protean's body structure. Where did you get that anyway?" + durability = 25 + bioadap = TRUE + gib_nodrop = TRUE + //////////////////////////////// // Special Promethean """surgery""" /obj/item/device/nif/attack(mob/living/M, mob/living/user, var/target_zone) diff --git a/code/modules/overmap/overmap_object.dm b/code/modules/overmap/overmap_object.dm index ad5bf60dd2..ad87d50e8b 100644 --- a/code/modules/overmap/overmap_object.dm +++ b/code/modules/overmap/overmap_object.dm @@ -23,7 +23,7 @@ /// For showing to the pilot of the ship, so they see the 'real' appearance, despite others seeing the unknown ones var/image/real_appearance - light_system = MOVABLE_LIGHT + //light_system = MOVABLE_LIGHT light_on = FALSE /obj/effect/overmap/Initialize() diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 9a1c0fb115..e09678f9b0 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -66,7 +66,7 @@ else data["status"] = "OK" var/list/contacts = list() - for(var/obj/effect/overmap/O in view(7,linked)) + for(var/obj/effect/overmap/O in range(7,linked)) if(linked == O) continue if(!O.scannable) @@ -125,10 +125,9 @@ return if(sensors && sensors.use_power && sensors.powered()) var/sensor_range = round(sensors.range*1.5) + 1 - linked.set_light_range(sensor_range + 0.5) - linked.set_light_on(TRUE) + linked.set_light(sensor_range + 0.5) else - linked.set_light_on(FALSE) + linked.set_light(0) /obj/machinery/shipsensors name = "sensors suite" diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm index 4c16b991bc..a76a39b60e 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -199,11 +199,10 @@ switch(status) if(SHIP_STATUS_LANDED) var/obj/effect/overmap/visitable/location = loc - if(istype(loc, /obj/effect/overmap/visitable/sector)) - return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines." - if(istype(loc, /obj/effect/overmap/visitable/ship)) + if(location.in_space) return "Docked with \the [location.name]. Use secondary thrust to get clear before activating primary engines." - return "Docked with an unknown object." + else + return "Landed on \the [location.name]. Use secondary thrust to get clear before activating primary engines." if(SHIP_STATUS_TRANSIT) return "Maneuvering under secondary thrust." if(SHIP_STATUS_OVERMAP) diff --git a/code/modules/overmap/ships/panicbutton.dm b/code/modules/overmap/ships/panicbutton.dm index dcbcbf500f..aa55ab8ad5 100644 --- a/code/modules/overmap/ships/panicbutton.dm +++ b/code/modules/overmap/ships/panicbutton.dm @@ -9,6 +9,9 @@ var/glass = TRUE var/launched = FALSE +/obj/structure/panic_button/small + icon_state = "smallpanicbutton" + // In case we're annihilated by a meteor /obj/structure/panic_button/Destroy() if(!launched) @@ -26,10 +29,10 @@ /obj/structure/panic_button/attack_hand(mob/living/user) if(!istype(user)) return ..() - + if(user.incapacitated()) return - + // Already launched if(launched) to_chat(user, "The button is already depressed; the beacon has been launched already.") @@ -61,10 +64,10 @@ S.distress(user) //Kind of pricey, but this is a one-time thing that can't be reused, so I'm not too worried. var/list/hear_z = GetConnectedZlevels(z) // multiz 'physical' connections only, not crazy overmap connections - + var/mapsize = (world.maxx+world.maxy)*0.5 var/turf/us = get_turf(src) - + for(var/hz in hear_z) for(var/mob/M as anything in GLOB.players_by_zlevel[hz]) var/sound/SND = sound('sound/misc/emergency_beacon_launched.ogg') // Inside the loop because playsound_local modifies it for each person, so, need separate instances diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 95bcda3b36..6920a73f28 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -106,11 +106,16 @@ //lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm! -/obj/item/weapon/paper/Initialize(mapload) - . = ..() +/obj/item/weapon/paper/Initialize(mapload, var/text, var/title) + . = ..() - if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player. - was_maploaded = TRUE + if(istext(title)) + name = title + if(istext(text)) + info = text + + if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player. + was_maploaded = TRUE /obj/item/weapon/paper/New(var/newloc, var/text, var/title) ..() @@ -324,6 +329,7 @@ t = replacetext(t, "\[/u\]", "") t = replacetext(t, "\[time\]", "[stationtime2text()]") t = replacetext(t, "\[date\]", "[stationdate2text()]") + t = replacetext(t, "\[station\]", "[station_name()]") t = replacetext(t, "\[large\]", "") t = replacetext(t, "\[/large\]", "") if(findtext(t, "\[sign\]")) @@ -580,11 +586,20 @@ return else if(istype(P, /obj/item/weapon/stamp) || istype(P, /obj/item/clothing/gloves/ring/seal)) + if(istype(P, /obj/item/weapon/stamp)) + var/obj/item/weapon/stamp/the_stamp = P + if(the_stamp.stamptext) + stamps += (stamps=="" ? "
" : "
") + "[the_stamp.stamptext]" + else + stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [the_stamp.name]." + else + var/obj/item/clothing/gloves/ring/seal/the_stamp = P + if(the_stamp.stamptext) + stamps += (stamps=="" ? "
" : "
") + "[the_stamp.stamptext]" + else + stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [the_stamp.name]." if((!in_range(src, usr) && loc != user && !( istype(loc, /obj/item/weapon/clipboard) ) && loc.loc != user && user.get_active_hand() != P)) return - - stamps += (stamps=="" ? "
" : "
") + "This paper has been stamped with the [P.name]." - var/image/stampoverlay = image('icons/obj/bureaucracy.dmi') var/x, y if(istype(P, /obj/item/weapon/stamp/captain) || istype(P, /obj/item/weapon/stamp/centcomm)) diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm index be60632186..c2d610f355 100644 --- a/code/modules/paperwork/stamps.dm +++ b/code/modules/paperwork/stamps.dm @@ -14,6 +14,7 @@ attack_verb = list("stamped") drop_sound = 'sound/items/drop/device.ogg' pickup_sound = 'sound/items/pickup/device.ogg' + var/stamptext = null /obj/item/weapon/stamp/captain name = "site manager's rubber stamp" diff --git a/code/modules/persistence/datum/persistence_datum.dm b/code/modules/persistence/datum/persistence_datum.dm index 325ff15ced..14d813406d 100644 --- a/code/modules/persistence/datum/persistence_datum.dm +++ b/code/modules/persistence/datum/persistence_datum.dm @@ -71,7 +71,7 @@ return var/_z = token["z"] - if(_z in using_map.station_levels) + if(_z in using_map.persist_levels) . = GetValidTurf(locate(token["x"], token["y"], _z), token) if(.) CreateEntryInstance(., token) @@ -82,7 +82,7 @@ if(GetEntryAge(entry) >= entries_expire_at) return FALSE var/turf/T = get_turf(entry) - if(!T || !(T.z in using_map.station_levels) ) + if(!T || !(T.z in using_map.persist_levels) ) return FALSE var/area/A = get_area(T) if(!A || (A.flags & AREA_FLAG_IS_NOT_PERSISTENT)) @@ -104,7 +104,7 @@ /datum/persistent/proc/Shutdown() if(fexists(filename)) fdel(filename) - + var/list/to_store = list() for(var/thing in SSpersistence.tracking_values[type]) if(!IsValidEntry(thing)) @@ -121,10 +121,10 @@ var/list/my_tracks = SSpersistence.tracking_values[type] if(!my_tracks?.len) return - + . = list("[capitalize(name)]") . += "
" - + for(var/thing in my_tracks) . += "[GetAdminDataStringFor(thing, can_modify, user)]" . += "
" diff --git a/code/modules/persistence/effects/trash.dm b/code/modules/persistence/effects/trash.dm index 951e9858af..3eaa121711 100644 --- a/code/modules/persistence/effects/trash.dm +++ b/code/modules/persistence/effects/trash.dm @@ -4,6 +4,10 @@ /datum/persistent/filth/trash/CheckTurfContents(var/turf/T, var/list/tokens) var/too_much_trash = 0 for(var/obj/item/trash/trash in T) + //VOREStation Addition Start + if(istype(T, /obj/item/trash/spitwad) || istype(T, /obj/item/trash/spitgum)) + return FALSE + //VOREStation Addition End too_much_trash++ if(too_much_trash >= 5) return FALSE diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index fefc73c199..cbd2fe01a9 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -40,7 +40,7 @@ /obj/effect/decal/writing/examine(mob/user) . = ..() - to_chat(user, "It reads \"[message]\".") + . += "\n It reads \"[message]\"." /obj/effect/decal/writing/attackby(var/obj/item/thing, var/mob/user) if(istype(thing, /obj/item/weapon/weldingtool)) diff --git a/code/modules/persistence/storage/smartfridge.dm b/code/modules/persistence/storage/smartfridge.dm index 9978168c65..a47099f328 100644 --- a/code/modules/persistence/storage/smartfridge.dm +++ b/code/modules/persistence/storage/smartfridge.dm @@ -52,11 +52,11 @@ // Delete some stacks if we want if(stacks_go_missing) var/fuzzy = rand(55,65)*0.01 // loss of 35-45% with rounding down - count = round(count*fuzzy) + count = round(count*fuzzy) if(count <= 0) continue - - while(count > 0) + + while(count > 0) inst = new real_path(null, min(count, max_amount)) count -= inst.get_amount() . += inst @@ -72,6 +72,16 @@ name = "fruit storage lossy" go_missing_chance = 12.5 // 10% loss between rounds +/datum/persistent/storage/smartfridge/produce/generate_items(var/list/L) // Mostly same as storage/generate_items() but without converting string to path + . = list() + for(var/fruit_type in L) + for(var/i in 1 to L[fruit_type]) + if(prob(go_missing_chance)) + continue + var/atom/A = create_item(fruit_type) + if(!QDELETED(A)) + . += A + /datum/persistent/storage/smartfridge/produce/create_item(var/seedtype) return new /obj/item/weapon/reagent_containers/food/snacks/grown(null, seedtype) // Smartfridge will be stock()ed with it, loc is unimportant diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index e09b808a3a..d86f2ce82f 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -334,7 +334,7 @@ var/datum/planet/sif/planet_sif = null "A bright flash heralds the approach of a storm." ) outdoor_sounds_type = /datum/looping_sound/weather/rain/heavy - indoor_sounds_type = /datum/looping_sound/weather/rain/heavy/indoors + indoor_sounds_type = /datum/looping_sound/weather/rain/indoors/heavy transition_chances = list( diff --git a/code/modules/power/singularity/act.dm b/code/modules/power/singularity/act.dm index 9c3a5b8621..1f490e8aa2 100644 --- a/code/modules/power/singularity/act.dm +++ b/code/modules/power/singularity/act.dm @@ -18,7 +18,7 @@ /mob/living/carbon/human/singularity_act() var/gain = 20 if(mind) - if((mind.assigned_role == "Station Engineer") || (mind.assigned_role == "Chief Engineer")) + if((mind.assigned_role == "Engineer") || (mind.assigned_role == "Chief Engineer")) gain = 100 if(mind.assigned_role == USELESS_JOB) //VOREStation Edit - Visitor not Assistant gain = rand(0, 300) diff --git a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm index 938f9b6934..77c0858606 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_smasher.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_smasher.dm @@ -2,6 +2,9 @@ * Contains the particle smasher and its recipes. */ +#define PS_RESULT_STACK "stack" +#define PS_RESULT_ITEM "item" + /obj/machinery/particle_smasher name = "Particle Focus" desc = "A strange device used to create exotic matter." @@ -190,7 +193,7 @@ var/max_prob = 0 for(var/datum/particle_smasher_recipe/R in recipes) // Only things for the smasher. Don't get things like the chef's cake recipes. if(R.probability) // It's actually a recipe you're supposed to be able to make. - if(istype(target, R.required_material)) + if(!(R.required_material) || istype(target, R.required_material)) if(energy >= R.required_energy_min && energy <= R.required_energy_max) // The machine has enough Vaguely Defined 'Energy'. var/turf/T = get_turf(src) var/datum/gas_mixture/environment = T.return_air() @@ -234,8 +237,11 @@ break var/result = recipe.result - var/obj/item/stack/material/M = new result(src) - target = M + if(recipe.recipe_type == PS_RESULT_STACK) + var/obj/item/stack/material/M = new result(src) + target = M + else if(recipe.recipe_type == PS_RESULT_ITEM) + new result(get_turf(src)) update_icon() /obj/machinery/particle_smasher/verb/eject_contents() @@ -266,6 +272,7 @@ /datum/particle_smasher_recipe var/list/reagents // example: = list("pacid" = 5) var/list/items // example: = list(/obj/item/weapon/tool/crowbar, /obj/item/weapon/welder) Place /foo/bar before /foo. Do not include fruit. Maximum of 3 items. + var/recipe_type = PS_RESULT_STACK // Are we producing a stack or an item? var/result = /obj/item/stack/material/iron // The sheet this will produce. var/required_material = /obj/item/stack/material/iron // The required material sheet. @@ -378,4 +385,35 @@ required_atmos_temp_min = 3000 required_atmos_temp_max = 10000 - probability = 1 \ No newline at end of file + probability = 1 + +/datum/particle_smasher_recipe/donkpockets_coal + items = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket) + + recipe_type = PS_RESULT_ITEM + + result = /obj/item/weapon/ore/coal + required_material = null + + required_energy_min = 1 + required_energy_max = 500 + + required_atmos_temp_min = 400 + required_atmos_temp_max = 20000 + probability = 90 + +/datum/particle_smasher_recipe/donkpockets_ascend + items = list(/obj/item/weapon/reagent_containers/food/snacks/donkpocket) + reagents = list("phoron" = 120) + + recipe_type = PS_RESULT_ITEM + + result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket/ascended + required_material = /obj/item/stack/material/uranium + + required_energy_min = 501 + required_energy_max = 700 + + required_atmos_temp_min = 400 + required_atmos_temp_max = 20000 + probability = 20 \ No newline at end of file diff --git a/code/modules/power/smes_construction.dm b/code/modules/power/smes_construction.dm index dae8941e8c..b346e59d94 100644 --- a/code/modules/power/smes_construction.dm +++ b/code/modules/power/smes_construction.dm @@ -139,6 +139,9 @@ if(panel_open) wires.Interact(usr) +/obj/machinery/power/smes/buildable/RefreshParts() + recalc_coils() + // Proc: recalc_coils() // Parameters: None // Description: Updates properties (IO, capacity, etc.) of this SMES by checking internal components. diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 67524ac86c..46736474b7 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -246,3 +246,39 @@ magazine_icondata_keys[M.type] = icon_keys magazine_icondata_states[M.type] = ammo_states +/* + * Ammo Boxes + */ + +/obj/item/ammo_magazine/ammo_box + name = "ammo box" + desc = "A box that holds some kind of ammo." + icon = 'icons/obj/ammo_boxes.dmi' + icon_state = "pistol" + slot_flags = null //You can't fit a box on your belt + item_state = "paper" + matter = null + throwforce = 3 + throw_speed = 5 + throw_range = 12 + preserve_item = 1 + caliber = ".357" + drop_sound = 'sound/items/drop/matchbox.ogg' + pickup_sound = 'sound/items/pickup/matchbox.ogg' + +/obj/item/ammo_magazine/ammo_box/AltClick(mob/user) + if(can_remove_ammo) + if(isliving(user) && Adjacent(user)) + if(stored_ammo.len) + var/obj/item/ammo_casing/C = stored_ammo[stored_ammo.len] + stored_ammo-=C + user.put_in_hands(C) + user.visible_message("\The [user] removes \a [C] from [src].", "You remove \a [C] from [src].") + update_icon() + return + ..() + +/obj/item/ammo_magazine/ammo_box/examine(mob/user) + . = ..() + + . += to_chat(usr, "Alt-click to extract contents") \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/ammo_boxes.dm b/code/modules/projectiles/ammunition/ammo_boxes.dm new file mode 100644 index 0000000000..332b634a0f --- /dev/null +++ b/code/modules/projectiles/ammunition/ammo_boxes.dm @@ -0,0 +1,58 @@ +/************************************************************************/ +/* +# An explaination of the naming format for guns and ammo: +# +# a = Ammo, as in individual rounds of ammunition. +# b = Box, intended to have ammo taken out one at a time by hand. +# c = Clips, intended to reload magazines or guns quickly. +# m = Magazine, intended to hold rounds of ammo. +# s = Speedloaders, intended to reload guns quickly. +# +# Use this format, followed by the caliber. For example, a shotgun's caliber +# variable is "12g" as a result. Ergo, a shotgun round's path would have "a12g", +# or a magazine with shotgun shells would be "m12g" instead. To avoid confusion +# for developers and in-game admins spawning these items, stick to this format. +# Likewise, when creating new rounds, the caliber variable should match whatever +# the name says. +# +# This comment is copied in rounds.dm and magazines.dm as well. +# +# Also, to remove bullets from ammo boxes, use Alt-Click on the box. +*/ +/************************************************************************/ + +/* + * Foam + */ + +/obj/item/ammo_magazine/ammo_box/foam + name = "\improper Donk-Soft ammo box" + desc = "Contains Donk-Soft foam darts. It's Donk or Don't! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "foambox" + caliber = "foam" + ammo_type = /obj/item/ammo_casing/afoam_dart + matter = list(MAT_PLASTIC = 1800) + max_ammo = 30 + multiple_sprites = null + +/obj/item/ammo_magazine/ammo_box/foam/riot + name = "\improper Donk-Soft riot ammo box" + desc = "Contains Donk-Soft riot darts. It's Donk or Don't! Ages 18 and up." + icon_state = "foambox_riot" + matter = list(MAT_STEEL = 5040, MAT_PLASTIC = 1800) + +/* + * Cap + */ + +/obj/item/ammo_magazine/ammo_box/cap + name = "\improper AlliCo SNAP! Caps" + desc = "A box of spare caps for capguns. Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "capbox" + caliber = "caps" + ammo_type = /obj/item/ammo_casing/cap + matter = list(MAT_STEEL = 2040) + max_ammo = 24 + multiple_sprites = null \ No newline at end of file diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 41b000d82f..aa43a54792 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -22,7 +22,42 @@ */ /************************************************************************/ +///////// Foam ///////// +/obj/item/ammo_magazine/mfoam_dart/pistol + name = "\improper Donk-Soft pistol magazine" + icon = 'icons/obj/gun_toy.dmi' + icon_state = "toy" + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/afoam_dart + matter = list(MAT_PLASTIC = 250) + caliber = "foam" + max_ammo = 9 + multiple_sprites = 1 + +/obj/item/ammo_magazine/mfoam_dart/pistol/riot + ammo_type = /obj/item/ammo_casing/afoam_dart/riot + +/obj/item/ammo_magazine/mfoam_dart/pistol/empty + initial_ammo = 0 + +/obj/item/ammo_magazine/mfoam_dart/smg + name = "\improper Donk-Soft smg magazine" + icon = 'icons/obj/gun_toy.dmi' + icon_state = "toysmg" + mag_type = MAGAZINE + ammo_type = /obj/item/ammo_casing/afoam_dart + matter = list(MAT_PLASTIC = 250) + caliber = "foam" + max_ammo = 20 + multiple_sprites = 1 + +/obj/item/ammo_magazine/mfoam_dart/smg/riot + ammo_type = /obj/item/ammo_casing/afoam_dart/riot + matter = list(MAT_PLASTIC = 1260, MAT_PLASTIC = 250) + +/obj/item/ammo_magazine/mfoam_dart/smg/empty + initial_ammo = 0 ///////// .357 ///////// diff --git a/code/modules/projectiles/ammunition/rounds.dm b/code/modules/projectiles/ammunition/rounds.dm index 14d52325f7..0ea73396f8 100644 --- a/code/modules/projectiles/ammunition/rounds.dm +++ b/code/modules/projectiles/ammunition/rounds.dm @@ -19,6 +19,26 @@ */ /************************************************************************/ +/* + * Foam + */ + +/obj/item/ammo_casing/afoam_dart + name = "foam dart" + desc = "It's Donk or Don't! Ages 8 and up." + projectile_type = /obj/item/projectile/bullet/foam_dart + matter = list(MAT_PLASTIC = 60) + caliber = "foam" + icon = 'icons/obj/gun_toy.dmi' + icon_state = "foamdart" + caseless = 1 + +/obj/item/ammo_casing/afoam_dart/riot + name = "riot foam dart" + desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up." + matter = list(MAT_STEEL = 210, MAT_PLASTIC = 60) + icon_state = "foamdart_riot" + /* * .357 */ @@ -29,6 +49,12 @@ projectile_type = /obj/item/projectile/bullet/pistol/strong matter = list(MAT_STEEL = 210) +/obj/item/ammo_casing/a357/bb + desc = "A .357 BB." + projectile_type = /obj/item/projectile/bullet/bb + matter = list(MAT_PLASTIC = 20) + caseless = TRUE + /* * .38 */ @@ -51,6 +77,12 @@ projectile_type = /obj/item/projectile/ion/small matter = list(MAT_STEEL = 130, MAT_URANIUM = 100) +/obj/item/ammo_casing/a38/bb + desc = "A .38 BB." + projectile_type = /obj/item/projectile/bullet/bb + matter = list(MAT_PLASTIC = 20) + caseless = TRUE + /* * .44 */ @@ -72,6 +104,12 @@ projectile_type = /obj/item/projectile/bullet/rifle/a44rifle matter = list(MAT_STEEL = 210) +/obj/item/ammo_casing/a44/bb + desc = "A .44 BB." + projectile_type = /obj/item/projectile/bullet/bb + matter = list(MAT_PLASTIC = 20) + caseless = TRUE + /* * .75 (aka Gyrojet Rockets, aka admin abuse) */ @@ -101,7 +139,6 @@ desc = "A 9mm hollow-point bullet casing." projectile_type = /obj/item/projectile/bullet/pistol/hp - /obj/item/ammo_casing/a9mm/flash desc = "A 9mm flash shell casing." icon_state = "r-casing" @@ -117,6 +154,12 @@ icon_state = "r-casing" projectile_type = /obj/item/projectile/bullet/practice +/obj/item/ammo_casing/a9mm/bb + desc = "A 9mm BB." + projectile_type = /obj/item/projectile/bullet/bb + matter = list(MAT_PLASTIC = 20) + caseless = TRUE + /* * .45 */ @@ -163,6 +206,12 @@ projectile_type = /obj/item/projectile/bullet/pistol/medium/hp matter = list(MAT_STEEL = 60, MAT_PLASTIC = 15) +/obj/item/ammo_casing/a45/bb + desc = "A .45 BB." + projectile_type = /obj/item/projectile/bullet/bb + matter = list(MAT_PLASTIC = 20) + caseless = TRUE + /* * 10mm */ @@ -180,6 +229,12 @@ icon_state = "empcasing" matter = list(MAT_STEEL = 130, MAT_URANIUM = 100) +/obj/item/ammo_casing/a10mm/bb + desc = "A 10mm BB." + projectile_type = /obj/item/projectile/bullet/bb + matter = list(MAT_PLASTIC = 20) + caseless = TRUE + /* * 12g (aka shotgun ammo) */ @@ -256,6 +311,11 @@ projectile_type = /obj/item/projectile/scatter/flechette matter = list(MAT_STEEL = 360, MAT_PLASTEEL = 100) +/obj/item/ammo_casing/a12g/bb + desc = "A shotgun BB shell." + projectile_type = /obj/item/projectile/bullet/pellet/shotgun/bb // Shotgun + matter = list(MAT_PLASTIC = 120) // 6 pellets + /* * 7.62mm */ @@ -291,6 +351,12 @@ desc = "A 7.62mm hunting bullet casing." projectile_type = /obj/item/projectile/bullet/rifle/a762/hunter +/obj/item/ammo_casing/a762/bb + desc = "A 7.62mm BB." + projectile_type = /obj/item/projectile/bullet/bb + matter = list(MAT_PLASTIC = 20) + caseless = TRUE + /* * 14.5mm (anti-materiel rifle round) */ @@ -345,6 +411,12 @@ desc = "A 5.45mm hunting bullet casing." projectile_type = /obj/item/projectile/bullet/rifle/a545/hunter +/obj/item/ammo_casing/a545/bb + desc = "A 5.45mm BB." + projectile_type = /obj/item/projectile/bullet/bb + matter = list(MAT_PLASTIC = 20) + caseless = TRUE + /* * 5mm Caseless */ @@ -375,14 +447,15 @@ /obj/item/ammo_casing/cap name = "cap" - desc = "A cap for children toys." + desc = "A cap for children toys. Ages 8 and up." caliber = "caps" - icon_state = "r-casing" - color = "#FF0000" - projectile_type = /obj/item/projectile/bullet/pistol/cap + icon = 'icons/obj/gun_toy.dmi' + icon_state = "cap" + projectile_type = /obj/item/projectile/bullet/cap matter = list(MAT_STEEL = 85) + caseless = 1 /obj/item/ammo_casing/spent // For simple hostile mobs only, so they don't cough up usable bullets when firing. This is for literally nothing else. icon_state = "s-casing-spent" BB = null - projectile_type = null \ No newline at end of file + projectile_type = null diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 4979cc743c..7c04ec3750 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -464,7 +464,7 @@ P.dispersion = disp P.shot_from = src.name - P.silenced = silenced + P.silenced |= silenced // A silent bullet (e.g., BBs) can be fired quietly from any gun. P.old_style_target(target) P.fire() diff --git a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm index 005741bfe4..5b7b906e3c 100644 --- a/code/modules/projectiles/guns/energy/bsharpoon_vr.dm +++ b/code/modules/projectiles/guns/energy/bsharpoon_vr.dm @@ -18,6 +18,7 @@ var/transforming = 0 var/failure_chance = 15 // This can become negative with part tiers above 3, which helps offset penalties var/obj/item/weapon/stock_parts/scanning_module/scanmod + var/dropnoms_active = TRUE /obj/item/weapon/bluespace_harpoon/Initialize() . = ..() @@ -26,6 +27,8 @@ /obj/item/weapon/bluespace_harpoon/examine(var/mob/user) . = ..() + . += "It is currently in [mode ? "transmitting" : "recieving"] mode." + . += "Spatial rearrangement is [dropnoms_active ? "active" : "inactive"]." if(Adjacent(user)) . += "It has [scanmod ? scanmod : "no scanner module"] installed." @@ -80,7 +83,7 @@ playsound(src, 'sound/weapons/wave.ogg', 60, 1) return var/turf/T = get_turf(A) - if(!T || (T.check_density() && mode == 1)) + if(!T || (T.check_density(ignore_mobs = TRUE) && mode == 1)) to_chat(user,"That's a little too solid to harpoon into!") return var/turf/ownturf = get_turf(src) @@ -118,12 +121,47 @@ for(var/rider in L.buckled_mobs) sendfailchance += 15 + var/mob/living/living_user = user + var/can_dropnom = TRUE + if(!dropnoms_active || !istype(living_user)) + can_dropnom = FALSE + if(mode) if(user in FromTurf) if(prob(sendfailchance)) user.forceMove(pick(trange(24,user))) else user.forceMove(ToTurf) + var/vore_happened = FALSE + if(can_dropnom && living_user.can_be_drop_pred) + var/obj/belly/belly_dest + if(living_user.vore_selected) + belly_dest = living_user.vore_selected + else if(living_user.vore_organs.len) + belly_dest = pick(living_user.vore_organs) + if(belly_dest) + for(var/mob/living/prey in ToTurf) + if(prey != user && prey.can_be_drop_prey) + prey.forceMove(belly_dest) + vore_happened = TRUE + to_chat(prey, "[living_user] materializes around you, as you end up in their [belly_dest]!") + to_chat(living_user, "You materialize around [prey] as they end up in your [belly_dest]!") + if(can_dropnom && !vore_happened && living_user.can_be_drop_prey) + var/mob/living/pred + for(var/mob/living/potential_pred in ToTurf) + if(potential_pred != user && potential_pred.can_be_drop_pred) + pred = potential_pred + if(pred) + var/obj/belly/belly_dest + if(pred.vore_selected) + belly_dest = pred.vore_selected + else if(pred.vore_organs.len) + belly_dest = pick(pred.vore_organs) + if(belly_dest) + living_user.forceMove(belly_dest) + to_chat(pred, "[living_user] materializes inside you as they end up in your [belly_dest]!") + to_chat(living_user, "You materialize inside [pred] as you end up in their [belly_dest]!") + else for(var/obj/O in FromTurf) if(O.anchored) continue @@ -132,25 +170,58 @@ else O.forceMove(ToTurf) + var/user_vored = FALSE + for(var/mob/living/M in FromTurf) if(prob(recievefailchance)) M.forceMove(pick(trange(24,user))) else M.forceMove(ToTurf) + if(can_dropnom && living_user.can_be_drop_pred && M.can_be_drop_prey) + var/obj/belly/belly_dest + if(living_user.vore_selected) + belly_dest = living_user.vore_selected + else if(living_user.vore_organs.len) + belly_dest = pick(living_user.vore_organs) + if(belly_dest) + M.forceMove(belly_dest) + to_chat(living_user, "[M] materializes inside you as they end up in your [belly_dest]!") + to_chat(M, "You materialize inside [living_user] as you end up in their [belly_dest]!") + else if(can_dropnom && living_user.can_be_drop_prey && M.can_be_drop_pred && !user_vored) + var/obj/belly/belly_dest + if(M.vore_selected) + belly_dest = M.vore_selected + else if(M.vore_organs.len) + belly_dest = pick(M.vore_organs) + if(belly_dest) + living_user.forceMove(belly_dest) + user_vored = TRUE + to_chat(living_user, "[M] materializes around you, as you end up in their [belly_dest]!") + to_chat(M, "You materialize around [living_user] as they end up in your [belly_dest]!") + /obj/item/weapon/bluespace_harpoon/attack_self(mob/living/user as mob) return chande_fire_mode(user) /obj/item/weapon/bluespace_harpoon/verb/chande_fire_mode(mob/user as mob) - set name = "Change fire mode" + set name = "Change Fire Mode" set category = "Object" - set src in oview(1) + set src in range(0) + if(transforming) return mode = !mode transforming = 1 to_chat(user,"You change \the [src]'s mode to [mode ? "transmiting" : "receiving"].") update_icon() +/obj/item/weapon/bluespace_harpoon/verb/chande_dropnom_mode(mob/user as mob) + set name = "Toggle Spatial Rearrangement" + set category = "Object" + set src in range(0) + + dropnoms_active = !dropnoms_active + to_chat(user,"You switch \the [src]'s spatial rearrangement [dropnoms_active ? "on" : "off"]. (Telenoms [dropnoms_active ? "enabled" : "dsiabled"])") + /obj/item/weapon/bluespace_harpoon/update_icon() if(transforming) switch(mode) diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm index fb581a4eb3..311c7e753b 100644 --- a/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm +++ b/code/modules/projectiles/guns/energy/kinetic_accelerator_vr.dm @@ -30,6 +30,13 @@ if(environment.temperature > HEATMODE_TEMP - 30) . = TRUE +/proc/offsite_environment_check(turf/simulated/T) + . = TRUE + if(!istype(T)) + return + if(T.z in using_map.station_levels) + . = FALSE + /obj/item/weapon/gun/energy/kinetic_accelerator name = "proto-kinetic accelerator" desc = "A self recharging, ranged mining tool that does increased damage in low pressure." @@ -184,7 +191,7 @@ /obj/item/weapon/gun/energy/kinetic_accelerator/proc/empty() if(power_supply) power_supply.use(power_supply.charge) - update_icon() + update_icon() /obj/item/weapon/gun/energy/kinetic_accelerator/proc/attempt_reload(recharge_time) if(!power_supply) @@ -216,11 +223,12 @@ /obj/item/weapon/gun/energy/kinetic_accelerator/update_icon() cut_overlays() - if(overheat || (power_supply.charge == 0)) + if(overheat || !power_supply || (power_supply.charge == 0)) add_overlay(emptystate) #define KA_ENVIRO_TYPE_COLD 0 #define KA_ENVIRO_TYPE_HOT 1 +#define KA_ENVIRO_TYPE_OFFSITE 2 //Projectiles /obj/item/projectile/kinetic @@ -262,6 +270,12 @@ name = "weakened [name]" damage = damage * pressure_decrease pressure_decrease_active = TRUE + else if(environment == KA_ENVIRO_TYPE_OFFSITE) + if(!offsite_environment_check(get_turf(src))) + name = "nullified [name]" + nodamage = TRUE + damage = 0 + pressure_decrease_active = TRUE return ..() /obj/item/projectile/kinetic/attack_mob(mob/living/target_mob, distance, miss_modifier) @@ -276,6 +290,12 @@ name = "weakened [name]" damage = damage * pressure_decrease pressure_decrease_active = TRUE + else if(environment == KA_ENVIRO_TYPE_OFFSITE) + if(!offsite_environment_check(get_turf(src))) + name = "nullified [name]" + nodamage = TRUE + damage = 0 + pressure_decrease_active = TRUE return ..() /obj/item/projectile/kinetic/on_range() @@ -302,6 +322,12 @@ name = "weakened [name]" damage = damage * pressure_decrease pressure_decrease_active = TRUE + else if(environment == KA_ENVIRO_TYPE_OFFSITE) + if(!offsite_environment_check(get_turf(src))) + name = "nullified [name]" + nodamage = TRUE + damage = 0 + pressure_decrease_active = TRUE var/turf/target_turf = get_turf(target) if(!target_turf) target_turf = get_turf(src) @@ -391,8 +417,8 @@ if(forcemove) forceMove(get_turf(KA)) +//use this one to modify the projectile itself /obj/item/borg/upgrade/modkit/proc/modify_projectile(obj/item/projectile/kinetic/K) - //use this one for effects you want to trigger before any damage is done at all and before damage is decreased by pressure /obj/item/borg/upgrade/modkit/proc/projectile_prehit(obj/item/projectile/kinetic/K, atom/target, obj/item/weapon/gun/energy/kinetic_accelerator/KA) //use this one for effects you want to trigger before mods that do damage @@ -523,7 +549,7 @@ //Tendril-unique modules /obj/item/borg/upgrade/modkit/cooldown/repeater name = "rapid repeater" - desc = "Quarters the kinetic accelerator's cooldown on striking a living target, but greatly increases the base cooldown." + desc = "Quarters the kinetic accelerator's cooldown on striking a living or mineral target, but greatly increases the base cooldown." denied_type = /obj/item/borg/upgrade/modkit/cooldown/repeater modifier = -14 //Makes the cooldown 3 seconds(with no cooldown mods) if you miss. Don't miss. cost = 50 @@ -617,7 +643,7 @@ //Indoors /obj/item/borg/upgrade/modkit/indoors - name = "decrease pressure penalty" + name = "hacked pressure modulator" desc = "A remarkably illegal modification kit that increases the damage a kinetic accelerator does in pressurized environments." modifier = 2 denied_type = /obj/item/borg/upgrade/modkit/indoors @@ -627,14 +653,25 @@ /obj/item/borg/upgrade/modkit/indoors/modify_projectile(obj/item/projectile/kinetic/K) K.pressure_decrease *= modifier +/obj/item/borg/upgrade/modkit/offsite + name = "offsite pressure modulator" + desc = "A non-standard modification kit that increases the damage a kinetic accelerator does in pressurized environments, \ + in exchange for nullifying any projected forces while on or in an associated facility." + denied_type = /obj/item/borg/upgrade/modkit/heater + maximum_of_type = 1 + cost = 35 + +/obj/item/borg/upgrade/modkit/offsite/modify_projectile(obj/item/projectile/kinetic/K) + K.environment = KA_ENVIRO_TYPE_OFFSITE + // Atmospheric /obj/item/borg/upgrade/modkit/heater name = "temperature modulator" desc = "A remarkably unusual modification kit that makes kinetic accelerators more usable in hot, overpressurized environments, \ in exchange for making them weak elsewhere, like the cold or in space." - denied_type = /obj/item/borg/upgrade/modkit/indoors + denied_type = /obj/item/borg/upgrade/modkit/offsite maximum_of_type = 1 - cost = 30 + cost = 10 /obj/item/borg/upgrade/modkit/heater/modify_projectile(obj/item/projectile/kinetic/K) K.environment = KA_ENVIRO_TYPE_HOT diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index e0f4b936b8..e4cd464663 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -278,41 +278,6 @@ accuracy = 0 scoped_accuracy = 20 -////////Laser Tag//////////////////// - -/obj/item/weapon/gun/energy/lasertag - name = "laser tag gun" - item_state = "laser" - desc = "Standard issue weapon of the Imperial Guard" - origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2) - matter = list(MAT_STEEL = 2000) - projectile_type = /obj/item/projectile/beam/lasertag/blue - cell_type = /obj/item/weapon/cell/device/weapon/recharge - battery_lock = 1 - var/required_vest - -/obj/item/weapon/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M) - if(ishuman(M)) - if(!istype(M.wear_suit, required_vest)) - to_chat(M, "You need to be wearing your laser tag vest!") - return 0 - return ..() - -/obj/item/weapon/gun/energy/lasertag/blue - icon_state = "bluetag" - item_state = "bluetag" - projectile_type = /obj/item/projectile/beam/lasertag/blue - required_vest = /obj/item/clothing/suit/bluetag - -/obj/item/weapon/gun/energy/lasertag/red - icon_state = "redtag" - item_state = "redtag" - projectile_type = /obj/item/projectile/beam/lasertag/red - required_vest = /obj/item/clothing/suit/redtag - -/obj/item/weapon/gun/energy/lasertag/omni - projectile_type = /obj/item/projectile/beam/lasertag/omni - // Laser scattergun, proof of concept. /obj/item/weapon/gun/energy/lasershotgun diff --git a/code/modules/projectiles/guns/energy/pummeler_vr.dm b/code/modules/projectiles/guns/energy/pummeler_vr.dm index 75563208f2..b4dd9ad472 100644 --- a/code/modules/projectiles/guns/energy/pummeler_vr.dm +++ b/code/modules/projectiles/guns/energy/pummeler_vr.dm @@ -45,4 +45,14 @@ L.Confuse(1) L.throw_at(get_edge_target_turf(L, throwdir), rand(3,6), 10) + //VOREStation Add Start + if(istype(L, /mob/living/simple_mob/vore/alienanimals/startreader)) + var/mob/living/simple_mob/vore/alienanimals/startreader/S = L + if(!S.flipped) + S.adjustBruteLoss(100) + S.visible_message("\The [S] is flipped over!!!") + S.flipped = TRUE + S.flip_cooldown = 10 + S.handle_flip() + //VOREStation Add End return 1 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 0ea7871e30..f236ed2984 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -47,7 +47,9 @@ modifystate = "floramut" cell_type = /obj/item/weapon/cell/device/weapon/recharge battery_lock = 1 + var/decl/plantgene/gene = null + var/obj/item/weapon/stock_parts/micro_laser/emitter firemodes = list( list(mode_name="induce mutations", projectile_type=/obj/item/projectile/energy/floramut, modifystate="floramut"), @@ -55,8 +57,42 @@ list(mode_name="induce specific mutations", projectile_type=/obj/item/projectile/energy/floramut/gene, modifystate="floramut"), ) +/obj/item/weapon/gun/energy/floragun/Initialize() + . = ..() + emitter = new(src) + +/obj/item/weapon/gun/energy/floragun/examine(var/mob/user) + . = ..() + if(Adjacent(user)) + . += "It has [emitter ? emitter : "no micro laser"] installed." + +/obj/item/weapon/gun/energy/floragun/attackby(obj/item/W, mob/user) + if(istype(W, /obj/item/weapon/stock_parts/micro_laser)) + if(!emitter) + user.drop_item() + W.loc = src + emitter = W + to_chat(user, "You install a [emitter.name] in [src].") + else + to_chat(user, "[src] already has a laser.") + + else if(W.is_screwdriver()) + if(emitter) + to_chat(user, "You remove the [emitter.name] from the [src].") + emitter.loc = get_turf(src.loc) + playsound(src, W.usesound, 50, 1) + emitter = null + return + else + to_chat(user, "There is no micro laser in this [src].") + return + /obj/item/weapon/gun/energy/floragun/afterattack(obj/target, mob/user, adjacent_flag) //allow shooting into adjacent hydrotrays regardless of intent + if(!emitter) + to_chat(user, "The [src] has no laser! ") + playsound(src, 'sound/weapons/empty.ogg', 50, 1) + return if(adjacent_flag && istype(target,/obj/machinery/portable_atmospherics/hydroponics)) user.visible_message("\The [user] fires \the [src] into \the [target]!") Fire(target,user) @@ -82,8 +118,16 @@ /obj/item/weapon/gun/energy/floragun/consume_next_projectile() . = ..() var/obj/item/projectile/energy/floramut/gene/G = . + var/obj/item/projectile/energy/florayield/GY = . + var/obj/item/projectile/energy/floramut/GM = . + // Inserting the upgrade level of the gun to the projectile as there isn't a better way to do this. if(istype(G)) G.gene = gene + G.lasermod = emitter.rating + else if(istype(GY)) + GY.lasermod = emitter.rating + else if(istype(GM)) + GM.lasermod = emitter.rating /obj/item/weapon/gun/energy/meteorgun name = "meteor gun" diff --git a/code/modules/projectiles/guns/magnetic/bore.dm b/code/modules/projectiles/guns/magnetic/bore.dm index 3cc05cc44b..66e89cb9eb 100644 --- a/code/modules/projectiles/guns/magnetic/bore.dm +++ b/code/modules/projectiles/guns/magnetic/bore.dm @@ -85,6 +85,8 @@ /obj/item/weapon/gun/magnetic/matfed/attackby(var/obj/item/thing, var/mob/user) + . = ..() + update_rating_mod() if(removable_components) if(thing.is_crowbar()) if(!manipulator) @@ -112,7 +114,6 @@ update_rating_mod() return - if(is_type_in_list(thing, load_type)) var/obj/item/stack/material/M = thing var/success = FALSE @@ -147,7 +148,6 @@ playsound(src, 'sound/weapons/flipblade.ogg', 50, 1) update_icon() return - . = ..() #define GEN_STARTING -1 #define GEN_OFF 0 diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 5d158e5d0a..678146eb18 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -148,18 +148,6 @@ flick("deckard-reload",src) ..() -/obj/item/weapon/gun/projectile/revolver/capgun - name = "cap gun" - desc = "Looks almost like the real thing! Ages 8 and up." - icon_state = "revolver" - item_state = "revolver" - caliber = "caps" - origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) - handle_casings = CYCLE_CASINGS - max_shells = 7 - ammo_type = /obj/item/ammo_casing/cap - projectile_type = /obj/item/projectile/bullet/pistol/strong - /obj/item/weapon/gun/projectile/revolver/judge name = "\"The Judge\"" desc = "A revolving hand-shotgun by Jindal Arms that packs the power of a 12 guage in the palm of your hand (if you don't break your wrist). Uses 12g rounds." diff --git a/code/modules/projectiles/guns/toy.dm b/code/modules/projectiles/guns/toy.dm new file mode 100644 index 0000000000..e3b90bd1be --- /dev/null +++ b/code/modules/projectiles/guns/toy.dm @@ -0,0 +1,251 @@ +/* Toys Guns! + * + * Contains: + * Cap Gun + * Shotgun + * Pistol + * N99 Pistol + * Levergun + * Revolver + * Big Iron + * Crossbow + * Crossbow (Halloween) + * Sawn Off + * SMG + * Laser Tag + */ + +/* + * Cap Gun + */ +/obj/item/weapon/gun/projectile/revolver/capgun + name = "cap gun" + desc = "Looks almost like the real thing! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "cap_gun" + item_state = "revolver" + caliber = "caps" + origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) + ammo_type = /obj/item/ammo_casing/cap + projectile_type = /obj/item/projectile/bullet/cap + matter = list(MAT_STEEL = 1000) + handle_casings = null + recoil = 1 //it's a toy + +/* + * Shotgun + */ +/obj/item/weapon/gun/projectile/shotgun/pump/toy + name = "\improper Donk-Soft shotgun" + desc = "Donk-Soft foam shotgun! It's Donk or Don't! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "shotgun" + item_state = "shotgun" + max_shells = 6 + w_class = ITEMSIZE_LARGE + force = 2 + slot_flags = null + caliber = "foam" + origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) + load_method = SINGLE_CASING + ammo_type = /obj/item/ammo_casing/afoam_dart + projectile_type = /obj/item/projectile/bullet/foam_dart + matter = list(MAT_PLASTIC = 2000) + handle_casings = null + recoil = null //it's a toy + +/* + * Pistol + */ +/obj/item/weapon/gun/projectile/pistol/toy + name = "\improper Donk-Soft pistol" + desc = "Donk-Soft foam pistol! It's Donk or Don't! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "pistol" + item_state = "gun" + magazine_type = /obj/item/ammo_magazine/mfoam_dart/pistol + allowed_magazines = list(/obj/item/ammo_magazine/mfoam_dart/pistol) + projectile_type = /obj/item/projectile/bullet/foam_dart + caliber = "foam" + origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) + load_method = MAGAZINE + matter = list(MAT_PLASTIC = 1000) + recoil = null //it's a toy + +/obj/item/weapon/gun/projectile/pistol/toy/update_icon() + if(ammo_magazine) + icon_state = initial(icon_state) + else + icon_state = "[initial(icon_state)]-e" + +/* + * N99 Pistol + */ +/obj/item/weapon/gun/projectile/pistol/toy/n99 + name = "\improper Donk-Soft commemorative pistol" + desc = "A special made Donk-Soft pistol to promote 'Radius: Legend of the Demon Core', a popular post-apocolyptic TV series." + icon_state = "n99" + item_state = "gun" + +/obj/item/weapon/gun/projectile/pistol/toy/n99/update_icon() + if(ammo_magazine) + icon_state = initial(icon_state) + else + icon_state = "[initial(icon_state)]-e" + +/* + * Levergun + */ +/obj/item/weapon/gun/projectile/shotgun/pump/toy/levergun + name = "\improper Donk-Soft levergun" + desc = "Donk-Soft foam levergun! Time to cowboy up! Ages 8 and up." + icon_state = "leveraction" + item_state = "leveraction" + max_shells = 5 + pump_animation = "leveraction-cycling" + +/* + * Revolver + */ +/obj/item/weapon/gun/projectile/revolver/toy + name = "\improper Donk-Soft revolver" + desc = "Donk-Soft foam revolver! Time to cowboy up! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "revolver" + item_state = "revolver" + caliber = "foam" + ammo_type = /obj/item/ammo_casing/afoam_dart + projectile_type = /obj/item/projectile/bullet/foam_dart + origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) + load_method = SINGLE_CASING + max_shells = 6 + matter = list(MAT_PLASTIC = 1000) + handle_casings = null + recoil = null //it's a toy + +/* + * Big Iron + */ +/obj/item/weapon/gun/projectile/revolver/toy/big_iron + name = "\improper Donk-Soft big iron" + desc = "A special made Donk-Soft pistol to promote 'A Fistful of Phoron', a popular frontier novel series." + icon_state = "big_iron" + item_state = "revolver" + +/* + * Crossbow + */ +/obj/item/weapon/gun/projectile/revolver/toy/crossbow + name = "\improper Donk-Soft crossbow" + desc = "Donk-Soft foam crossbow! It's Donk or Don't! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "foamcrossbow" + item_state = "foamcrossbow" + max_shells = 5 + +/* + * Crossbow (Halloween) + */ +/obj/item/weapon/gun/projectile/revolver/toy/crossbow/halloween + name = "\improper Donk-Soft special edition crossbow" + desc = "A special edition Donk-Soft crossbow! Made special for your Halloween cosplay. It's Donk or Don't! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "foamcrossbow_halloween" + item_state = "foamcrossbow_halloween" + max_shells = 5 + +/* + * Sawn Off + */ +/obj/item/weapon/gun/projectile/revolver/toy/sawnoff //revolver code just because it's easier + name = "\improper Donk-Soft sawn off shotgun" + desc = "Donk-Soft foam sawn off! It's Donk or Don't! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "sawnshotgun" + item_state = "dshotgun" + max_shells = 2 + w_class = ITEMSIZE_NORMAL + matter = list(MAT_PLASTIC = 1500) + +/* + * SMG + */ +/obj/item/weapon/gun/projectile/automatic/toy + name = "\improper Donk-Soft SMG" + desc = "Donk-Soft foam SMG! It's Donk or Don't! Ages 8 and up." + icon = 'icons/obj/gun_toy.dmi' + icon_state = "smg" + caliber = "foam" + w_class = ITEMSIZE_NORMAL + load_method = MAGAZINE + origin_tech = list(TECH_COMBAT = 1, TECH_MATERIAL = 1) + slot_flags = SLOT_BELT + magazine_type = /obj/item/ammo_magazine/mfoam_dart/smg + allowed_magazines = list(/obj/item/ammo_magazine/mfoam_dart/smg) + projectile_type = /obj/item/projectile/bullet/foam_dart + matter = list(MAT_PLASTIC = 1500) + recoil = null //it's a toy + + firemodes = list( + list(mode_name="semiauto", burst=1, fire_delay=0, move_delay=null, burst_accuracy=null, dispersion=null), + list(mode_name="3-round bursts", burst=3, fire_delay=null, move_delay=2, burst_accuracy=list(0,-2,-2), dispersion=null) + ) + +/obj/item/weapon/gun/projectile/automatic/toy/riot + magazine_type = /obj/item/ammo_magazine/mfoam_dart/smg/riot + +/obj/item/weapon/gun/projectile/automatic/toy/update_icon() + if(ammo_magazine) + icon_state = initial(icon_state) + else + icon_state = "[initial(icon_state)]-e" + +/* + * Laser Tag + */ +/obj/item/weapon/gun/energy/lasertag + name = "laser tag gun" + desc = "Standard issue weapon of the Imperial Guard" + icon = 'icons/obj/gun_toy.dmi' + item_state = "omnitag" + item_state = "retro" + origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2) + matter = list(MAT_STEEL = 2000) + projectile_type = /obj/item/projectile/beam/lasertag/blue + cell_type = /obj/item/weapon/cell/device/weapon/recharge + battery_lock = 1 + var/required_vest + +/obj/item/weapon/gun/energy/lasertag/special_check(var/mob/living/carbon/human/M) + if(ishuman(M)) + if(!istype(M.wear_suit, required_vest)) + to_chat(M, "You need to be wearing your laser tag vest!") + return 0 + return ..() + +/obj/item/weapon/gun/energy/lasertag/blue + icon_state = "bluetag" + item_state = "bluetag" + projectile_type = /obj/item/projectile/beam/lasertag/blue + required_vest = /obj/item/clothing/suit/bluetag + +/obj/item/weapon/gun/energy/lasertag/blue/sub + name = "Brigader Sidearm" + desc = "A laser tag replica of the standard issue weapon for the Spacer Union Brigade from the hit series Spacer Trail (Blue Team)." + icon_state = "bluetwo" + item_state = "retro" + +/obj/item/weapon/gun/energy/lasertag/red + icon_state = "redtag" + item_state = "redtag" + projectile_type = /obj/item/projectile/beam/lasertag/red + required_vest = /obj/item/clothing/suit/redtag + +/obj/item/weapon/gun/energy/lasertag/red/dom + name = "Mu'tu'bi sidearm" + desc = "A laser tag replica of the Mu'tu'bi sidearm from the hit series Spacer Trail (Red Team)." + icon_state = "redtwo" + item_state = "retro" + +/obj/item/weapon/gun/energy/lasertag/omni + projectile_type = /obj/item/projectile/beam/lasertag/omni \ No newline at end of file diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 9fc3ffcd3c..abba257a93 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -83,10 +83,10 @@ //Misc/Polaris variables - var/def_zone = "" //Aiming at - var/mob/firer = null//Who shot it - var/silenced = 0 //Attack message - var/shot_from = "" // name of the object which shot us + var/def_zone = "" //Aiming at + var/mob/firer = null //Who shot it + var/silenced = FALSE //Attack message + var/shot_from = "" // name of the object which shot us var/accuracy = 0 var/dispersion = 0.0 @@ -748,7 +748,7 @@ /obj/item/projectile/proc/launch_from_gun(atom/target, target_zone, mob/user, params, angle_override, forced_spread, obj/item/weapon/gun/launcher) shot_from = launcher.name - silenced = launcher.silenced + silenced |= launcher.silenced // Silent bullets (e.g., BBs) are always silent if(user) firer = user diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 31fa34dc12..5941b7f4c6 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -321,6 +321,72 @@ embed_chance = 0 sharp = FALSE -/obj/item/projectile/bullet/blank/cap/process() +/* BB Rounds */ +/obj/item/projectile/bullet/bb // Generic single BB + name = "BB" + damage = 0 + agony = 0 + embed_chance = 0 + sharp = FALSE + silenced = TRUE + +/obj/item/projectile/bullet/pellet/shotgun/bb // Shotgun + name = "BB" + damage = 0 + agony = 0 + embed_chance = 0 + sharp = FALSE + pellets = 6 + range_step = 1 + spread_step = 10 + silenced = TRUE + +/* toy projectiles */ +/obj/item/projectile/bullet/cap + name = "cap" + desc = "SNAP!" + damage = 0 // It's a damn toy. + embed_chance = 0 + nodamage = TRUE + sharp = FALSE + damage_type = HALLOSS + impact_effect_type = null + fire_sound = 'sound/effects/snap.ogg' + combustion = FALSE + +/obj/item/projectile/bullet/cap/process() loc = null - qdel(src) \ No newline at end of file + qdel(src) + +/obj/item/projectile/bullet/foam_dart + name = "foam dart" + desc = "I hope you're wearing eye protection." + damage = 0 // It's a damn toy. + embed_chance = 0 + nodamage = TRUE + sharp = FALSE + damage_type = HALLOSS + impact_effect_type = null + fire_sound = 'sound/items/syringeproj.ogg' + combustion = FALSE + icon = 'icons/obj/gun_toy.dmi' + icon_state = "foamdart_proj" + range = 15 + +/obj/item/projectile/bullet/foam_dart/on_impact(var/atom/A) + . = ..() + var/turf/T = get_turf(loc) + if(istype(T)) + new /obj/item/ammo_casing/afoam_dart(get_turf(loc)) + +/obj/item/projectile/bullet/foam_dart/on_range(var/atom/A) + . = ..() + var/turf/T = get_turf(loc) + if(istype(T)) + new /obj/item/ammo_casing/afoam_dart(get_turf(loc)) + +/obj/item/projectile/bullet/foam_dart/riot + name = "riot foam dart" + desc = "Whose smart idea was it to use toys as crowd control? Ages 18 and up." + agony = 50 + icon_state = "foamdart_riot_proj" \ No newline at end of file diff --git a/code/modules/projectiles/projectile/explosive.dm b/code/modules/projectiles/projectile/explosive.dm index 15d538c082..307febc8bc 100644 --- a/code/modules/projectiles/projectile/explosive.dm +++ b/code/modules/projectiles/projectile/explosive.dm @@ -9,22 +9,30 @@ does_spin = 0 /obj/item/projectile/bullet/srmrocket/on_hit(atom/target, blocked=0) - ..() if(!isliving(target)) //if the target isn't alive, so is a wall or something explosion(target, 0, 1, 2, 4) else explosion(target, 0, 0, 2, 4) return 1 +/obj/item/projectile/bullet/srmrocket/throw_impact(atom/target, var/speed) + if(!isliving(target)) //if the target isn't alive, so is a wall or something + explosion(target, 0, 1, 2, 4) + else + explosion(target, 0, 0, 2, 4) + qdel(src) /obj/item/projectile/bullet/srmrocket/weak //Used in the jury rigged one. damage = 10 /obj/item/projectile/bullet/srmrocket/weak/on_hit(atom/target, blocked=0) - ..() explosion(target, 0, 0, 2, 4)//No need to have a question. return 1 +/obj/item/projectile/bullet/srmrocket/weak/throw_impact(atom/target, var/speed) + explosion(target, 0, 0, 2, 4)//No need to have a question. + qdel(src) + /*Old vars here for reference. var/devastation = 0 var/heavy_blast = 1 diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index ee75074cc7..142cde4071 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -87,7 +87,12 @@ new_temperature = round(new_temperature * temp_factor) L.bodytemperature = new_temperature - + //VOREStation Add Start - The last metroid has escaped from captivity, the galaxy is no longer safe. + if(istype(L, /mob/living/simple_mob/vore/alienanimals/space_jellyfish) && target_temperature <= T0C) + var/mob/living/simple_mob/vore/alienanimals/space_jellyfish/J = L + J.adjustFireLoss(75) + J.movement_cooldown *= 2 + //VOREStation Add End return 1 /obj/item/projectile/temp/hot @@ -138,7 +143,7 @@ light_power = 0.5 light_color = "#33CC00" impact_effect_type = /obj/effect/temp_visual/impact_effect/monochrome_laser - + var/lasermod = 0 combustion = FALSE /obj/item/projectile/energy/floramut/on_hit(var/atom/target, var/blocked = 0) @@ -195,6 +200,7 @@ light_power = 0.5 light_color = "#FFFFFF" impact_effect_type = /obj/effect/temp_visual/impact_effect/monochrome_laser + var/lasermod = 0 /obj/item/projectile/energy/florayield/on_hit(var/atom/target, var/blocked = 0) var/mob/living/M = target diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm index a2aaec2d75..a9273f5ec0 100644 --- a/code/modules/random_map/noise/ore.dm +++ b/code/modules/random_map/noise/ore.dm @@ -53,7 +53,7 @@ var/current_cell = map[get_map_cell(x,y)] if(current_cell < rare_val) // Surface metals. - T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources["hematite"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) T.resources["gold"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["silver"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) @@ -81,7 +81,7 @@ T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources["hydrogen"] = 0 T.resources["diamond"] = 0 - T.resources["hematite"] = 0 + T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) T.resources["marble"] = 0 //T.resources["copper"] = 0 //T.resources["tin"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) @@ -91,7 +91,7 @@ //T.resources["quartz"] = 0 //T.resources["painite"] = 0 else // Deep metals. - T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) + T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources["phoron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) @@ -99,9 +99,9 @@ T.resources["hydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["marble"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX) - T.resources["hematite"] = 0 - T.resources["gold"] = 0 - T.resources["silver"] = 0 + T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources["gold"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) + T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) //T.resources["copper"] = 0 //T.resources["tin"] = 0 //T.resources["bauxite"] = 0 diff --git a/code/modules/random_map/random_map.dm b/code/modules/random_map/random_map.dm index d36e7a80a1..a563f16c11 100644 --- a/code/modules/random_map/random_map.dm +++ b/code/modules/random_map/random_map.dm @@ -24,6 +24,9 @@ var/global/list/map_count = list() var/floor_type = /turf/simulated/floor var/target_turf_type + var/skip_dense = FALSE + var/keep_outside = FALSE + // Storage for the final iteration of the map. var/list/map = list() // Actual map. @@ -61,11 +64,16 @@ var/global/list/map_count = list() rand_seed(seed) priority_process = 1 + var/failed = FALSE for(var/i = 0;i[capitalize(name)] generation completed in [round(0.1*(world.timeofday-start_time),0.1)] seconds.", R_DEBUG) - return - if(!do_not_announce) admin_notice("[capitalize(name)] failed to generate ([round(0.1*(world.timeofday-start_time),0.1)] seconds): could not produce sane map.", R_DEBUG) + if(!generate()) + failed = TRUE + + if(!do_not_announce) + if(!failed) + admin_notice("[capitalize(name)] generation completed in [round(0.1*(world.timeofday-start_time),0.1)] seconds.", R_DEBUG) + else + admin_notice("[capitalize(name)] failed to generate ([round(0.1*(world.timeofday-start_time),0.1)] seconds): could not produce sane map.", R_DEBUG) /datum/random_map/proc/get_map_cell(var/x,var/y) if(!map) @@ -162,11 +170,11 @@ var/global/list/map_count = list() if(!current_cell) return 0 var/turf/T = locate((origin_x-1)+x,(origin_y-1)+y,origin_z) - if(!T || (target_turf_type && !istype(T,target_turf_type))) + if(!T || (skip_dense && T.density) || (target_turf_type && !istype(T,target_turf_type))) return 0 var/newpath = get_appropriate_path(map[current_cell]) if(newpath) - T.ChangeTurf(newpath) + T.ChangeTurf(newpath, preserve_outdoors = keep_outside) get_additional_spawns(map[current_cell],T,get_spawn_dir(x, y)) return T diff --git a/code/modules/reagents/machinery/dispenser/reagent_tank.dm b/code/modules/reagents/machinery/dispenser/reagent_tank.dm index cfa809b2af..2ba27cfe39 100644 --- a/code/modules/reagents/machinery/dispenser/reagent_tank.dm +++ b/code/modules/reagents/machinery/dispenser/reagent_tank.dm @@ -155,6 +155,20 @@ icon_state = "barrel" modded = TRUE +/obj/structure/reagent_dispensers/fueltank/barrel/two + name = "explosive barrel" + desc = "A barrel with warning labels painted all over it." + icon = 'icons/obj/objects_vr.dmi' + icon_state = "barrel2" + modded = FALSE + +/obj/structure/reagent_dispensers/fueltank/barrel/three + name = "fuel barrel" + desc = "An open-topped barrel full of nasty-looking liquid." + icon = 'icons/obj/objects_vr.dmi' + icon_state = "barrel3" + modded = FALSE + /obj/structure/reagent_dispensers/fueltank/barrel/attackby(obj/item/weapon/W as obj, mob/user as mob) if (W.is_wrench()) //can't wrench it shut, it's always open return @@ -461,7 +475,7 @@ /obj/structure/reagent_dispensers/cookingoil/New() ..() - reagents.add_reagent("cornoil",5000) + reagents.add_reagent("cookingoil",5000) /obj/structure/reagent_dispensers/cookingoil/bullet_act(var/obj/item/projectile/Proj) if(Proj.get_structure_damage()) diff --git a/code/modules/reagents/machinery/pump.dm b/code/modules/reagents/machinery/pump.dm new file mode 100644 index 0000000000..6c9302d61e --- /dev/null +++ b/code/modules/reagents/machinery/pump.dm @@ -0,0 +1,205 @@ +/obj/machinery/pump + name = "fluid pump" + desc = "A fluid pumping machine." + + description_info = "A machine that can pump fluid from certain turfs.
\ + Water can be pumped from any body of water. Certain locations or environmental\ + conditions can cause different byproducts to be produced.
\ + Magma or Lava can be pumped to produce mineralized fluid." + + anchored = 0 + density = 1 + + icon = 'icons/obj/machines/reagent.dmi' + icon_state = "pump" + + circuit = /obj/item/weapon/circuitboard/fluidpump + active_power_usage = 200 * CELLRATE + + var/obj/item/weapon/cell/cell = null + var/obj/item/hose_connector/output/Output = null + var/reagents_per_cycle = 40 + var/on = 0 + var/unlocked = 0 + var/open = 0 + +/obj/machinery/pump/Initialize() + create_reagents(200) + . = ..() + default_apply_parts() + cell = default_use_hicell() + + Output = new(src) + + RefreshParts() + update_icon() + +/obj/machinery/pump/Destroy() + QDEL_NULL(cell) + QDEL_NULL(Output) + . = ..() + +/obj/machinery/pump/RefreshParts() + var/obj/item/weapon/stock_parts/manipulator/SM = locate() in component_parts + active_power_usage = initial(active_power_usage) / SM.rating + + var/motor_power = 0 + for(var/obj/item/weapon/stock_parts/motor/M in component_parts) + motor_power += M.rating + reagents_per_cycle = initial(reagents_per_cycle) * motor_power / 2 + + var/bin_size = 0 + for(var/obj/item/weapon/stock_parts/matter_bin/SB in component_parts) + bin_size += SB.rating + + // New holder might have different volume. Transfer everything to a new holder to account for this. + var/datum/reagents/R = new(round(initial(reagents.maximum_volume) + 100 * bin_size), src) + src.reagents.trans_to_holder(R, src.reagents.total_volume) + qdel(src.reagents) + src.reagents = R + +/obj/machinery/pump/update_icon() + ..() + cut_overlays() + add_overlay("[icon_state]-tank") + if(!(cell?.check_charge(active_power_usage))) + add_overlay("[icon_state]-lowpower") + + if(reagents.total_volume >= 1) + var/image/I = image(icon, "[icon_state]-volume") + I.color = reagents.get_color() + add_overlay(I) + add_overlay("[icon_state]-glass") + + if(open) + add_overlay("[icon_state]-open") + if(istype(cell)) + add_overlay("[icon_state]-cell") + + icon_state = "[initial(icon_state)][on ? "-running" : ""]" + +/obj/machinery/pump/process() + if(!on) + return + + if(!anchored || !(cell?.use(active_power_usage))) + set_state(FALSE) + return + + var/turf/T = get_turf(src) + if(!istype(T)) + return + T.pump_reagents(reagents, reagents_per_cycle) + update_icon() + + if(Output.get_pairing()) + reagents.trans_to_holder(Output.reagents, Output.reagents.maximum_volume) + if(prob(5)) + visible_message("\The [src] gurgles as it pumps fluid.") + + +// Sets the power state, if possible. +// Returns TRUE/FALSE on power state changing +// var/target = target power state +// var/message = TRUE/FALSE whether to make a message about state change +/obj/machinery/pump/proc/set_state(var/target, var/message = TRUE) + if(target == on) + return FALSE + + if(!on && (!(cell?.check_charge(active_power_usage)) || !anchored)) + return FALSE + + on = !on + update_icon() + if(message) + if(on) + message = SPAN_NOTICE("\The [src] turns on.") + else + message = SPAN_NOTICE("\The [src] shuts down.") + visible_message(message) + return TRUE + +/obj/machinery/pump/attack_robot(mob/user) + return attack_hand(user) + +/obj/machinery/pump/attack_ai(mob/user) + if(!set_state(!on)) + to_chat(user, "You try to toggle \the [src] but it does not respond.") + +/obj/machinery/pump/attack_hand(mob/user) + if(open && istype(cell)) + user.put_in_hands(cell) + cell.add_fingerprint(user) + cell.update_icon() + cell = null + set_state(FALSE) + to_chat(user, "You remove the power cell.") + return + + if(!set_state(!on)) + to_chat(user, "You try to toggle \the [src] but it does not respond.") + +/obj/machinery/pump/attackby(obj/item/weapon/W, mob/user) + . = TRUE + if(W.is_screwdriver() && !open) + to_chat(user, SPAN_NOTICE("You [unlocked ? "screw" : "unscrew"] the battery panel.")) + unlocked = !unlocked + + else if(W.is_crowbar() && unlocked) + to_chat(user, open ? \ + "You crowbar the battery panel in place." : \ + "You remove the battery panel." \ + ) + open = !open + + else if(W.is_wrench()) + if(on) + to_chat(user, "\The [src] is active. Turn it off before trying to move it!") + return FALSE + default_unfasten_wrench(user, W, 2 SECONDS) + + else if(istype(W, /obj/item/weapon/cell) && open) + if(istype(cell)) + to_chat(user, "There is a power cell already installed.") + return FALSE + user.drop_from_inventory(W, src) + to_chat(user, "You insert the power cell.") + + else + . = ..() + + RefreshParts() + update_icon() + + +/turf/proc/pump_reagents() + return + +/turf/simulated/floor/lava/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("mineralizedfluid", round(volume / 2, 0.1)) + + +/turf/simulated/floor/water/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("water", round(volume, 0.1)) + + if(temperature <= T0C) + R.add_reagent("ice", round(volume / 2, 0.1)) + + for(var/turf/simulated/mineral/M in orange(5)) + if(istype(M.mineral, /obj/effect/mineral)) + var/obj/effect/mineral/ore = M.mineral + reagents.add_reagent(ore.ore_reagent, round(volume / 2, 0.1)) + +/turf/simulated/floor/water/pool/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("chlorine", round(volume / 10, 0.1)) + +/turf/simulated/floor/water/deep/pool/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("chlorine", round(volume / 10, 0.1)) + +/turf/simulated/floor/water/contaminated/pump_reagents(var/datum/reagents/R, var/volume) + . = ..() + R.add_reagent("vatstabilizer", round(volume / 2, 0.1)) \ No newline at end of file diff --git a/code/modules/reagents/reactions/instant/drinks.dm b/code/modules/reagents/reactions/instant/drinks.dm index efb58fe90c..c2e0521ee6 100644 --- a/code/modules/reagents/reactions/instant/drinks.dm +++ b/code/modules/reagents/reactions/instant/drinks.dm @@ -141,7 +141,7 @@ name = "Space Beer" id = "spacebeer" result = "beer" - required_reagents = list("cornoil" = 10) + required_reagents = list("cornoil" = 5, "flour" = 5) catalysts = list("enzyme" = 5) result_amount = 10 @@ -203,6 +203,7 @@ name = "Classic Martini" id = "martini" result = "martini" + inhibitors = list("bitters" = 1) required_reagents = list("gin" = 2, "vermouth" = 1) result_amount = 3 @@ -907,7 +908,7 @@ name = "Debugger" id = "debugger" result = "debugger" - required_reagents = list("fuel" = 1, "sugar" = 2, "cornoil" = 2) + required_reagents = list("fuel" = 1, "sugar" = 2, "cookingoil" = 2) result_amount = 5 /decl/chemical_reaction/instant/drinks/spacersbrew @@ -1205,14 +1206,14 @@ name = "Oil Slick" id = "oilslick" result = "oilslick" - required_reagents = list("cornoil" = 2, "honey" = 1) + required_reagents = list("cookingoil" = 2, "honey" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/slimeslam name = "Slick Slime Slammer" id = "slimeslammer" result = "slimeslammer" - required_reagents = list("cornoil" = 2, "peanutbutter" = 1) + required_reagents = list("cookingoil" = 2, "peanutbutter" = 1) result_amount = 3 /decl/chemical_reaction/instant/drinks/virginsexonthebeach @@ -1254,7 +1255,7 @@ name = "Soda Oil" id = "sodaoil" result = "sodaoil" - required_reagents = list("cornoil" = 4, "sodawater" = 1, "carbon" = 1, "tricordrazine" = 1) + required_reagents = list("cookingoil" = 4, "sodawater" = 1, "carbon" = 1, "tricordrazine" = 1) result_amount = 6 /decl/chemical_reaction/instant/drinks/fusionnaire diff --git a/code/modules/reagents/reactions/instant/drinks_vr.dm b/code/modules/reagents/reactions/instant/drinks_vr.dm index 5f32c7e5f8..5948562cd6 100644 --- a/code/modules/reagents/reactions/instant/drinks_vr.dm +++ b/code/modules/reagents/reactions/instant/drinks_vr.dm @@ -137,6 +137,7 @@ name = "Choccy Milk" id = "choccymilk" result = "choccymilk" + inhibitors = list("enzyme" = 1) required_reagents = list("milk" = 3, "coco" = 1) result_amount = 4 diff --git a/code/modules/reagents/reactions/instant/food.dm b/code/modules/reagents/reactions/instant/food.dm index 952af8014b..393c033494 100644 --- a/code/modules/reagents/reactions/instant/food.dm +++ b/code/modules/reagents/reactions/instant/food.dm @@ -31,6 +31,7 @@ id = "chocolate_bar" result = null required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2) + catalysts = list("enzyme" = 5) result_amount = 1 /decl/chemical_reaction/instant/food/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -44,6 +45,7 @@ id = "chocolate_bar" result = null required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2) + catalysts = list("enzyme" = 5) result_amount = 1 /decl/chemical_reaction/instant/food/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume) @@ -52,6 +54,22 @@ new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location) return +/decl/chemical_reaction/instant/food/cookingoilcorn + name = "Cooking Oil" + id = "cookingoilcorn" + result = "cookingoil" + required_reagents = list("cornoil" = 10) + catalysts = list("enzyme" = 5) + result_amount = 10 + +/decl/chemical_reaction/instant/food/cookingoilpeanut + name = "Cooking Oil" + id = "cookingoilpeanut" + result = "cookingoil" + required_reagents = list("peanutoil" = 10) + catalysts = list("enzyme" = 5) + result_amount = 10 + /decl/chemical_reaction/instant/food/soysauce name = "Soy Sauce" id = "soysauce" @@ -85,7 +103,7 @@ name = "mayonnaise" id = "mayo" result = "mayo" - required_reagents = list("egg" = 9, "cornoil" = 5, "lemonjuice" = 5, "sodiumchloride" = 1) + required_reagents = list("egg" = 9, "cookingoil" = 5, "lemonjuice" = 5, "sodiumchloride" = 1) result_amount = 15 /decl/chemical_reaction/instant/food/cheesewheel @@ -107,6 +125,7 @@ id = "meatball" result = null required_reagents = list("protein" = 3, "flour" = 5) + catalysts = list("enzyme" = 5) result_amount = 3 /decl/chemical_reaction/instant/food/meatball/on_reaction(var/datum/reagents/holder, var/created_volume) diff --git a/code/modules/reagents/reactions/instant/instant.dm b/code/modules/reagents/reactions/instant/instant.dm index bb9e443f59..6f49a56ef3 100644 --- a/code/modules/reagents/reactions/instant/instant.dm +++ b/code/modules/reagents/reactions/instant/instant.dm @@ -1122,14 +1122,12 @@ name = "Neutralize Carpotoxin" id = "carpotoxin_neutral" result = "protein" - required_reagents = list("radium" = 1, "carpotoxin" = 1, "sifsap" = 1) - catalysts = list("sifsap" = 10) - result_amount = 2 + required_reagents = list("enzyme" = 1, "carpotoxin" = 1, "sifsap" = 1) + result_amount = 1 /decl/chemical_reaction/instant/neutralize_spidertoxin name = "Neutralize Spidertoxin" id = "spidertoxin_neutral" result = "protein" - required_reagents = list("radium" = 1, "spidertoxin" = 1, "sifsap" = 1) - catalysts = list("sifsap" = 10) - result_amount = 2 \ No newline at end of file + required_reagents = list("enzyme" = 1, "spidertoxin" = 1, "sifsap" = 1) + result_amount = 1 \ No newline at end of file diff --git a/code/modules/reagents/reactions/instant/instant_vr.dm b/code/modules/reagents/reactions/instant/instant_vr.dm index b1d49c012a..63b764dafe 100644 --- a/code/modules/reagents/reactions/instant/instant_vr.dm +++ b/code/modules/reagents/reactions/instant/instant_vr.dm @@ -400,7 +400,7 @@ /mob/living/simple_mob/animal/passive/bird/parrot/poly, /mob/living/simple_mob/animal/sif/fluffy, /mob/living/simple_mob/animal/sif/fluffy/silky, - /mob/living/simple_mob/animal/passive/snake/noodle, + /mob/living/simple_mob/animal/passive/snake/python/noodle, /mob/living/simple_mob/slime/xenobio/rainbow/kendrick, /mob/living/simple_mob/animal/space/space_worm, //Space Worm parts that aren't proper heads /mob/living/simple_mob/animal/space/space_worm/head/severed, diff --git a/code/modules/reagents/reagent_containers/pill_vr.dm b/code/modules/reagents/reagent_containers/pill_vr.dm index b9046d96b3..d956861a4b 100644 --- a/code/modules/reagents/reagent_containers/pill_vr.dm +++ b/code/modules/reagents/reagent_containers/pill_vr.dm @@ -146,3 +146,13 @@ . = ..() reagents.add_reagent("sleevingcure", 1) color = reagents.get_color() + +/obj/item/weapon/reagent_containers/pill/airlock + name = "\'Airlock\' Pill" + desc = "Neutralizes toxins and provides a mild analgesic effect." + icon_state = "pill2" + +/obj/item/weapon/reagent_containers/pill/airlock/New() + ..() + reagents.add_reagent("anti_toxin", 15) + reagents.add_reagent("paracetamol", 5) \ No newline at end of file diff --git a/code/modules/reagents/reagents/_reagents.dm b/code/modules/reagents/reagents/_reagents.dm index 3ffb7e58e5..2ad46f225b 100644 --- a/code/modules/reagents/reagents/_reagents.dm +++ b/code/modules/reagents/reagents/_reagents.dm @@ -48,12 +48,15 @@ // This doesn't apply to skin contact - this is for, e.g. extinguishers and sprays. The difference is that reagent is not directly on the mob's skin - it might just be on their clothing. /datum/reagent/proc/touch_mob(var/mob/M, var/amount) + SEND_SIGNAL(M, COMSIG_REAGENTS_TOUCH, src, amount) return /datum/reagent/proc/touch_obj(var/obj/O, var/amount) // Acid melting, cleaner cleaning, etc + SEND_SIGNAL(O, COMSIG_REAGENTS_TOUCH, src, amount) return /datum/reagent/proc/touch_turf(var/turf/T, var/amount) // Cleaner cleaning, lube lubbing, etc, all go here + SEND_SIGNAL(T, COMSIG_REAGENTS_TOUCH, src, amount) return /datum/reagent/proc/on_mob_life(var/mob/living/carbon/M, var/alien, var/datum/reagents/metabolism/location) // Currently, on_mob_life is called on carbons. Any interaction with non-carbon mobs (lube) will need to be done in touch_mob. @@ -168,20 +171,22 @@ if(M.species.allergen_reaction & AG_TOX_DMG) M.adjustToxLoss(damage_severity) if(M.species.allergen_reaction & AG_OXY_DMG) - M.adjustOxyLoss(damage_severity) + M.adjustOxyLoss(damage_severity*1.5) //VOREStation Edit if(prob(2.5*disable_severity)) M.emote(pick("cough","gasp","choke")) if(M.species.allergen_reaction & AG_EMOTE) if(prob(2.5*disable_severity)) //this has a higher base chance, but not *too* high M.emote(pick("pale","shiver","twitch")) if(M.species.allergen_reaction & AG_PAIN) - M.adjustHalLoss(disable_severity) + M.adjustHalLoss(disable_severity*2) //VOREStation Edit if(M.species.allergen_reaction & AG_WEAKEN) M.Weaken(disable_severity) if(M.species.allergen_reaction & AG_BLURRY) M.eye_blurry = max(M.eye_blurry, disable_severity) if(M.species.allergen_reaction & AG_SLEEPY) M.drowsyness = max(M.drowsyness, disable_severity) + if(M.species.allergen_reaction & AG_CONFUSE) //VOREStation Addition + M.Confuse(disable_severity/4) //VOREStation Addition remove_self(removed) return diff --git a/code/modules/reagents/reagents/core.dm b/code/modules/reagents/reagents/core.dm index a235a61755..3eb3e06cfb 100644 --- a/code/modules/reagents/reagents/core.dm +++ b/code/modules/reagents/reagents/core.dm @@ -31,6 +31,9 @@ /datum/reagent/blood/touch_turf(var/turf/simulated/T) if(!istype(T) || volume < 3) return + + ..() + if(!data["donor"] || istype(data["donor"], /mob/living/carbon/human)) blood_splatter(T, src, 1) else if(istype(data["donor"], /mob/living/carbon/alien)) @@ -169,6 +172,8 @@ if(!istype(T)) return + ..() + var/datum/gas_mixture/environment = T.return_air() var/min_temperature = T0C + 100 // 100C, the boiling point of water @@ -190,14 +195,19 @@ T.wet_floor(1) /datum/reagent/water/touch_obj(var/obj/O, var/amount) + ..() if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube)) var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O if(!cube.wrapped) cube.Expand() + else if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/cube)) + var/obj/item/weapon/reagent_containers/food/snacks/cube/cube = O + cube.Expand() else O.water_act(amount / 5) /datum/reagent/water/touch_mob(var/mob/living/L, var/amount) + ..() if(istype(L)) // First, kill slimes. if(istype(L, /mob/living/simple_mob/slime)) @@ -252,6 +262,7 @@ glass_desc = "Unless you are an industrial tool, this is probably not safe for consumption." /datum/reagent/fuel/touch_turf(var/turf/T, var/amount) + ..() new /obj/effect/decal/cleanable/liquid_fuel(T, amount, FALSE) remove_self(amount) return @@ -261,5 +272,6 @@ M.adjustToxLoss(4 * removed) /datum/reagent/fuel/touch_mob(var/mob/living/L, var/amount) + ..() if(istype(L)) L.adjust_fire_stacks(amount / 10) // Splashing people with welding fuel to make them easy to ignite! diff --git a/code/modules/reagents/reagents/dispenser.dm b/code/modules/reagents/reagents/dispenser.dm index 6dd8a79285..abc0522886 100644 --- a/code/modules/reagents/reagents/dispenser.dm +++ b/code/modules/reagents/reagents/dispenser.dm @@ -49,6 +49,7 @@ M.ingested.remove_reagent(R.id, removed * effect) /datum/reagent/carbon/touch_turf(var/turf/T) + ..() if(!istype(T, /turf/space)) var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt, T) if (!dirtoverlay) @@ -106,6 +107,7 @@ allergen_factor = 0.5 //simulates mixed drinks containing less of the allergen, as they have only a single actual reagent unlike food /datum/reagent/ethanol/touch_mob(var/mob/living/L, var/amount) + ..() if(istype(L)) L.adjust_fire_stacks(amount / 15) @@ -199,6 +201,7 @@ M.hallucination = max(M.hallucination, halluci) /datum/reagent/ethanol/touch_obj(var/obj/O) + ..() if(istype(O, /obj/item/weapon/paper)) var/obj/item/weapon/paper/paperaffected = O paperaffected.clearpaper() @@ -342,6 +345,7 @@ M.adjustToxLoss(100) /datum/reagent/radium/touch_turf(var/turf/T) + ..() if(volume >= 3) if(!istype(T, /turf/space)) var/obj/effect/decal/cleanable/greenglow/glow = locate(/obj/effect/decal/cleanable/greenglow, T) @@ -426,6 +430,7 @@ M.take_organ_damage(0, removed * power * 0.1) // Balance. The damage is instant, so it's weaker. 10 units -> 5 damage, double for pacid. 120 units beaker could deal 60, but a) it's burn, which is not as dangerous, b) it's a one-use weapon, c) missing with it will splash it over the ground and d) clothes give some protection, so not everything will hit /datum/reagent/acid/touch_obj(var/obj/O) + ..() if(O.unacidable) return if((istype(O, /obj/item) || istype(O, /obj/effect/plant)) && (volume > meltdose)) diff --git a/code/modules/reagents/reagents/food_drinks.dm b/code/modules/reagents/reagents/food_drinks.dm index 1ddc24bfc9..b72aafbacd 100644 --- a/code/modules/reagents/reagents/food_drinks.dm +++ b/code/modules/reagents/reagents/food_drinks.dm @@ -170,6 +170,8 @@ if(!istype(T)) return + ..() + var/hotspot = (locate(/obj/fire) in T) if(hotspot && !istype(T, /turf/space)) var/datum/gas_mixture/lowertemp = T.remove_air(T:air:total_moles) @@ -234,6 +236,12 @@ to_chat(M, "Searing hot oil burns you, wash it off quick!") lastburnmessage = world.time +/datum/reagent/nutriment/triglyceride/oil/cooking + name = "Cooking Oil" + id = "cookingoil" + description = "A general-purpose cooking oil." + reagent_state = LIQUID + /datum/reagent/nutriment/triglyceride/oil/corn name = "Corn Oil" id = "cornoil" @@ -380,6 +388,7 @@ allergen_type = ALLERGEN_GRAINS //Flour is made from grain /datum/reagent/nutriment/flour/touch_turf(var/turf/simulated/T) + ..() if(!istype(T, /turf/space)) new /obj/effect/decal/cleanable/flour(T) @@ -559,6 +568,7 @@ glass_desc = "Durian paste. It smells horrific." /datum/reagent/nutriment/durian/touch_mob(var/mob/M, var/amount) + ..() if(iscarbon(M) && !M.isSynthetic()) var/message = pick("Oh god, it smells disgusting here.", "What is that stench?", "That's an awful odor.") to_chat(M, "[message]") @@ -568,6 +578,7 @@ return ..() /datum/reagent/nutriment/durian/touch_turf(var/turf/T, var/amount) + ..() if(istype(T)) var/obj/effect/decal/cleanable/chemcoating/C = new /obj/effect/decal/cleanable/chemcoating(T) C.reagents.add_reagent(id, amount) diff --git a/code/modules/reagents/reagents/medicine.dm b/code/modules/reagents/reagents/medicine.dm index e0130e54bb..a18a2a1a73 100644 --- a/code/modules/reagents/reagents/medicine.dm +++ b/code/modules/reagents/reagents/medicine.dm @@ -339,6 +339,7 @@ M.adjustToxLoss(3 * removed) /datum/reagent/tricorlidaze/touch_obj(var/obj/O) + ..() if(istype(O, /obj/item/stack/medical/bruise_pack) && round(volume) >= 5) var/obj/item/stack/medical/bruise_pack/C = O var/packname = C.name @@ -1248,6 +1249,7 @@ M.add_chemical_effect(CE_PAINKILLER, 20 * M.species.chem_strength_pain) // 5 less than paracetamol. /datum/reagent/spacomycaze/touch_obj(var/obj/O) + ..() if(istype(O, /obj/item/stack/medical/crude_pack) && round(volume) >= 1) var/obj/item/stack/medical/crude_pack/C = O var/packname = C.name @@ -1284,10 +1286,12 @@ M.adjustToxLoss(2 * removed) /datum/reagent/sterilizine/touch_obj(var/obj/O) + ..() O.germ_level -= min(volume*20, O.germ_level) O.was_bloodied = null /datum/reagent/sterilizine/touch_turf(var/turf/T) + ..() T.germ_level -= min(volume*20, T.germ_level) for(var/obj/item/I in T.contents) I.was_bloodied = null @@ -1301,6 +1305,7 @@ //VOREstation edit end /datum/reagent/sterilizine/touch_mob(var/mob/living/L, var/amount) + ..() if(istype(L)) if(istype(L, /mob/living/simple_mob/slime)) var/mob/living/simple_mob/slime/S = L @@ -1501,3 +1506,22 @@ metabolism = REM * 0.002 overdose = REAGENTS_OVERDOSE * 0.25 scannable = 1 + +/datum/reagent/earthsblood + name = "Earthsblood" + id = "earthsblood" + description = "A rare plant extract with immense, almost magical healing capabilities. Induces a potent psychoactive state, damaging neurons with prolonged use." + taste_description = "honey and sunlight" + reagent_state = LIQUID + color = "#ffb500" + overdose = REAGENTS_OVERDOSE * 0.50 + + +/datum/reagent/earthsblood/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + M.heal_organ_damage (4 * removed, 4 * removed) + M.adjustOxyLoss(-10 * removed) + M.adjustToxLoss(-4 * removed) + M.adjustCloneLoss(-2 * removed) + M.druggy = max(M.druggy, 20) + M.hallucination = max(M.hallucination, 3) + M.adjustBrainLoss(1 * removed) //your life for your mind. The Earthmother's Tithe. \ No newline at end of file diff --git a/code/modules/reagents/reagents/modifiers.dm b/code/modules/reagents/reagents/modifiers.dm index bed5da5f47..22b1f047c7 100644 --- a/code/modules/reagents/reagents/modifiers.dm +++ b/code/modules/reagents/reagents/modifiers.dm @@ -42,6 +42,7 @@ affect_blood(M, alien, removed * 0.6) /datum/reagent/modapplying/cryofluid/touch_mob(var/mob/M, var/amount) + ..() if(isliving(M)) var/mob/living/L = M for(var/I = 1 to rand(1, round(amount + 1))) @@ -49,6 +50,7 @@ return /datum/reagent/modapplying/cryofluid/touch_turf(var/turf/T, var/amount) + ..() if(istype(T, /turf/simulated/floor/water) && prob(amount)) T.visible_message("\The [T] crackles loudly as the cryogenic fluid causes it to boil away, leaving behind a hard layer of ice.") T.ChangeTurf(/turf/simulated/floor/outdoors/ice, 1, 1, TRUE) diff --git a/code/modules/reagents/reagents/other.dm b/code/modules/reagents/reagents/other.dm index b6775e1759..9016b7177c 100644 --- a/code/modules/reagents/reagents/other.dm +++ b/code/modules/reagents/reagents/other.dm @@ -114,14 +114,17 @@ color_weight = 20 /datum/reagent/paint/touch_turf(var/turf/T) + ..() if(istype(T) && !istype(T, /turf/space)) T.color = color /datum/reagent/paint/touch_obj(var/obj/O) + ..() if(istype(O)) O.color = color /datum/reagent/paint/touch_mob(var/mob/M) + ..() if(istype(M) && !istype(M, /mob/observer)) //painting ghosts: not allowed M.color = color //maybe someday change this to paint only clothes and exposed body parts for human mobs. @@ -267,6 +270,7 @@ M.apply_effect(5 * removed, IRRADIATE, 0) /datum/reagent/uranium/touch_turf(var/turf/T) + ..() if(volume >= 3) if(!istype(T, /turf/space)) var/obj/effect/decal/cleanable/greenglow/glow = locate(/obj/effect/decal/cleanable/greenglow, T) @@ -288,7 +292,7 @@ name = "Lithium-6" id = "lithium6" description = "An isotope of lithium. It has 3 neutrons, but shares all chemical characteristics with regular lithium." - + /datum/reagent/helium/helium3 name = "Helium-3" id = "helium3" @@ -321,11 +325,11 @@ /datum/reagent/supermatter/affect_ingest(mob/living/carbon/M, alien, removed) . = ..() M.ash() - + /datum/reagent/supermatter/affect_blood(mob/living/carbon/M, alien, removed) . = ..() M.ash() - + /datum/reagent/adrenaline name = "Adrenaline" @@ -361,6 +365,7 @@ cult.remove_antagonist(M.mind) /datum/reagent/water/holywater/touch_turf(var/turf/T) + ..() if(volume >= 5) T.holy = 1 return @@ -408,6 +413,7 @@ touch_met = 50 /datum/reagent/thermite/touch_turf(var/turf/T) + ..() if(volume >= 5) if(istype(T, /turf/simulated/wall)) var/turf/simulated/wall/W = T @@ -417,6 +423,7 @@ return /datum/reagent/thermite/touch_mob(var/mob/living/L, var/amount) + ..() if(istype(L)) L.adjust_fire_stacks(amount / 5) @@ -433,14 +440,17 @@ touch_met = 50 /datum/reagent/space_cleaner/touch_mob(var/mob/M) + ..() if(iscarbon(M)) var/mob/living/carbon/C = M C.clean_blood() /datum/reagent/space_cleaner/touch_obj(var/obj/O) + ..() O.clean_blood() /datum/reagent/space_cleaner/touch_turf(var/turf/T) + ..() if(volume >= 1) if(istype(T, /turf/simulated)) var/turf/simulated/S = T @@ -488,6 +498,7 @@ M.vomit() /datum/reagent/space_cleaner/touch_mob(var/mob/living/L, var/amount) + ..() if(istype(L, /mob/living/carbon/human)) var/mob/living/carbon/human/H = L if(H.wear_mask) @@ -506,6 +517,7 @@ color = "#009CA8" /datum/reagent/lube/touch_turf(var/turf/simulated/T) + ..() if(!istype(T)) return if(volume >= 1) @@ -520,6 +532,7 @@ color = "#C7FFFF" /datum/reagent/silicate/touch_obj(var/obj/O) + ..() if(istype(O, /obj/structure/window)) var/obj/structure/window/W = O W.apply_silicate(volume) @@ -593,9 +606,11 @@ color = "#F2F3F4" /datum/reagent/luminol/touch_obj(var/obj/O) + ..() O.reveal_blood() /datum/reagent/luminol/touch_mob(var/mob/living/L) + ..() L.reveal_blood() /datum/reagent/nutriment/biomass @@ -631,10 +646,11 @@ M.adjustToxLoss(2 * removed) M.adjustCloneLoss(2 * removed) -/datum/reagent/fishbait +/datum/reagent/nutriment/fishbait name = "Fish Bait" id = "fishbait" description = "A natural slurry that particularily appeals to fish." - taste_description = "earthy" + taste_description = "slimy dirt" reagent_state = LIQUID - color = "#62764E" \ No newline at end of file + color = "#62764E" + nutriment_factor = 15 diff --git a/code/modules/reagents/reagents/other_vr.dm b/code/modules/reagents/reagents/other_vr.dm index f0286667df..eba5c5cbbe 100644 --- a/code/modules/reagents/reagents/other_vr.dm +++ b/code/modules/reagents/reagents/other_vr.dm @@ -47,7 +47,7 @@ var/obj/item/device/nif/nif = H.nif //L o c a l if(nif.stat == NIF_TEMPFAIL) nif.stat = NIF_INSTALLING - nif.durability = min(nif.durability + removed, initial(nif.durability)) + nif.repair(removed) /datum/reagent/firefighting_foam name = "Firefighting Foam" @@ -120,7 +120,7 @@ var/obj/item/device/nif/nif = H.nif //L o c a l if(nif.stat == NIF_TEMPFAIL) nif.stat = NIF_INSTALLING - nif.durability = min(nif.durability + removed*0.1, initial(nif.durability)) + nif.repair(removed*0.1) //Special toxins for solargrubs /datum/reagent/grubshock diff --git a/code/modules/reagents/reagents/toxins.dm b/code/modules/reagents/reagents/toxins.dm index dde7bf21a9..6b7c2c66fe 100644 --- a/code/modules/reagents/reagents/toxins.dm +++ b/code/modules/reagents/reagents/toxins.dm @@ -67,7 +67,7 @@ /datum/reagent/toxin/neurotoxic_protein name = "toxic protein" id = "neurotoxic_protein" - description = "A weak neurotoxic chemical commonly found in Sivian fish meat." + description = "A weak neurotoxic chemical." taste_description = "fish" reagent_state = LIQUID color = "#005555" @@ -75,6 +75,8 @@ skin_danger = 0.4 /datum/reagent/toxin/neurotoxic_protein/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + if(alien == IS_CHIMERA) + return ..() if(alien != IS_DIONA) if(M.canmove && !M.restrained() && istype(M.loc, /turf/space)) @@ -94,6 +96,7 @@ var/fire_mult = 30 /datum/reagent/toxin/hydrophoron/touch_mob(var/mob/living/L, var/amount) + ..() if(istype(L)) L.adjust_fire_stacks(amount / fire_mult) @@ -105,6 +108,7 @@ /datum/reagent/toxin/hydrophoron/touch_turf(var/turf/simulated/T) if(!istype(T)) return + ..() T.assume_gas("phoron", CEILING(volume/2, 1), T20C) for(var/turf/simulated/floor/target_tile in range(0,T)) target_tile.assume_gas("phoron", volume/2, 400+T0C) @@ -146,6 +150,7 @@ skin_danger = 1 /datum/reagent/toxin/phoron/touch_mob(var/mob/living/L, var/amount) + ..() if(istype(L)) L.adjust_fire_stacks(amount / 5) @@ -167,6 +172,7 @@ ..() /datum/reagent/toxin/phoron/touch_turf(var/turf/simulated/T, var/amount) + ..() if(!istype(T)) return T.assume_gas("volatile_fuel", amount, T20C) @@ -388,6 +394,7 @@ color = "#e67819" /datum/reagent/toxin/fertilizer/tannin/touch_obj(var/obj/O, var/volume) + ..() if(istype(O, /obj/item/stack/hairlesshide)) var/obj/item/stack/hairlesshide/HH = O HH.rapidcure(round(volume)) @@ -403,6 +410,7 @@ strength = 4 /datum/reagent/toxin/plantbgone/touch_turf(var/turf/T) + ..() if(istype(T, /turf/simulated/wall)) var/turf/simulated/wall/W = T if(locate(/obj/effect/overlay/wallrot) in W) @@ -411,6 +419,7 @@ W.visible_message("The fungi are completely dissolved by the solution!") /datum/reagent/toxin/plantbgone/touch_obj(var/obj/O, var/volume) + ..() if(istype(O, /obj/effect/plant)) qdel(O) else if(istype(O, /obj/effect/alien/weeds/)) diff --git a/code/modules/research/designs/circuits/circuits.dm b/code/modules/research/designs/circuits/circuits.dm index fbf41ab806..cd28842f00 100644 --- a/code/modules/research/designs/circuits/circuits.dm +++ b/code/modules/research/designs/circuits/circuits.dm @@ -36,14 +36,21 @@ CIRCUITS BELOW id = "oriontrail" req_tech = list(TECH_DATA = 1) build_path = /obj/item/weapon/circuitboard/arcade/orion_trail - sort_string = "MAAAZ" // Duplicate string, really need to redo this whole thing + sort_string = "MAAAB" + +/datum/design/circuit/clawmachine + name = "grab-a-gift arcade machine" + id = "clawmachine" + req_tech = list(TECH_DATA = 1) + build_path = /obj/item/weapon/circuitboard/arcade/clawmachine + sort_string = "MAAAC" /datum/design/circuit/jukebox name = "jukebox" id = "jukebox" req_tech = list(TECH_MAGNET = 2, TECH_DATA = 1) build_path = /obj/item/weapon/circuitboard/jukebox - sort_string = "MAAAB" + sort_string = "MAAAO" /datum/design/circuit/seccamera name = "security camera monitor" diff --git a/code/modules/research/designs/engineering.dm b/code/modules/research/designs/engineering.dm index 5c496fdc4f..bf55cdd788 100644 --- a/code/modules/research/designs/engineering.dm +++ b/code/modules/research/designs/engineering.dm @@ -40,6 +40,15 @@ build_path = /obj/item/weapon/pipe_dispenser sort_string = "NAAAD" +/datum/design/item/tool/qpad_booster + name = "Quantum Pad Particle Booster" + desc = "A deceptively simple interface for increasing the mass of objects a quantum pad is capable of teleporting, at the cost of increased power draw." + id = "qpad_booster" + req_tech = list(TECH_ENGINEERING = 7, TECH_MATERIAL = 7, TECH_BLUESPACE = 6) + materials = list(MAT_STEEL = 4000, MAT_GLASS = 2000, MAT_SILVER = 2000, MAT_GOLD = 2000, MAT_VERDANTIUM = 1000) + build_path = /obj/item/device/quantum_pad_booster + sort_string = "NAAAF" + // Other devices /datum/design/item/engineering/AssembleDesignName() diff --git a/code/modules/research/mechfab_designs.dm b/code/modules/research/mechfab_designs.dm index d83b404a0b..2480bda5c6 100644 --- a/code/modules/research/mechfab_designs.dm +++ b/code/modules/research/mechfab_designs.dm @@ -761,6 +761,22 @@ materials = list(MAT_STEEL = 10000, MAT_SILVER = 1000, MAT_GOLD = 1000) build_path = /obj/item/mecha_parts/mecha_equipment/speedboost +/datum/design/item/mecha/auxstorage + name = "Auxillary Exosuit Storage Bay" + desc = "An auxillary storage compartment, for attaching to exosuits." + id = "mech_storage" + req_tech = list(TECH_MATERIAL = 4) + materials = list(MAT_STEEL = 10000) + build_path = /obj/item/mecha_parts/mecha_equipment/storage + +/datum/design/item/mecha/bsauxstorage + name = "Auxillary Exosuit Storage Wormhole" + desc = "An auxillary storage wormhole, for attaching to exosuits." + id = "mech_storage_bs" + req_tech = list(TECH_MATERIAL = 4) + materials = list(MAT_PLASTEEL = 10000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000) + build_path = /obj/item/mecha_parts/mecha_equipment/storage/bluespace + /datum/design/item/synthetic_flash name = "Synthetic Flash" id = "sflash" @@ -1041,6 +1057,30 @@ materials = list(MAT_DURASTEEL = 5000, MAT_GRAPHITE = 3000, MAT_MORPHIUM = 1500, MAT_OSMIUM = 1500, MAT_PHORON = 1750, MAT_VERDANTIUM = 3000, MAT_SUPERMATTER = 2000) build_path = /obj/item/rig_module/teleporter +/datum/design/item/mechfab/rigsuit/radshield + name = "hardsuit radiation absorption device" + desc = "A miniaturized radiation absorption array, for use in hardsuits and providing full radiation protection." + id = "rig_component_radshield" + req_tech = list(TECH_MATERIAL = 5, TECH_ENGINEERING = 3, TECH_MAGNET = 4, TECH_POWER = 3, TECH_BLUESPACE = 4) + materials = list(MAT_STEEL = 8000, MAT_GRAPHITE = 3000, MAT_OSMIUM = 1500, MAT_PHORON = 2250, MAT_SILVER = 1500, MAT_GOLD = 1500) + build_path = /obj/item/rig_module/rad_shield + +/datum/design/item/mechfab/rigsuit/radshield_adv + name = "hardsuit advanced radiation absorption device" + desc = "An optimized, miniaturized radiation absorption array, for use in hardsuits and providing full radiation protection. Reduced power draw." + id = "rig_component_radshield_adv" + req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_POWER = 6, TECH_BLUESPACE = 4) + materials = list(MAT_PLASTEEL = 8000, MAT_GRAPHITE = 4000, MAT_OSMIUM = 2000, MAT_PHORON = 3250, MAT_SILVER = 2250, MAT_GOLD = 2250) + build_path = /obj/item/rig_module/rad_shield/advanced + +/datum/design/item/mechfab/rigsuit/atmosshield + name = "hardsuit atmospheric protection enhancement suite" + desc = "An advanced atmospheric protection suite, providing protection against both pressure and heat. At the cost of concerningly high power draw." + id = "rig_component_atmosshield" + req_tech = list(TECH_MATERIAL = 7, TECH_ENGINEERING = 5, TECH_MAGNET = 5, TECH_POWER = 6, TECH_BLUESPACE = 4) + materials = list(MAT_PLASTEEL = 8000, MAT_DURASTEEL = 4000, MAT_GRAPHITE = 8000, MAT_OSMIUM = 6000, MAT_PHORON = 6000, MAT_SILVER = 4000, MAT_GOLD = 4000) + build_path = /obj/item/rig_module/atmos_shield + /datum/design/item/mechfab/uav/basic name = "UAV - Recon Skimmer" id = "recon_skimmer" diff --git a/code/modules/research/prosfab_designs.dm b/code/modules/research/prosfab_designs.dm index 6f29e26ebb..d4ab887d98 100644 --- a/code/modules/research/prosfab_designs.dm +++ b/code/modules/research/prosfab_designs.dm @@ -268,6 +268,13 @@ time = 15 materials = list(MAT_STEEL = 2000, MAT_GLASS = 750, MAT_PLASTIC = 500) +/datum/design/item/prosfab/pros/internal/stomach + name = "Prosthetic Stomach" + id = "pros_stomach" + build_path = /obj/item/organ/internal/stomach + time = 15 + materials = list(MAT_STEEL = 5625, MAT_GLASS = 1000) + //////////////////// Cyborg Parts //////////////////// /datum/design/item/prosfab/cyborg category = list("Cyborg Parts") diff --git a/code/modules/resleeving/infomorph.dm b/code/modules/resleeving/infomorph.dm index 584ea22aac..15cedfb1f6 100644 --- a/code/modules/resleeving/infomorph.dm +++ b/code/modules/resleeving/infomorph.dm @@ -1,25 +1,25 @@ var/list/infomorph_emotions = list( - "Happy" = "pai-happy", - "Cat" = "pai-cat", - "Extremely Happy" = "pai-extremely-happy", - "Face" = "pai-face", - "Laugh" = "pai-laugh", - "Off" = "pai-off", - "Sad" = "pai-sad", - "Angry" = "pai-angry", - "What" = "pai-what", - "Neutral" = "pai-neutral", - "Silly" = "pai-silly", - "Nose" = "pai-nose", - "Smirk" = "pai-smirk", - "Exclamation Points" = "pai-exclamation", - "Question Mark" = "pai-question" + "Happy" = 1, + "Cat" = 2, + "Extremely Happy" = 3, + "Face" = 4, + "Laugh" = 5, + "Off" = 6, + "Sad" = 7, + "Angry" = 8, + "What" = 9, + "Neutral" = 10, + "Silly" = 11, + "Nose" = 12, + "Smirk" = 13, + "Exclamation Points" = 14, + "Question Mark" = 15 ) /mob/living/silicon/infomorph name = "sleevecard" //Has the same name as the card for consistency, but this is the MOB in the card. - icon = 'icons/mob/pai.dmi' - icon_state = "repairbot" + icon = 'icons/mob/pai_vr.dmi' //Changed to the virgo icon, giving more sprite options. + icon_state = "pai-repairbot" emote_type = 2 // pAIs emotes are heard, not seen, so they can be seen through a container (eg. person) pass_flags = 1 @@ -39,13 +39,31 @@ var/list/infomorph_emotions = list( var/obj/item/device/sleevecard/card // The card we inhabit var/obj/item/device/radio/sleevecard/radio // Our primary radio var/obj/item/device/universal_translator/translator - + // This was ripped from PAI code, this is to fix the broken sprites for sleevecards and to give sleevecards the same options as PAIs for chassis var/chassis = null // A record of your chosen chassis. var/global/list/possible_chassis = list( - "Spiderbot" = "repairbot", - "RoboCat" = "cat", - "MechaMouse" = "mouse", - "CyberMonkey" = "monkey" + "Drone" = "pai-repairbot", + "Cat" = "pai-cat", + "Mouse" = "pai-mouse", + "Monkey" = "pai-monkey", + "Corgi" = "pai-borgi", + "Fox" = "pai-fox", + "Parrot" = "pai-parrot", + "Rabbit" = "pai-rabbit", + //VOREStation Addition Start + "Bear" = "pai-bear", + "Fennec" = "pai-fen", + "Type Zero" = "pai-typezero", + "Raccoon" = "pai-raccoon", + "Raptor" = "pai-raptor", + "Corgi" = "pai-corgi", + "Bat" = "pai-bat", + "Butterfly" = "pai-butterfly", + "Hawk" = "pai-hawk", + "Duffel" = "pai-duffel", + "Rat" = "rat", + "Panther" = "panther" + //VOREStation Addition End ) var/global/list/possible_say_verbs = list( @@ -53,7 +71,9 @@ var/list/infomorph_emotions = list( "Natural" = list("says","yells","asks"), "Beep" = list("beeps","beeps loudly","boops"), "Chirp" = list("chirps","chirrups","cheeps"), - "Feline" = list("purrs","yowls","meows") + "Feline" = list("purrs","yowls","meows"), + "Canine" = list("yaps","barks","woofs"), + "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit ) var/obj/item/weapon/pai_cable/cable // The cable we produce and use when door or camera jacking @@ -476,7 +496,7 @@ var/global/list/default_infomorph_software = list() /mob/living/silicon/infomorph/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() - + // Software we have bought var/list/bought_software = list() // Software we have not bought diff --git a/code/modules/resleeving/machines_vr.dm b/code/modules/resleeving/machine_subtypes.dm similarity index 91% rename from code/modules/resleeving/machines_vr.dm rename to code/modules/resleeving/machine_subtypes.dm index b9f7c81aa6..405bcef141 100644 --- a/code/modules/resleeving/machines_vr.dm +++ b/code/modules/resleeving/machine_subtypes.dm @@ -1,12 +1,12 @@ -/obj/machinery/transhuman/resleever/abductor - icon = 'icons/obj/abductor_vr.dmi' - icon_state = "implantchair" - -/obj/machinery/computer/transhuman/resleeving/abductor - icon = 'icons/obj/abductor.dmi' - icon_state = "console" - -/obj/machinery/clonepod/transhuman/full/abductor - icon = 'icons/obj/abductor_vr.dmi' - icon_state = "pod_0" +/obj/machinery/transhuman/resleever/abductor + icon = 'icons/obj/abductor_vr.dmi' + icon_state = "implantchair" + +/obj/machinery/computer/transhuman/resleeving/abductor + icon = 'icons/obj/abductor.dmi' + icon_state = "console" + +/obj/machinery/clonepod/transhuman/full/abductor + icon = 'icons/obj/abductor_vr.dmi' + icon_state = "pod_0" name = "clonepod" \ No newline at end of file diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index adee6e4b0f..bb17833e35 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -589,8 +589,9 @@ //Re-supply a NIF if one was backed up with them. if(MR.nif_path) var/obj/item/device/nif/nif = new MR.nif_path(occupant,null,MR.nif_savedata) - for(var/path in MR.nif_software) - new path(nif) + spawn(0) //Delay to not install software before NIF is fully installed + for(var/path in MR.nif_software) + new path(nif) nif.durability = MR.nif_durability //Restore backed up durability after restoring the softs. // If it was a custom sleeve (not owned by anyone), update namification sequences @@ -612,7 +613,7 @@ occupant.confused = max(occupant.confused, confuse_amount) // Apply immedeate effects occupant.eye_blurry = max(occupant.eye_blurry, blur_amount) - + // Vore deaths get a fake modifier labeled as such if(!occupant.mind) log_debug("[occupant] didn't have a mind to check for vore_death, which may be problematic.") diff --git a/code/modules/resleeving/sleevecard.dm b/code/modules/resleeving/sleevecard.dm index b6f1e9a7be..9f21e6e4d5 100644 --- a/code/modules/resleeving/sleevecard.dm +++ b/code/modules/resleeving/sleevecard.dm @@ -89,7 +89,22 @@ /obj/item/device/sleevecard/proc/setEmotion(var/emotion) if(infomorph && emotion) cut_overlays() - add_overlay(emotion) + switch(emotion) + if(1) add_overlay("pai-happy") + if(2) add_overlay("pai-cat") + if(3) add_overlay("pai-extremely-happy") + if(4) add_overlay("pai-face") + if(5) add_overlay("pai-laugh") + if(6) add_overlay("pai-off") + if(7) add_overlay("pai-sad") + if(8) add_overlay("pai-angry") + if(9) add_overlay("pai-what") + if(10) add_overlay("pai-neutral") + if(11) add_overlay("pai-silly") + if(12) add_overlay("pai-nose") + if(13) add_overlay("pai-smirk") + if(14) add_overlay("pai-exclamation") + if(15) add_overlay("pai-question") current_emotion = emotion /obj/item/device/sleevecard/emp_act(severity) diff --git a/code/modules/shieldgen/directional_shield.dm b/code/modules/shieldgen/directional_shield.dm index 2677a56536..209dc9ca9a 100644 --- a/code/modules/shieldgen/directional_shield.dm +++ b/code/modules/shieldgen/directional_shield.dm @@ -103,7 +103,7 @@ if(always_on) create_shields() GLOB.moved_event.register(src, src, .proc/moved_event) - ..() + return ..() /obj/item/shield_projector/Destroy() destroy_shields() diff --git a/code/modules/tables/flipping.dm b/code/modules/tables/flipping.dm index 23d862d66d..e7029e3c6d 100644 --- a/code/modules/tables/flipping.dm +++ b/code/modules/tables/flipping.dm @@ -50,7 +50,7 @@ L.Add(turn(src.dir,90)) for(var/new_dir in L) var/obj/structure/table/T = locate() in get_step(src.loc,new_dir) - if(T && T.material.name == material.name) + if(T && T.material && T.material.name == material.name) if(T.flipped == 1 && T.dir == src.dir && !T.unflipping_check(new_dir)) return 0 return 1 diff --git a/code/modules/tables/interactions.dm b/code/modules/tables/interactions.dm index 27627055d7..779bb76d5f 100644 --- a/code/modules/tables/interactions.dm +++ b/code/modules/tables/interactions.dm @@ -1,7 +1,7 @@ /obj/structure/table/CanPass(atom/movable/mover, turf/target) if(istype(mover,/obj/item/projectile)) return (check_cover(mover,target)) - if (flipped) + if(flipped == 1) if(get_dir(mover, target) == reverse_dir[dir]) // From elsewhere to here, can't move against our dir return !density return TRUE @@ -10,12 +10,12 @@ if(locate(/obj/structure/table/bench) in get_turf(mover)) return FALSE var/obj/structure/table/table = locate(/obj/structure/table) in get_turf(mover) - if(table && !table.flipped) + if(table && !(table.flipped == 1)) return TRUE return FALSE /obj/structure/table/climb_to(mob/living/mover) - if(flipped && mover.loc == loc) + if(flipped == 1 && mover.loc == loc) var/turf/T = get_step(src, dir) if(T.Enter(mover)) return T @@ -23,7 +23,7 @@ return ..() /obj/structure/table/Uncross(atom/movable/mover, turf/target) - if(flipped && (get_dir(mover, target) == dir)) // From here to elsewhere, can't move in our dir + if(flipped == 1 && (get_dir(mover, target) == dir)) // From here to elsewhere, can't move in our dir return !density return TRUE diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm index f428033848..9a71cbdba7 100644 --- a/code/modules/tables/tables.dm +++ b/code/modules/tables/tables.dm @@ -331,6 +331,8 @@ var/list/table_icon_cache = list() return FALSE if(istype(src,/obj/structure/table/bench) && !istype(S,/obj/structure/table/bench)) return FALSE + if(istype(S,/obj/structure/table/rack) && !istype(src,/obj/structure/table/rack)) + return FALSE if(istype(src,/obj/structure/table/rack) && !istype(S,/obj/structure/table/rack)) return FALSE if(istype(S,/obj/structure/table)) diff --git a/code/modules/telesci/quantum_pad.dm b/code/modules/telesci/quantum_pad.dm index 6f1381a191..1ca5dfbf4e 100644 --- a/code/modules/telesci/quantum_pad.dm +++ b/code/modules/telesci/quantum_pad.dm @@ -13,6 +13,7 @@ var/last_teleport //to handle the cooldown var/teleporting = 0 //if it's in the process of teleporting var/power_efficiency = 1 + var/boosted = 0 // do we teleport mecha? var/obj/machinery/power/quantumpad/linked_pad //mapping @@ -32,6 +33,18 @@ mapped_quantum_pads -= map_pad_id return ..() +/obj/machinery/power/quantumpad/examine(mob/user) + . = ..() + . += "It is [linked_pad ? "currently" : "not"] linked to another pad." + if(world.time < last_teleport + teleport_cooldown) + . += "[src] is recharging power. A timer on the side reads [round((last_teleport + teleport_cooldown - world.time)/10)] seconds." + if(boosted) + . += SPAN_NOTICE("There appears to be a booster haphazardly jammed into the side of [src]. That looks unsafe.") + if(!panel_open) + . += "The panel is screwed in, obstructing the linking device." + else + . += "The linking device is now able to be scanned with a multitool." + /obj/machinery/power/quantumpad/RefreshParts() var/E = 0 for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) @@ -52,6 +65,11 @@ return if(istype(I, /obj/item/device/multitool)) + //VOREStation Addition Start + if(istype(get_area(src), /area/shuttle)) + to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + return + //VOREStation Addition End if(panel_open) var/obj/item/device/multitool/M = I M.connectable = src @@ -64,6 +82,14 @@ to_chat(user, "You link [src] to the one in [I]'s buffer.") update_icon() return 1 + + if(istype(I, /obj/item/device/quantum_pad_booster)) + var/obj/item/device/quantum_pad_booster/booster = I + visible_message("[user] violently jams [booster] into the side of [src]. [src] beeps, quietly.", \ + "You hear the sound of a device being improperly installed in sensitive machinery, then subsequent beeping.", runemessage = "beep!") + playsound(src, 'sound/items/rped.ogg', 25, 1) + boosted = TRUE + qdel(I) if(default_part_replacement(user, I)) return @@ -107,6 +133,10 @@ if(istype(get_area(src), /area/shuttle)) to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + //VOREStation Addition Start + if(linked_pad) + linked_pad.linked_pad = null + //VOREStation Addition End return if(!powernet) @@ -154,6 +184,11 @@ update_icon() if(!linked_pad) return + //VOREStation Addition Start + if(istype(get_area(src), /area/shuttle)) + to_chat(user, "This is too unstable a platform for \the [src] to operate on!") + return + //VOREStation Addition End playsound(src, 'sound/weapons/flash.ogg', 25, 1) teleporting = 1 @@ -213,6 +248,8 @@ // Otherwise we'll need a powernet var/power_to_use = 10000 / power_efficiency + if(boosted) + power_to_use *= 5 if(draw_power(power_to_use) != power_to_use) return FALSE return TRUE @@ -220,7 +257,10 @@ /obj/machinery/power/quantumpad/proc/transport_objects(turf/destination) for(var/atom/movable/ROI in get_turf(src)) // if is anchored, don't let through - if(ROI.anchored) + if(ROI.anchored && !ismecha(ROI)) + if(ismecha(ROI)) + if(boosted) + continue if(isliving(ROI)) var/mob/living/L = ROI if(L.buckled) @@ -229,7 +269,7 @@ continue else continue - else if(!isobserver(ROI)) + else if(!isobserver(ROI) && !isEye(ROI)) continue do_teleport(ROI, destination, local = FALSE) @@ -262,3 +302,13 @@ to_chat(user, "You feel yourself pulled in different directions, before ending up not far from where you started.") flick("qpad-beam-out", src) transport_objects(get_turf(dest)) + +/obj/item/device/quantum_pad_booster + icon = 'icons/obj/device_vr.dmi' + name = "quantum pad particle booster" + desc = "A deceptively simple interface for increasing the mass of objects a quantum pad is capable of teleporting, at the cost of increased power draw." + description_info = "The three prongs at the base of the tool are not, in fact, for show." + force = 9 + sharp = TRUE + item_state = "analyzer" + icon_state = "hacktool" \ No newline at end of file diff --git a/code/modules/vchat/css/ss13styles.css b/code/modules/vchat/css/ss13styles.css index fd2ca74569..79a1ddce59 100644 --- a/code/modules/vchat/css/ss13styles.css +++ b/code/modules/vchat/css/ss13styles.css @@ -176,6 +176,7 @@ h1.alert, h2.alert {color: #000000;} .interface {color: #330033;} .spacer {color: #9c660b;} /* VOREStation Add */ .blob {color: #ff950d; font-weight: bold; font-style: italic;} +.tavan {color: #f54298; font-family: Arial} .black {color: #000000;} .darkgray {color: #808080;} diff --git a/code/modules/vchat/vchat_client.dm b/code/modules/vchat/vchat_client.dm index b2cd9df758..a918c94cde 100644 --- a/code/modules/vchat/vchat_client.dm +++ b/code/modules/vchat/vchat_client.dm @@ -139,14 +139,15 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic set waitfor = FALSE // Only send them the number of buffered messages, instead of the ENTIRE log var/list/results = vchat_get_messages(owner.ckey, message_buffer) //If there's bad performance on reconnects, look no further - for(var/i in results.len to 1 step -1) - var/list/message = results[i] - var/count = 10 - to_chat_immediate(owner, message["time"], message["message"]) - count++ - if(count >= 10) - count = 0 - CHECK_TICK + if(islist(results)) + for(var/i in results.len to 1 step -1) + var/list/message = results[i] + var/count = 10 + to_chat_immediate(owner, message["time"], message["message"]) + count++ + if(count >= 10) + count = 0 + CHECK_TICK //It din work /datum/chatOutput/proc/become_broken() @@ -417,4 +418,4 @@ var/to_chat_src if(!fdel(o_file)) spawn(1 MINUTE) if(!fdel(o_file)) - log_debug("Warning: [ckey]'s chatlog could not be deleted one minute after file transfer was initiated. It is located at 'data/chatlog_tmp/[ckey]_chat_log' and will need to be manually removed.") \ No newline at end of file + log_debug("Warning: [ckey]'s chatlog could not be deleted one minute after file transfer was initiated. It is located at 'data/chatlog_tmp/[ckey]_chat_log' and will need to be manually removed.") diff --git a/code/modules/vore/eating/belly_obj_vr.dm b/code/modules/vore/eating/belly_obj_vr.dm index 5f5a06221a..10d1dd44f3 100644 --- a/code/modules/vore/eating/belly_obj_vr.dm +++ b/code/modules/vore/eating/belly_obj_vr.dm @@ -28,12 +28,15 @@ var/digestchance = 0 // % Chance of stomach beginning to digest if prey struggles var/absorbchance = 0 // % Chance of stomach beginning to absorb if prey struggles var/escapechance = 0 // % Chance of prey beginning to escape if prey struggles. - var/transferchance = 0 // % Chance of prey being + var/transferchance = 0 // % Chance of prey being trasnsfered, goes from 0-100% + var/transferchance_secondary = 0 // % Chance of prey being transfered to transferchance_secondary, also goes 0-100% var/can_taste = FALSE // If this belly prints the flavor of prey when it eats someone. var/bulge_size = 0.25 // The minimum size the prey has to be in order to show up on examine. var/display_absorbed_examine = FALSE // Do we display absorption examine messages for this belly at all? + var/absorbed_desc // Desc shown to absorbed prey. Defaults to regular if left empty. var/shrink_grow_size = 1 // This horribly named variable determines the minimum/maximum size it will shrink/grow prey to. var/transferlocation // Location that the prey is released if they struggle and get dropped off. + var/transferlocation_secondary // Secondary location that prey is released to. var/release_sound = "Splatter" // Sound for letting someone out. Replaced from True/false var/mode_flags = 0 // Stripping, numbing, etc. var/fancy_vore = FALSE // Using the new sounds? @@ -89,6 +92,16 @@ "You jostle %pred's %belly with movement.", "You squirm inside of %pred's %belly, making it wobble around.") + var/list/absorbed_struggle_messages_outside = list( + "%pred's %belly wobbles, seemingly on its own.", + "%pred's %belly jiggles without apparent cause.", + "%pred's %belly seems to shake for a second without an obvious reason.") + + var/list/absorbed_struggle_messages_inside = list( + "You try and resist %pred's %belly, but only cause it to jiggle slightly.", + "Your fruitless mental struggles only shift %pred's %belly a tiny bit.", + "You can't make any progress freeing yourself from %pred's %belly.") + var/list/digest_messages_owner = list( "You feel %prey's body succumb to your digestive system, which breaks it apart into soft slurry.", "You hear a lewd glorp as your %belly muscles grind %prey into a warm pulp.", @@ -113,6 +126,18 @@ "%pred's %belly kneads on every fiber of your body, softening you down into mush to fuel their next hunt.", "%pred's %belly churns you down into a hot slush. Your nutrient-rich remains course through their digestive track with a series of long, wet glorps.") + var/list/absorb_messages_owner = list( + "You feel %prey becoming part of you.") + + var/list/absorb_messages_prey = list( + "Your feel yourself becoming part of %pred's %belly!") + + var/list/unabsorb_messages_owner = list( + "You feel %prey reform into a recognizable state again.") + + var/list/unabsorb_messages_prey = list( + "You are released from being part of %pred's %belly.") + var/list/examine_messages = list( "They have something solid in their %belly!", "It looks like they have something in their %belly!") @@ -135,6 +160,7 @@ return ..() + list( "name", "desc", + "absorbed_desc", "vore_sound", "vore_verb", "human_prey_swallow_time", @@ -152,14 +178,22 @@ "absorbchance", "escapechance", "transferchance", + "transferchance_secondary", "transferlocation", + "transferlocation_secondary", "bulge_size", "display_absorbed_examine", "shrink_grow_size", "struggle_messages_outside", "struggle_messages_inside", + "absorbed_struggle_messages_outside", + "absorbed_struggle_messages_inside", "digest_messages_owner", "digest_messages_prey", + "absorb_messages_owner", + "absorb_messages_prey", + "unabsorb_messages_owner", + "unabsorb_messages_prey", "examine_messages", "examine_messages_absorbed", "emote_lists", @@ -216,8 +250,21 @@ if(isliving(thing)) var/mob/living/M = thing M.updateVRPanel() - if(desc) - to_chat(M, "[desc]") + var/raw_desc //Let's use this to avoid needing to write the reformat code twice + if(absorbed_desc && M.absorbed) + raw_desc = absorbed_desc + else if(desc) + raw_desc = desc + + //Was there a description text? If so, it's time to format it! + if(raw_desc) + //Replace placeholder vars + var/formatted_desc + formatted_desc = replacetext(raw_desc, "%belly", lowertext(name)) //replace with this belly's name + formatted_desc = replacetext(formatted_desc, "%pred", owner) //replace with this belly's owner + formatted_desc = replacetext(formatted_desc, "%prey", M) //replace with whatever mob entered into this belly + to_chat(M, "[formatted_desc]") + var/taste if(can_taste && (taste = M.get_taste_message(FALSE))) to_chat(owner, "[M] tastes of [taste].") @@ -307,6 +354,10 @@ if (!(M in contents)) return 0 // They weren't in this belly anyway + if(istype(M, /mob/living/simple_mob/vore/hostile/morph/dominated_prey)) + var/mob/living/simple_mob/vore/hostile/morph/dominated_prey/p = M + p.undo_prey_takeover(FALSE) + return 0 for(var/mob/living/L in M.contents) L.muffled = 0 for(var/obj/item/weapon/holder/H in M.contents) @@ -327,6 +378,7 @@ ML.muffled = 0 if(ML.absorbed) ML.absorbed = FALSE + handle_absorb_langs(ML, owner) if(ishuman(M) && ishuman(OW)) var/mob/living/carbon/human/Prey = M var/mob/living/carbon/human/Pred = OW @@ -429,7 +481,7 @@ // This is useful in customization boxes and such. The delimiter right now is \n\n so // in message boxes, this looks nice and is easily delimited. /obj/belly/proc/get_messages(type, delim = "\n\n") - ASSERT(type == "smo" || type == "smi" || type == "dmo" || type == "dmp" || type == "em" || type == "ema" || type == "im_digest" || type == "im_hold" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb") + ASSERT(type == "smo" || type == "smi" || type == "asmo" || type == "asmi" || type == "dmo" || type == "dmp" || type == "amo" || type == "amp" || type == "uamo" || type == "uamp" || type == "em" || type == "ema" || type == "im_digest" || type == "im_hold" || type == "im_holdabsorbed" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb") var/list/raw_messages switch(type) @@ -437,6 +489,10 @@ raw_messages = struggle_messages_outside if("smi") raw_messages = struggle_messages_inside + if("asmo") + raw_messages = absorbed_struggle_messages_outside + if("asmi") + raw_messages = absorbed_struggle_messages_inside if("dmo") raw_messages = digest_messages_owner if("dmp") @@ -445,10 +501,20 @@ raw_messages = examine_messages if("ema") raw_messages = examine_messages_absorbed + if("amo") + raw_messages = absorb_messages_owner + if("amp") + raw_messages = absorb_messages_prey + if("uamo") + raw_messages = unabsorb_messages_owner + if("uamp") + raw_messages = unabsorb_messages_prey if("im_digest") raw_messages = emote_lists[DM_DIGEST] if("im_hold") raw_messages = emote_lists[DM_HOLD] + if("im_holdabsorbed") + raw_messages = emote_lists[DM_HOLD_ABSORBED] if("im_absorb") raw_messages = emote_lists[DM_ABSORB] if("im_heal") @@ -474,7 +540,7 @@ // replacement strings and linebreaks as delimiters (two \n\n by default). // They also sanitize the messages. /obj/belly/proc/set_messages(raw_text, type, delim = "\n\n") - ASSERT(type == "smo" || type == "smi" || type == "dmo" || type == "dmp" || type == "em" || type == "ema" || type == "im_digest" || type == "im_hold" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb") + ASSERT(type == "smo" || type == "smi" || type == "asmo" || type == "asmi" || type == "dmo" || type == "dmp" || type == "amo" || type == "amp" || type == "uamo" || type == "uamp" || type == "em" || type == "ema" || type == "im_digest" || type == "im_hold" || type == "im_holdabsorbed" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb") var/list/raw_list = splittext(html_encode(raw_text),delim) if(raw_list.len > 10) @@ -482,10 +548,10 @@ log_debug("[owner] tried to set [lowertext(name)] with 11+ messages") for(var/i = 1, i <= raw_list.len, i++) - if((length(raw_list[i]) > 160 || length(raw_list[i]) < 10) && !(type == "im_digest" || type == "im_hold" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb")) //160 is fudged value due to htmlencoding increasing the size + if((length(raw_list[i]) > 160 || length(raw_list[i]) < 10) && !(type == "im_digest" || type == "im_hold" || type == "im_holdabsorbed" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb")) //160 is fudged value due to htmlencoding increasing the size raw_list.Cut(i,i) log_debug("[owner] tried to set [lowertext(name)] with >121 or <10 char message") - else if((type == "im_digest" || type == "im_hold" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb") && (length(raw_list[i]) > 510 || length(raw_list[i]) < 10)) + else if((type == "im_digest" || type == "im_hold" || type == "im_holdabsorbed" || type == "im_absorb" || type == "im_heal" || type == "im_drain" || type == "im_steal" || type == "im_egg" || type == "im_shrink" || type == "im_grow" || type == "im_unabsorb") && (length(raw_list[i]) > 510 || length(raw_list[i]) < 10)) raw_list.Cut(i,i) log_debug("[owner] tried to set [lowertext(name)] idle message with >501 or <10 char message") else @@ -500,10 +566,22 @@ struggle_messages_outside = raw_list if("smi") struggle_messages_inside = raw_list + if("asmo") + absorbed_struggle_messages_outside = raw_list + if("asmi") + absorbed_struggle_messages_inside = raw_list if("dmo") digest_messages_owner = raw_list if("dmp") digest_messages_prey = raw_list + if("amo") + absorb_messages_owner = raw_list + if("amp") + absorb_messages_prey = raw_list + if("uamo") + unabsorb_messages_owner = raw_list + if("uamp") + unabsorb_messages_prey = raw_list if("em") examine_messages = raw_list if("ema") @@ -512,6 +590,8 @@ emote_lists[DM_DIGEST] = raw_list if("im_hold") emote_lists[DM_HOLD] = raw_list + if("im_holdabsorbed") + emote_lists[DM_HOLD_ABSORBED] = raw_list if("im_absorb") emote_lists[DM_ABSORB] = raw_list if("im_heal") @@ -581,9 +661,33 @@ // Handle a mob being absorbed /obj/belly/proc/absorb_living(mob/living/M) - M.absorbed = 1 - to_chat(M, "[owner]'s [lowertext(name)] absorbs your body, making you part of them.") - to_chat(owner, "Your [lowertext(name)] absorbs [M]'s body, making them part of you.") + var/absorb_alert_owner = pick(absorb_messages_owner) + var/absorb_alert_prey = pick(absorb_messages_prey) + + var/absorbed_count = 0 + for(var/mob/living/L in contents) + if(L.absorbed) + absorbed_count++ + + //Replace placeholder vars + absorb_alert_owner = replacetext(absorb_alert_owner, "%pred", owner) + absorb_alert_owner = replacetext(absorb_alert_owner, "%prey", M) + absorb_alert_owner = replacetext(absorb_alert_owner, "%belly", lowertext(name)) + absorb_alert_owner = replacetext(absorb_alert_owner, "%countprey", absorbed_count) + + absorb_alert_prey = replacetext(absorb_alert_prey, "%pred", owner) + absorb_alert_prey = replacetext(absorb_alert_prey, "%prey", M) + absorb_alert_prey = replacetext(absorb_alert_prey, "%belly", lowertext(name)) + absorb_alert_prey = replacetext(absorb_alert_prey, "%countprey", absorbed_count) + + M.absorbed = TRUE + if(M.ckey) + owner.temp_language_sources += M + M.temp_language_sources += owner + handle_absorb_langs(M, owner) + + to_chat(M, "[absorb_alert_prey]") + to_chat(owner, "[absorb_alert_owner]") if(M.noisy) //Mute drained absorbee hunger if enabled. M.noisy = FALSE @@ -611,11 +715,87 @@ if(Mm.absorbed) absorb_living(Mm) + + if(absorbed_desc) + //Replace placeholder vars + var/formatted_abs_desc + formatted_abs_desc = replacetext(absorbed_desc, "%belly", lowertext(name)) //replace with this belly's name + formatted_abs_desc = replacetext(formatted_abs_desc, "%pred", owner) //replace with this belly's owner + formatted_abs_desc = replacetext(formatted_abs_desc, "%prey", M) //replace with whatever mob entered into this belly + to_chat(M, "[formatted_abs_desc]") + //Update owner owner.updateVRPanel() if(isanimal(owner)) owner.update_icon() +// Handle a mob being unabsorbed +/obj/belly/proc/unabsorb_living(mob/living/M) + var/unabsorb_alert_owner = pick(unabsorb_messages_owner) + var/unabsorb_alert_prey = pick(unabsorb_messages_prey) + + var/absorbed_count = 0 + for(var/mob/living/L in contents) + if(L.absorbed) + absorbed_count++ + + //Replace placeholder vars + unabsorb_alert_owner = replacetext(unabsorb_alert_owner, "%pred", owner) + unabsorb_alert_owner = replacetext(unabsorb_alert_owner, "%prey", M) + unabsorb_alert_owner = replacetext(unabsorb_alert_owner, "%belly", lowertext(name)) + unabsorb_alert_owner = replacetext(unabsorb_alert_owner, "%countprey", absorbed_count) + + unabsorb_alert_prey = replacetext(unabsorb_alert_prey, "%pred", owner) + unabsorb_alert_prey = replacetext(unabsorb_alert_prey, "%prey", M) + unabsorb_alert_prey = replacetext(unabsorb_alert_prey, "%belly", lowertext(name)) + unabsorb_alert_prey = replacetext(unabsorb_alert_prey, "%countprey", absorbed_count) + + M.absorbed = FALSE + handle_absorb_langs(M, owner) + to_chat(M, "[unabsorb_alert_prey]") + to_chat(owner, "[unabsorb_alert_owner]") + + if(desc) + to_chat(M, "[desc]") + + //Update owner + owner.updateVRPanel() + if(isanimal(owner)) + owner.update_icon() + +///////////////////////////////////////////////////////////////////////// +/obj/belly/proc/handle_absorb_langs(var/mob/living/prey, var/mob/living/pred) + for(var/mob/living/p in pred.temp_language_sources) //Let's look at the pred's sources + if (!p.absorbed) + for(var/L in pred.temp_languages) + if(L in p.languages) + pred.languages -= L + pred.temp_languages -= L + pred.temp_language_sources -= p + else + for(var/L in p.languages) + if(L in pred.languages) + continue + pred.languages += L + pred.temp_languages += L + + for(var/mob/living/P in prey.temp_language_sources) //Let's look at the prey's sources + if (!prey.absorbed) + for(var/L in prey.temp_languages) + if(L in P.languages) + prey.languages -= L + prey.temp_languages -= L + prey.temp_language_sources -= P + else + for(var/L in P.languages) + if(L in prey.languages) + continue + prey.languages += L + prey.temp_languages += L + +//////////////////////////////////////////////////////////////////////// + + //Digest a single item //Receives a return value from digest_act that's how much nutrition //the item should be worth @@ -727,7 +907,7 @@ for(var/mob/M in hearers(4, owner)) M.show_message("[C] suddenly slips out of [owner]'s [lowertext(name)]!", 2) return - if((escapable) && (R.loc == src) && !R.absorbed) //Does the owner still have escapable enabled? + if(escapable && (R.loc == src) && !R.absorbed) //Does the owner still have escapable enabled? release_specific_contents(R) to_chat(R,"You climb out of \the [lowertext(name)].") to_chat(owner,"[R] climbs out of your [lowertext(name)]!") @@ -762,6 +942,27 @@ transfer_contents(R, dest_belly) return + else if(prob(transferchance_secondary) && transferlocation_secondary) //After the first potential mess getting into, run the secondary one which might be even bigger of a mess. + var/obj/belly/dest_belly + for(var/obj/belly/B as anything in owner.vore_organs) + if(B.name == transferlocation_secondary) + dest_belly = B + break + + if(!dest_belly) + to_chat(owner, "Something went wrong with your belly transfer settings. Your [lowertext(name)] has had it's transfer chance and transfer location cleared as a precaution.") + transferchance_secondary = 0 + transferlocation_secondary = null + return + + to_chat(R, "Your attempt to escape [lowertext(name)] has failed and your struggles only results in you sliding into [owner]'s [transferlocation_secondary]!") + to_chat(owner, "Someone slid into your [transferlocation_secondary] due to their struggling inside your [lowertext(name)]!") + if(C) + transfer_contents(C, dest_belly) + return + transfer_contents(R, dest_belly) + return + else if(prob(absorbchance) && digest_mode != DM_ABSORB) //After that, let's have it run the absorb chance. to_chat(R, "In response to your struggling, \the [lowertext(name)] begins to cling more tightly...") to_chat(owner, "You feel your [lowertext(name)] start to cling onto its contents...") @@ -779,6 +980,50 @@ to_chat(owner, "Your prey appears to be unable to make any progress in escaping your [lowertext(name)].") return + +/obj/belly/proc/relay_absorbed_resist(mob/living/R) + if (!(R in contents) || !R.absorbed) + return // User is not in this belly or isn't actually absorbed + + R.setClickCooldown(50) + + var/struggle_outer_message = pick(absorbed_struggle_messages_outside) + var/struggle_user_message = pick(absorbed_struggle_messages_inside) + + var/absorbed_count = 0 + for(var/mob/living/L in contents) + if(L.absorbed) + absorbed_count++ + + struggle_outer_message = replacetext(struggle_outer_message, "%pred", owner) + struggle_outer_message = replacetext(struggle_outer_message, "%prey", R) + struggle_outer_message = replacetext(struggle_outer_message, "%belly", lowertext(name)) + struggle_outer_message = replacetext(struggle_outer_message, "%countprey", absorbed_count) + + struggle_user_message = replacetext(struggle_user_message, "%pred", owner) + struggle_user_message = replacetext(struggle_user_message, "%prey", R) + struggle_user_message = replacetext(struggle_user_message, "%belly", lowertext(name)) + struggle_user_message = replacetext(struggle_user_message, "%countprey", absorbed_count) + + struggle_outer_message = "[struggle_outer_message]" + struggle_user_message = "[struggle_user_message]" + + for(var/mob/M in hearers(4, owner)) + M.show_message(struggle_outer_message, 2) // hearable + to_chat(R, struggle_user_message) + + var/sound/struggle_snuggle + var/sound/struggle_rustle = sound(get_sfx("rustle")) + + if(is_wet) + if(!fancy_vore) + struggle_snuggle = sound(get_sfx("classic_struggle_sounds")) + else + struggle_snuggle = sound(get_sfx("fancy_prey_struggle")) + playsound(src, struggle_snuggle, vary = 1, vol = 75, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/digestion_noises, volume_channel = VOLUME_CHANNEL_VORE) + else + playsound(src, struggle_rustle, vary = 1, vol = 75, falloff = VORE_SOUND_FALLOFF, preference = /datum/client_preference/digestion_noises, volume_channel = VOLUME_CHANNEL_VORE) + /obj/belly/proc/get_mobs_and_objs_in_belly() var/list/see = list() var/list/belly_mobs = list() @@ -835,6 +1080,7 @@ //// Non-object variables dupe.name = name dupe.desc = desc + dupe.absorbed_desc = absorbed_desc dupe.vore_sound = vore_sound dupe.vore_verb = vore_verb dupe.human_prey_swallow_time = human_prey_swallow_time @@ -852,7 +1098,9 @@ dupe.absorbchance = absorbchance dupe.escapechance = escapechance dupe.transferchance = transferchance + dupe.transferchance_secondary = transferchance_secondary dupe.transferlocation = transferlocation + dupe.transferlocation_secondary = transferlocation_secondary dupe.bulge_size = bulge_size dupe.shrink_grow_size = shrink_grow_size dupe.mode_flags = mode_flags @@ -881,6 +1129,16 @@ for(var/I in struggle_messages_inside) dupe.struggle_messages_inside += I + //absorbed_struggle_messages_outside - strings + dupe.absorbed_struggle_messages_outside.Cut() + for(var/I in absorbed_struggle_messages_outside) + dupe.absorbed_struggle_messages_outside += I + + //absorbed_struggle_messages_inside - strings + dupe.absorbed_struggle_messages_inside.Cut() + for(var/I in absorbed_struggle_messages_inside) + dupe.absorbed_struggle_messages_inside += I + //digest_messages_owner - strings dupe.digest_messages_owner.Cut() for(var/I in digest_messages_owner) @@ -891,12 +1149,32 @@ for(var/I in digest_messages_prey) dupe.digest_messages_prey += I + //absorb_messages_owner - strings + dupe.absorb_messages_owner.Cut() + for(var/I in absorb_messages_owner) + dupe.absorb_messages_owner += I + + //absorb_messages_prey - strings + dupe.absorb_messages_prey.Cut() + for(var/I in absorb_messages_prey) + dupe.absorb_messages_prey += I + + //unabsorb_messages_owner - strings + dupe.unabsorb_messages_owner.Cut() + for(var/I in unabsorb_messages_owner) + dupe.unabsorb_messages_owner += I + + //unabsorb_messages_prey - strings + dupe.unabsorb_messages_prey.Cut() + for(var/I in unabsorb_messages_prey) + dupe.unabsorb_messages_prey += I + //examine_messages - strings dupe.examine_messages.Cut() for(var/I in examine_messages) dupe.examine_messages += I - //examine_messages - strings + //examine_messages_absorbed - strings dupe.examine_messages_absorbed.Cut() for(var/I in examine_messages_absorbed) dupe.examine_messages_absorbed += I diff --git a/code/modules/vore/eating/bellymodes_datum_vr.dm b/code/modules/vore/eating/bellymodes_datum_vr.dm index 8f8dd46aeb..1833b17cfc 100644 --- a/code/modules/vore/eating/bellymodes_datum_vr.dm +++ b/code/modules/vore/eating/bellymodes_datum_vr.dm @@ -80,10 +80,8 @@ GLOBAL_LIST_INIT(digest_modes, list()) /datum/digest_mode/unabsorb/process_mob(obj/belly/B, mob/living/L) if(L.absorbed && B.owner.nutrition >= 100) - L.absorbed = FALSE - to_chat(L, "You suddenly feel solid again.") - to_chat(B.owner,"You feel like a part of you is missing.") B.owner.adjust_nutrition(-100) + B.unabsorb_living(L) return list("to_update" = TRUE) /datum/digest_mode/drain diff --git a/code/modules/vore/eating/bellymodes_vr.dm b/code/modules/vore/eating/bellymodes_vr.dm index 7338db7830..e4e358d3c4 100644 --- a/code/modules/vore/eating/bellymodes_vr.dm +++ b/code/modules/vore/eating/bellymodes_vr.dm @@ -106,24 +106,38 @@ if(emote_active) var/list/EL = emote_lists[digest_mode] - if(LAZYLEN(EL) && next_emote <= world.time) + if((LAZYLEN(EL) || LAZYLEN(emote_lists[DM_HOLD_ABSORBED]) || (digest_mode == DM_DIGEST && LAZYLEN(emote_lists[DM_HOLD]))) && next_emote <= world.time) var/living_count = 0 + var/absorbed_count = 0 for(var/mob/living/L in contents) living_count++ + if(L.absorbed) + absorbed_count++ next_emote = world.time + (emote_time SECONDS) for(var/mob/living/M in contents) - if(digest_mode == DM_DIGEST && !M.digestable) - continue // don't give digesty messages to indigestible people + if(M.absorbed) + EL = emote_lists[DM_HOLD_ABSORBED] + + var/raw_message = pick(EL) + var/formatted_message + formatted_message = replacetext(raw_message, "%belly", lowertext(name)) + formatted_message = replacetext(formatted_message, "%pred", owner) + formatted_message = replacetext(formatted_message, "%prey", M) + formatted_message = replacetext(formatted_message, "%countprey", absorbed_count) + to_chat(M, "[formatted_message]") + else + if(digest_mode == DM_DIGEST && !M.digestable) + EL = emote_lists[DM_HOLD] // Use Hold's emote list if we're indigestible + + var/raw_message = pick(EL) + var/formatted_message + formatted_message = replacetext(raw_message, "%belly", lowertext(name)) + formatted_message = replacetext(formatted_message, "%pred", owner) + formatted_message = replacetext(formatted_message, "%prey", M) + formatted_message = replacetext(formatted_message, "%countprey", living_count) + formatted_message = replacetext(formatted_message, "%count", contents.len) + to_chat(M, "[formatted_message]") - var/raw_message = pick(EL) - var/formatted_message - formatted_message = replacetext(raw_message, "%belly", lowertext(name)) - formatted_message = replacetext(formatted_message, "%pred", owner) - formatted_message = replacetext(formatted_message, "%prey", english_list(contents)) - formatted_message = replacetext(formatted_message, "%countprey", living_count) - formatted_message = replacetext(formatted_message, "%count", contents.len) - to_chat(M, "[formatted_message]") - if(to_update) updateVRPanels() diff --git a/code/modules/vore/eating/digest_act_vr.dm b/code/modules/vore/eating/digest_act_vr.dm index 7609400366..741d7e0941 100644 --- a/code/modules/vore/eating/digest_act_vr.dm +++ b/code/modules/vore/eating/digest_act_vr.dm @@ -49,7 +49,15 @@ qdel(O) else if(item_storage) O.forceMove(item_storage) - qdel(src) + if(istype(src,/obj/item/stack)) + var/obj/item/stack/S = src + if(S.get_amount() <= 1) + qdel(src) + else + S.use(1) + digest_stage = w_class + else + qdel(src) if(g_damage > w_class) return w_class return g_damage @@ -131,6 +139,10 @@ //Replace this with a VORE setting so all types of posibrains can/can't be digested on a whim return FALSE +/obj/item/organ/internal/nano/digest_act(atom/movable/item_storage = null) + //Make proteans recoverable too + return FALSE + // Gradual damage measurement /obj/item var/digest_stage = null diff --git a/code/modules/vore/eating/inbelly_spawn.dm b/code/modules/vore/eating/inbelly_spawn.dm new file mode 100644 index 0000000000..39c09554e0 --- /dev/null +++ b/code/modules/vore/eating/inbelly_spawn.dm @@ -0,0 +1,177 @@ +/mob/observer/dead/verb/spawn_in_belly() + set category = "Ghost" + set name = "Spawn In Belly" + set desc = "Spawn in someone's belly." + + if(!client) + return + + // If any ghost-side restrictions are desired, they'll go here + + tgui_alert(src,{" +This verb allows you to spawn inside someone's belly when they are in round. +Make sure you to coordinate with your predator OOCly as well as roleplay approprietly. +You are considered to have been in the belly entire time the predator was around and are not added to crew lists. +This is not intended to be used for mechanical advantage or providing assistance, but for facilitating longterm scenes. +Please do not abuse this ability. +"},"OOC Warning") // Warning. + + var/list/eligible_targets = list() + + for(var/mob/living/pred in living_mob_list) + if(!istype(pred) || !pred.client) // Ignore preds that aren't living mobs or player controlled + continue + if(pred.no_vore) // No vore, no bellies, no inbelly spawning + continue + if(!(get_z(pred) in using_map.station_levels)) // No explo reinforcements + continue + if(ishuman(pred)) + var/mob/living/carbon/human/H = pred + if(!H.allow_inbelly_spawning) + continue + eligible_targets += H + continue + if(issilicon(pred)) + var/mob/living/silicon/S = pred + if(isAI(S)) + continue // Sorry, AI buddies. Your vore works too differently. + if(!S.allow_inbelly_spawning) + continue + eligible_targets += S + continue + if(istype(pred, /mob/living/simple_mob)) + var/mob/living/simple_mob/SM = pred + if(!SM.vore_active) // No vore, no bellies, no inbelly spawning + continue + if(!SM.allow_inbelly_spawning) + continue + eligible_targets += SM + continue + + // Only humans, simple_mobs and non-AI silicons are included. Obscure stuff like bots is skipped. + + if(!eligible_targets.len) + to_chat(src, "No eligible preds were found.") // :( + return + + var/mob/living/target = tgui_input_list(src, "Please specify which character you want to spawn inside of.", "Predator", eligible_targets) // Offer the list of things we gathered. + + if(!target || !client) // Did out target cease to exist? Or did we? + return + + // Notify them that its now pred's turn + to_chat(src, "Inbelly spawn request sent to predator.") + target.inbelly_spawn_prompt(client) // Hand reins over to them + +/mob/living/proc/inbelly_spawn_prompt(client/potential_prey) + if(!potential_prey || !istype(potential_prey)) // Did our prey cease to exist? + return + + // Are we cool with this prey spawning in at all? + var/answer = tgui_alert(src, "[potential_prey.ckey] (as [potential_prey.prefs.real_name]) wants to spawn in one of your bellies. Do you accept?", "Inbelly Spawning", list("Yes", "No")) + if(answer != "Yes") + to_chat(potential_prey, "Your request was turned down.") + return + + // Let them know so that they don't spam it. + to_chat(potential_prey, "Predator agreed to your request. Wait a bit while they choose a belly.") + + // Where we dropping? + var/obj/belly/belly_choice = tgui_input_list(src, "Choose Target Belly", "Belly Choice", src.vore_organs) + + // Wdym nowhere? + if(!belly_choice || !istype(belly_choice)) + to_chat(potential_prey, "Something went wrong with predator selecting a belly. Try again?") + to_chat(src, "No valid belly selected. Inbelly spawn cancelled.") + return + + // Extra caution never hurts + if(belly_choice.digest_mode == DM_DIGEST) + var/digest_answer = tgui_alert(src, "[belly_choice] is currently set to Digest. Are you sure you want to spawn prey there?", "Inbelly Spawning", list("Yes", "No")) + if(digest_answer != "Yes") + to_chat(potential_prey, "Something went wrong with predator selecting a belly. Try again?") + to_chat(src, "Inbelly spawn cancelled.") + + // Are they already fat (and/or appropriate equivalent)? + var/absorbed = FALSE + var/absorbed_answer = tgui_alert(src, "Do you want them to start absorbed?", "Inbelly Spawning", list("Yes", "No")) + + if(absorbed_answer == "Yes") + absorbed = TRUE + + // They disappeared? + if(!potential_prey) + to_chat(src, "No prey found. Something went wrong!") + return + + // Final confirmation for pred + var/confirmation_pred = tgui_alert(src, "Are you certain that you want [potential_prey.prefs.real_name] spawned in your [belly_choice][absorbed ? ", absorbed" : ""]?", "Inbelly Spawning", list("Yes", "No")) + + if(confirmation_pred != "Yes") + to_chat(potential_prey, "Your pred couldn't finish selection. Try again?") + to_chat(src, "Inbelly spawn cancelled.") + return + + to_chat(src, "Waiting for prey's confirmation...") + + // And final confirmation for prey + var/confirmation_prey = tgui_alert(potential_prey, "Are you certain that you to spawn in [src]'s [belly_choice][absorbed ? ", absorbed" : ""]?", "Inbelly Spawning", list("Yes", "No")) + + if(confirmation_prey == "Yes" && potential_prey && src && belly_choice) + //Now we finally spawn them in! + if(!is_alien_whitelisted(potential_prey, GLOB.all_species[potential_prey.prefs.species])) + to_chat(potential_prey, "You are not whitelisted to play as currently selected character.") + to_chat(src, "Prey accepted the confirmation, but something went wrong with spawning their character.") + return + inbelly_spawn(potential_prey, src, belly_choice, absorbed) + else + to_chat(potential_prey, "Inbelly spawn cancelled.") + to_chat(src, "Prey cancelled their inbelly spawn request.") + return + +/proc/inbelly_spawn(client/prey, mob/living/pred, obj/belly/target_belly, var/absorbed = FALSE) + // All this is basically admin late spawn-in, but skipping all parts related to records and equipment and with predteremined location + var/player_key = prey.key + var/picked_ckey = prey.ckey + var/picked_slot = prey.prefs.default_slot + var/mob/living/carbon/human/new_character + + new_character = new(null) // Spawn them in nullspace first. Can't have "Defaultname Defaultnameson slides into your Stomach". + + if(!new_character) + return + + prey.prefs.copy_to(new_character) + if(new_character.dna) + new_character.dna.ResetUIFrom(new_character) + new_character.sync_organ_dna() + new_character.key = player_key + if(new_character.mind) + var/datum/antagonist/antag_data = get_antag_data(new_character.mind.special_role) + if(antag_data) + antag_data.add_antagonist(new_character.mind) + antag_data.place_mob(new_character) + + if(new_character.mind) + new_character.mind.loaded_from_ckey = picked_ckey + new_character.mind.loaded_from_slot = picked_slot + + for(var/lang in prey.prefs.alternate_languages) + var/datum/language/chosen_language = GLOB.all_languages[lang] + if(chosen_language) + if(is_lang_whitelisted(prey,chosen_language) || (new_character.species && (chosen_language.name in new_character.species.secondary_langs))) + new_character.add_language(lang) + + new_character.regenerate_icons() + + new_character.update_transform() + + new_character.forceMove(target_belly) // Now that they're all setup and configured, send them to their destination. + + if(absorbed) + target_belly.absorb_living(new_character) // Glorp. + + log_admin("[prey] (as [new_character.real_name] has spawned inside one of [pred]'s bellies.") // Log it. Avoid abuse. + message_admins("[prey] (as [new_character.real_name] has spawned inside one of [pred]'s bellies.", 1) + + return new_character // incase its ever needed \ No newline at end of file diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 23dd3eea55..7a9cab7a2b 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -7,10 +7,13 @@ var/resizable = TRUE // Can other people resize you? (Usually ignored for self-resizes) var/digest_leave_remains = FALSE // Will this mob leave bones/skull/etc after the melty demise? var/allowmobvore = TRUE // Will simplemobs attempt to eat the mob? + var/allow_inbelly_spawning = FALSE // Will we even bother with attempts of someone to spawn in in one of our bellies? var/showvoreprefs = TRUE // Determines if the mechanical vore preferences button will be displayed on the mob or not. var/obj/belly/vore_selected // Default to no vore capability. var/list/vore_organs = list() // List of vore containers inside a mob var/absorbed = FALSE // If a mob is absorbed into another + var/list/temp_language_sources = list() //VOREStation Addition - Absorbs add languages to the pred + var/list/temp_languages = list() //VOREStation Addition - Absorbs add languages to the pred var/weight = 137 // Weight for mobs for weightgain system var/weight_gain = 1 // How fast you gain weight var/weight_loss = 0.5 // How fast you lose weight @@ -143,9 +146,7 @@ if(is_vore_predator(src)) for(var/mob/living/M in H.contents) if(attacker.eat_held_mob(attacker, M, src)) - if(H.held_mob == M) - H.held_mob = null - return TRUE //return TRUE to exit upper procs + return TRUE //return TRUE to exit upper procs else log_debug("[attacker] attempted to feed [H.contents] to [src] ([type]) but it failed.") @@ -224,6 +225,7 @@ P.show_vore_fx = src.show_vore_fx P.can_be_drop_prey = src.can_be_drop_prey P.can_be_drop_pred = src.can_be_drop_pred + P.allow_inbelly_spawning = src.allow_inbelly_spawning P.allow_spontaneous_tf = src.allow_spontaneous_tf P.step_mechanics_pref = src.step_mechanics_pref P.pickup_pref = src.pickup_pref @@ -259,6 +261,7 @@ show_vore_fx = P.show_vore_fx can_be_drop_prey = P.can_be_drop_prey can_be_drop_pred = P.can_be_drop_pred + allow_inbelly_spawning = P.allow_inbelly_spawning allow_spontaneous_tf = P.allow_spontaneous_tf step_mechanics_pref = P.step_mechanics_pref pickup_pref = P.pickup_pref @@ -402,6 +405,11 @@ //You're in a belly! if(isbelly(loc)) + //You've been taken over by a morph + if(istype(src, /mob/living/simple_mob/vore/hostile/morph/dominated_prey)) + var/mob/living/simple_mob/vore/hostile/morph/dominated_prey/s = src + s.undo_prey_takeover(TRUE) + return var/obj/belly/B = loc var/confirm = tgui_alert(src, "You're in a mob. Don't use this as a trick to get out of hostile animals. This is for escaping from preference-breaking and if you're otherwise unable to escape from endo (pred AFK for a long time).", "Confirmation", list("Okay", "Cancel")) if(confirm != "Okay" || loc != B) @@ -435,6 +443,13 @@ holo.drop_prey() //Easiest way log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [key_name(holo.master)] (AI HOLO) ([holo ? "JMP" : "null"])") + //You're in a capture crystal! ((It's not vore but close enough!)) + else if(iscapturecrystal(loc)) + var/obj/item/capture_crystal/crystal = loc + crystal.unleash() + crystal.bound_mob = null + crystal.bound_mob = capture_crystal = 0 + log_and_message_admins("[key_name(src)] used the OOC escape button to get out of [crystal] owned by [crystal.owner]. [ADMIN_FLW(src)]") //Don't appear to be in a vore situation else to_chat(src,"You aren't inside anyone, though, is the thing.") @@ -518,7 +533,16 @@ user.visible_message(success_msg) // Actually shove prey into the belly. - belly.nom_mob(prey, user) + if(istype(prey.loc, /obj/item/weapon/holder)) + var/obj/item/weapon/holder/H = prey.loc + for(var/mob/living/M in H.contents) + belly.nom_mob(M, user) + if(M.loc == H) // In case nom_mob failed somehow. + M.forceMove(get_turf(src)) + H.held_mob = null + qdel(H) + else + belly.nom_mob(prey, user) if(!ishuman(user)) user.update_icons() @@ -536,11 +560,23 @@ /obj/belly/return_air() return return_air_for_internal_lifeform() -/obj/belly/return_air_for_internal_lifeform() +/obj/belly/return_air_for_internal_lifeform(var/mob/living/lifeform) //Free air until someone wants to code processing it for reals from predbreaths - var/datum/gas_mixture/belly_air/air = new(1000) + var/air_type = /datum/gas_mixture/belly_air + if(istype(lifeform)) // If this doesn't succeed, then 'lifeform' is actually a bag or capture crystal with someone inside + air_type = lifeform.get_perfect_belly_air_type() // Without any overrides/changes, its gonna be /datum/gas_mixture/belly_air + + var/air = new air_type(1000) return air +/mob/living/proc/get_perfect_belly_air_type() + return /datum/gas_mixture/belly_air + +/mob/living/carbon/human/get_perfect_belly_air_type() + if(species) + return species.get_perfect_belly_air_type() + return ..() + // This is about 0.896m^3 of atmosphere /datum/gas_mixture/belly_air volume = 2500 @@ -553,6 +589,27 @@ "oxygen" = 21, "nitrogen" = 79) +/datum/gas_mixture/belly_air/vox + volume = 2500 + temperature = 293.150 + total_moles = 104 + +/datum/gas_mixture/belly_air/vox/New() + . = ..() + gas = list( + "phoron" = 100) + +/datum/gas_mixture/belly_air/zaddat + volume = 2500 + temperature = 293.150 + total_moles = 300 + +/datum/gas_mixture/belly_air/zaddat/New() + . = ..() + gas = list( + "oxygen" = 100) + + /mob/living/proc/feed_grabbed_to_self_falling_nom(var/mob/living/user, var/mob/living/prey) var/belly = user.vore_selected return perform_the_nom(user, prey, user, belly, delay = 1) //1/10th of a second is probably fine. @@ -631,7 +688,11 @@ if(S.holding) to_chat(src, "There's something inside!") return - + if(iscapturecrystal(I)) + var/obj/item/capture_crystal/C = I + if(!C.bound_mob.devourable) + to_chat(src, "That doesn't seem like a good idea. (\The [C.bound_mob]'s prefs don't allow it.)") + return drop_item() I.forceMove(vore_selected) updateVRPanel() @@ -685,6 +746,13 @@ else if (istype(I,/obj/item/clothing/accessory/collar)) visible_message("[src] demonstrates their voracious capabilities by swallowing [I] whole!") to_chat(src, "You can taste the submissiveness in the wearer of [I]!") + else if(iscapturecrystal(I)) + var/obj/item/capture_crystal/C = I + if(C.bound_mob && (C.bound_mob in C.contents)) + if(isbelly(C.loc)) + var/obj/belly/B = C.loc + to_chat(C.bound_mob, "Outside of your crystal, you can see; [B.desc]") + to_chat(src, "You can taste the the power of command.") else to_chat(src, "You can taste the flavor of garbage. Delicious.") return @@ -853,6 +921,7 @@ dispvoreprefs += "Healbelly permission: [permit_healbelly ? "Allowed" : "Disallowed"]
" dispvoreprefs += "Spontaneous vore prey: [can_be_drop_prey ? "Enabled" : "Disabled"]
" dispvoreprefs += "Spontaneous vore pred: [can_be_drop_pred ? "Enabled" : "Disabled"]
" + dispvoreprefs += "Inbelly Spawning: [allow_inbelly_spawning ? "Allowed" : "Disallowed"]
" dispvoreprefs += "Spontaneous transformation: [allow_spontaneous_tf ? "Enabled" : "Disabled"]
" dispvoreprefs += "Can be stepped on/over: [step_mechanics_pref ? "Allowed" : "Disallowed"]
" dispvoreprefs += "Can be picked up: [pickup_pref ? "Allowed" : "Disallowed"]
" @@ -875,6 +944,7 @@ var/obj/belly/B = belly to_chat(src, "Belly name: [B.name]") to_chat(src, "Belly desc: [B.desc]") + to_chat(src, "Belly absorbed desc: [B.absorbed_desc]") to_chat(src, "Vore verb: [B.vore_verb]") to_chat(src, "Struggle messages (outside):") for(var/msg in B.struggle_messages_outside) @@ -882,12 +952,30 @@ to_chat(src, "Struggle messages (inside):") for(var/msg in B.struggle_messages_inside) to_chat(src, "[msg]") + to_chat(src, "Absorbed struggle messages (outside):") + for(var/msg in B.absorbed_struggle_messages_outside) + to_chat(src, "[msg]") + to_chat(src, "Absorbed struggle messages (inside):") + for(var/msg in B.absorbed_struggle_messages_inside) + to_chat(src, "[msg]") to_chat(src, "Digest messages (owner):") for(var/msg in B.digest_messages_owner) to_chat(src, "[msg]") to_chat(src, "Digest messages (prey):") for(var/msg in B.digest_messages_prey) to_chat(src, "[msg]") + to_chat(src, "Absorb messages:") + for(var/msg in B.absorb_messages_owner) + to_chat(src, "[msg]") + to_chat(src, "Absorb messages (prey):") + for(var/msg in B.absorb_messages_prey) + to_chat(src, "[msg]") + to_chat(src, "Unabsorb messages:") + for(var/msg in B.unabsorb_messages_owner) + to_chat(src, "[msg]") + to_chat(src, "Unabsorb messages (prey):") + for(var/msg in B.unabsorb_messages_prey) + to_chat(src, "[msg]") to_chat(src, "Examine messages:") for(var/msg in B.examine_messages) to_chat(src, "[msg]") diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index e3e7b9befa..4163277462 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -49,6 +49,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE var/feeding = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = FALSE + var/allow_inbelly_spawning = FALSE var/allow_spontaneous_tf = FALSE var/digest_leave_remains = FALSE var/allowmobvore = TRUE @@ -137,6 +138,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE show_vore_fx = json_from_file["show_vore_fx"] can_be_drop_prey = json_from_file["can_be_drop_prey"] can_be_drop_pred = json_from_file["can_be_drop_pred"] + allow_inbelly_spawning = json_from_file["allow_inbelly_spawning"] allow_spontaneous_tf = json_from_file["allow_spontaneous_tf"] step_mechanics_pref = json_from_file["step_mechanics_pref"] pickup_pref = json_from_file["pickup_pref"] @@ -165,6 +167,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE can_be_drop_prey = FALSE if(isnull(can_be_drop_pred)) can_be_drop_pred = FALSE + if(isnull(allow_inbelly_spawning)) + allow_inbelly_spawning = FALSE if(isnull(allow_spontaneous_tf)) allow_spontaneous_tf = FALSE if(isnull(step_mechanics_pref)) @@ -196,6 +200,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE "show_vore_fx" = show_vore_fx, "can_be_drop_prey" = can_be_drop_prey, "can_be_drop_pred" = can_be_drop_pred, + "allow_inbelly_spawning"= allow_inbelly_spawning, "allow_spontaneous_tf" = allow_spontaneous_tf, "step_mechanics_pref" = step_mechanics_pref, "pickup_pref" = pickup_pref, diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index eebcb40214..d83744547d 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -95,11 +95,26 @@ var/obj/belly/inside_belly = hostloc var/mob/living/pred = inside_belly.owner + var/inside_desc = "No description." + if(host.absorbed && inside_belly.absorbed_desc) + inside_desc = inside_belly.absorbed_desc + else if(inside_belly.desc) + inside_desc = inside_belly.desc + + //I'd rather not copy-paste this code twice into the previous if-statement + //Technically we could just format the text anyway, but IDK how demanding unnecessary text-replacements are + if((host.absorbed && inside_belly.absorbed_desc) || (inside_belly.desc)) + var/formatted_desc + formatted_desc = replacetext(inside_desc, "%belly", lowertext(inside_belly.name)) //replace with this belly's name + formatted_desc = replacetext(formatted_desc, "%pred", pred) //replace with the pred of this belly + formatted_desc = replacetext(formatted_desc, "%prey", host) //replace with whoever's reading this + inside_desc = formatted_desc + inside = list( "absorbed" = host.absorbed, "belly_name" = inside_belly.name, "belly_mode" = inside_belly.digest_mode, - "desc" = inside_belly.desc || "No description.", + "desc" = inside_desc, "pred" = pred, "ref" = "\ref[inside_belly]", ) @@ -149,6 +164,7 @@ "item_mode" = selected.item_digest_mode, "verb" = selected.vore_verb, "desc" = selected.desc, + "absorbed_desc" = selected.absorbed_desc, "fancy" = selected.fancy_vore, "sound" = selected.vore_sound, "release_sound" = selected.release_sound, @@ -188,6 +204,8 @@ selected_list["interacts"]["escapetime"] = selected.escapetime selected_list["interacts"]["transferchance"] = selected.transferchance selected_list["interacts"]["transferlocation"] = selected.transferlocation + selected_list["interacts"]["transferchance_secondary"] = selected.transferchance_secondary + selected_list["interacts"]["transferlocation_secondary"] = selected.transferlocation_secondary selected_list["interacts"]["absorbchance"] = selected.absorbchance selected_list["interacts"]["digestchance"] = selected.digestchance @@ -226,6 +244,7 @@ "show_vore_fx" = host.show_vore_fx, "can_be_drop_prey" = host.can_be_drop_prey, "can_be_drop_pred" = host.can_be_drop_pred, + "allow_inbelly_spawning" = host.allow_inbelly_spawning, "allow_spontaneous_tf" = host.allow_spontaneous_tf, "step_mechanics_active" = host.step_mechanics_pref, "pickup_mechanics_active" = host.pickup_pref, @@ -304,7 +323,7 @@ return set_attr(usr, params) if("saveprefs") - if(!ishuman(host) && !issilicon(host)) + if(host.real_name != host.client.prefs.real_name || (!ishuman(host) && !issilicon(host))) var/choice = tgui_alert(usr, "Warning: Saving your vore panel while playing what is very-likely not your normal character will overwrite whatever character you have loaded in character setup. Maybe this is your 'playing a simple mob' slot, though. Are you SURE you want to overwrite your current slot with these vore bellies?", "WARNING!", list("No, abort!", "Yes, save.")) if(choice != "Yes, save.") return TRUE @@ -360,6 +379,12 @@ host.client.prefs_vr.can_be_drop_prey = host.can_be_drop_prey unsaved_changes = TRUE return TRUE + if("toggle_allow_inbelly_spawning") + host.allow_inbelly_spawning = !host.allow_inbelly_spawning + if(host.client.prefs_vr) + host.client.prefs_vr.allow_inbelly_spawning = host.allow_inbelly_spawning + unsaved_changes = TRUE + return TRUE if("toggle_allow_spontaneous_tf") host.allow_spontaneous_tf = !host.allow_spontaneous_tf if(host.client.prefs_vr) @@ -515,6 +540,9 @@ to_chat(user,"You manage to [lowertext(TB.vore_verb)] [M] into your [lowertext(TB.name)]!") to_chat(M,"[host] manages to [lowertext(TB.vore_verb)] you into their [lowertext(TB.name)]!") to_chat(OB.owner,"Someone inside you has eaten someone else!") + if(M.absorbed) + M.absorbed = FALSE + OB.handle_absorb_langs(M, OB.owner) TB.nom_mob(M) /datum/vore_look/proc/pick_from_outside(mob/user, params) @@ -684,7 +712,7 @@ host.vore_selected.egg_type = new_egg_type . = TRUE if("b_desc") - var/new_desc = html_encode(input(usr,"Belly Description ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc) as message|null) + var/new_desc = html_encode(input(usr,"Belly Description, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.desc) as message|null) if(new_desc) new_desc = readd_quotes(new_desc) @@ -693,9 +721,19 @@ return FALSE host.vore_selected.desc = new_desc . = TRUE + if("b_absorbed_desc") + var/new_desc = html_encode(input(usr,"Belly Description for absorbed prey, '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. ([BELLIES_DESC_MAX] char limit):","New Description",host.vore_selected.absorbed_desc) as message|null) + + if(new_desc) + new_desc = readd_quotes(new_desc) + if(length(new_desc) > BELLIES_DESC_MAX) + tgui_alert_async(usr, "Entered belly desc too long. [BELLIES_DESC_MAX] character limit.","Error") + return FALSE + host.vore_selected.absorbed_desc = new_desc + . = TRUE if("b_msgs") tgui_alert(user,"Setting abusive or deceptive messages will result in a ban. Consider this your warning. Max 150 characters per message (500 for idle messages), max 10 messages per topic.","Really, don't.") // Should remain tgui_alert() (blocking) - var/help = " Press enter twice to separate messages. '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. '%count' will be replaced with the number of anything in your belly (will not work for absorbed examine). '%countprey' will be replaced with the number of living prey in your belly (or absorbed prey for absorbed examine)." + var/help = " Press enter twice to separate messages. '%pred' will be replaced with your name. '%prey' will be replaced with the prey's name. '%belly' will be replaced with your belly's name. '%count' will be replaced with the number of anything in your belly. '%countprey' will be replaced with the number of living prey in your belly." switch(params["msgtype"]) if("dmp") var/new_message = input(user,"These are sent to prey when they expire. Write them in 2nd person ('you feel X'). Avoid using %prey in this type."+help,"Digest Message (to prey)",host.vore_selected.get_messages("dmp")) as message @@ -707,6 +745,26 @@ if(new_message) host.vore_selected.set_messages(new_message,"dmo") + if("amp") + var/new_message = input(user,"These are sent to prey when their absorption finishes. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to prey)",host.vore_selected.get_messages("amp")) as message + if(new_message) + host.vore_selected.set_messages(new_message,"amp") + + if("amo") + var/new_message = input(user,"These are sent to you when prey's absorption finishes. Write them in 2nd person ('you feel X'). Avoid using %pred in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to you)",host.vore_selected.get_messages("amo")) as message + if(new_message) + host.vore_selected.set_messages(new_message,"amo") + + if("uamp") + var/new_message = input(user,"These are sent to prey when their unnabsorption finishes. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to prey)",host.vore_selected.get_messages("uamp")) as message + if(new_message) + host.vore_selected.set_messages(new_message,"uamp") + + if("uamo") + var/new_message = input(user,"These are sent to you when prey's unabsorption finishes. Write them in 2nd person ('you feel X'). Avoid using %pred in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Digest Message (to you)",host.vore_selected.get_messages("uamo")) as message + if(new_message) + host.vore_selected.set_messages(new_message,"uamo") + if("smo") var/new_message = input(user,"These are sent to those nearby when prey struggles. Write them in 3rd person ('X's Y bulges')."+help,"Struggle Message (outside)",host.vore_selected.get_messages("smo")) as message if(new_message) @@ -717,13 +775,23 @@ if(new_message) host.vore_selected.set_messages(new_message,"smi") + if("asmo") + var/new_message = input(user,"These are sent to those nearby when absorbed prey struggles. Write them in 3rd person ('X's Y bulges'). %count will not work for this type, and %countprey will only count absorbed victims."+help,"Struggle Message (outside)",host.vore_selected.get_messages("asmo")) as message + if(new_message) + host.vore_selected.set_messages(new_message,"asmo") + + if("asmi") + var/new_message = input(user,"These are sent to absorbed prey when they struggle. Write them in 2nd person ('you feel X'). Avoid using %prey in this type. %count will not work for this type, and %countprey will only count absorbed victims."+help,"Struggle Message (inside)",host.vore_selected.get_messages("asmi")) as message + if(new_message) + host.vore_selected.set_messages(new_message,"asmi") + if("em") var/new_message = input(user,"These are sent to people who examine you when this belly has contents. Write them in 3rd person ('Their %belly is bulging')."+help,"Examine Message (when full)",host.vore_selected.get_messages("em")) as message if(new_message) host.vore_selected.set_messages(new_message,"em") if("ema") - var/new_message = input(user,"These are sent to people who examine you when this belly has absorbed victims. Write them in 3rd person ('Their %belly is larger')."+help,"Examine Message (with absorbed victims)",host.vore_selected.get_messages("ema")) as message + var/new_message = input(user,"These are sent to people who examine you when this belly has absorbed victims. Write them in 3rd person ('Their %belly is larger'). %count will not work for this type, and %countprey will only count absorbed victims."+help,"Examine Message (with absorbed victims)",host.vore_selected.get_messages("ema")) as message if(new_message) host.vore_selected.set_messages(new_message,"ema") @@ -737,6 +805,11 @@ if(new_message) host.vore_selected.set_messages(new_message,"im_hold") + if("im_holdabsorbed") + var/new_message = input(user,"These are sent to prey every minute when you are absorbed. Write them in 2nd person ('%pred's %belly squishes down on you.') %count will not work for this type, and %countprey will only count absorbed victims."+help,"Idle Message (Hold Absorbed)",host.vore_selected.get_messages("im_holdabsorbed")) as message + if(new_message) + host.vore_selected.set_messages(new_message,"im_holdabsorbed") + if("im_absorb") var/new_message = input(user,"These are sent to prey every minute when you are on Absorb mode. Write them in 2nd person ('%pred's %belly squishes down on you.')"+help,"Idle Message (Absorb)",host.vore_selected.get_messages("im_absorb")) as message if(new_message) @@ -782,8 +855,14 @@ if(confirm == "DELETE") host.vore_selected.digest_messages_prey = initial(host.vore_selected.digest_messages_prey) host.vore_selected.digest_messages_owner = initial(host.vore_selected.digest_messages_owner) + host.vore_selected.absorb_messages_prey = initial(host.vore_selected.absorb_messages_prey) + host.vore_selected.absorb_messages_owner = initial(host.vore_selected.absorb_messages_owner) + host.vore_selected.unabsorb_messages_prey = initial(host.vore_selected.unabsorb_messages_prey) + host.vore_selected.unabsorb_messages_owner = initial(host.vore_selected.unabsorb_messages_owner) host.vore_selected.struggle_messages_outside = initial(host.vore_selected.struggle_messages_outside) host.vore_selected.struggle_messages_inside = initial(host.vore_selected.struggle_messages_inside) + host.vore_selected.absorbed_struggle_messages_outside = initial(host.vore_selected.absorbed_struggle_messages_outside) + host.vore_selected.absorbed_struggle_messages_inside = initial(host.vore_selected.absorbed_struggle_messages_inside) host.vore_selected.examine_messages = initial(host.vore_selected.examine_messages) host.vore_selected.examine_messages_absorbed = initial(host.vore_selected.examine_messages_absorbed) host.vore_selected.emote_lists = initial(host.vore_selected.emote_lists) @@ -948,6 +1027,21 @@ else host.vore_selected.transferlocation = choice.name . = TRUE + if("b_transferchance_secondary") + var/transfer_secondary_chance_input = input(user, "Set secondary belly transfer chance on resist (as %). You must also set the location for this to have any effect.", "Prey Escape Time") as num|null + if(!isnull(transfer_secondary_chance_input)) + host.vore_selected.transferchance_secondary = sanitize_integer(transfer_secondary_chance_input, 0, 100, initial(host.vore_selected.transferchance_secondary)) + . = TRUE + if("b_transferlocation_secondary") + var/obj/belly/choice_secondary = tgui_input_list(usr, "Where do you want your [lowertext(host.vore_selected.name)] to alternately lead if prey resists?","Select Belly", (host.vore_organs + "None - Remove" - host.vore_selected)) + + if(!choice_secondary) //They cancelled, no changes + return FALSE + else if(choice_secondary == "None - Remove") + host.vore_selected.transferlocation_secondary = null + else + host.vore_selected.transferlocation_secondary = choice_secondary.name + . = TRUE if("b_absorbchance") var/absorb_chance_input = input(user, "Set belly absorb mode chance on resist (as %)", "Prey Absorb Chance") as num|null if(!isnull(absorb_chance_input)) @@ -977,6 +1071,10 @@ dest_for = B.name failure_msg += "This is the destiantion for at least '[dest_for]' belly transfers. Remove it as the destination from any bellies before deleting it. " break + if(B.transferlocation_secondary == host.vore_selected) + dest_for = B.name + failure_msg += "This is the destiantion for at least '[dest_for]' secondary belly transfers. Remove it as the destination from any bellies before deleting it. " + break if(host.vore_selected.contents.len) failure_msg += "You cannot delete bellies with contents! " //These end with spaces, to be nice looking. Make sure you do the same. diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm index 6a5ef9c82e..12fd69166e 100644 --- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm +++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm @@ -625,6 +625,40 @@ else return 1 +//scree:Avida +/obj/item/clothing/under/skirt/outfit/fluff/avida + name = "purple dress" + desc = "A clingy purple dress with red lacework, with a hole at the back for a tail." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "avidadress" + item_state = "avidadress" + item_icons = list( + slot_l_hand_str = 'icons/vore/custom_clothes_left_hand_vr.dmi', + slot_r_hand_str = 'icons/vore/custom_clothes_right_hand_vr.dmi', + slot_w_uniform_str = 'icons/vore/custom_onmob_vr.dmi' + ) + +//scree:Avida +/obj/item/clothing/head/fluff/avida + name = "purple witch hat" + desc = "A pointy purple hat with a wide brim, with a red hatband. It appears to have ear-holes in it." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "avidahat" + item_state = "avidahat" + item_icons = list( + slot_l_hand_str = 'icons/vore/custom_clothes_left_hand_vr.dmi', + slot_r_hand_str = 'icons/vore/custom_clothes_right_hand_vr.dmi', + slot_head_str = 'icons/vore/custom_onmob_32x48_vr.dmi' + ) + +/obj/item/clothing/head/fluff/avida/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) + if(..()) + if(H.ear_style.name == "Bnnuy Ears"||H.ear_style.name == "Bnnuy Ears 2") //check if wearer's ear sprite is compatible with trimmed icon + item_state = initial(src.item_state) + else //if not, just use a generic icon + item_state = "avidahatnoears" + return TRUE + //natje:Pumila /obj/item/clothing/under/fluff/aluranevines name = "Pumila's vines" @@ -645,27 +679,6 @@ else return 1 -/obj/item/clothing/under/fluff/screesuit - name = "Scree's feathers" - desc = "A mop of fluffy blue feathers, the honkmother only knows what kind of bird they originally came from." - - icon = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "screesuit" - - icon_override = 'icons/vore/custom_clothes_vr.dmi' - item_state = "screesuit_mob" - -/obj/item/clothing/under/fluff/screesuit/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) - if(..()) - if(H.ckey != "scree") - to_chat(H, "Are you just going to tape them on or what? This isn't gonna work.") - return 0 - else - return 1 - -/obj/item/clothing/under/fluff/screesuit/digest_act(var/atom/movable/item_storage = null) - return FALSE - //HOS Hardsuit /obj/item/clothing/suit/space/void/security/fluff/hos // ToDo: Rig version. name = "\improper prototype voidsuit" @@ -2296,15 +2309,72 @@ Departamental Swimsuits, for general use colorswap(usr) -//PastelPrinceDan: Masumi Maki -/obj/item/clothing/under/fluff/masumi_overalls - name = "white and blue overalls" +//PastelPrinceDan: Masumi Maki & Hatterhat: Harold Robinson +/obj/item/clothing/under/fluff/mechanic_overalls + name = "mechanic overalls" desc = "A set of white and blue overalls, paired with a yellow shirt." icon = 'icons/vore/custom_clothes_vr.dmi' - icon_state = "masumioveralls" - item_state = "masumioveralls" + icon_state = "mechaoveralls" + item_state = "mechaoveralls" icon_override = 'icons/vore/custom_onmob_vr.dmi' +//PastelPrinceDan: Masumi Maki & Hatterhat: Harold Robinson +/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic + name = "mechanic winter coat" + desc = "A blue and yellow winter coat, worn only by overachievers." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "mechacoat" + + icon_override = 'icons/vore/custom_onmob_vr.dmi' + item_state = "mechacoat_mob" + hoodtype = /obj/item/clothing/head/hood/winter/fluff/mechanic + +/obj/item/clothing/head/hood/winter/fluff/mechanic + name = "mechanic winter hood" + desc = "A blue and yellow winter coat's hood." + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "mechahood" + + icon_override = 'icons/vore/custom_onmob_vr.dmi' + item_state = "mechahood_mob" + +/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/ui_action_click() + ToggleHood_mechacoat() + +/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/equipped(mob/user, slot) + if(slot != slot_wear_suit) + RemoveHood_mechacoat() + ..() + +/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/proc/RemoveHood_mechacoat() + icon_state = "mechacoat" + item_state = "mechacoat_mob" + hood_up = 0 + if(ishuman(hood.loc)) + var/mob/living/carbon/H = hood.loc + H.unEquip(hood, 1) + H.update_inv_wear_suit() + hood.loc = src + +/obj/item/clothing/suit/storage/hooded/wintercoat/fluff/mechanic/proc/ToggleHood_mechacoat() + if(!hood_up) + if(ishuman(loc)) + var/mob/living/carbon/human/H = loc + if(H.wear_suit != src) + to_chat(H, "You must be wearing [src] to put up the hood!") + return + if(H.head) + to_chat(H, "You're already wearing something on your head!") + return + else + H.equip_to_slot_if_possible(hood,slot_head,0,0,1) + hood_up = 1 + icon_state = "mechacoat_t" + item_state = "mechacoat_mob_t" + H.update_inv_wear_suit() + else + RemoveHood_mechacoat() + //Pandora029 : Evelyn Tareen /obj/item/clothing/suit/storage/hooded/wintercoat/security/fluff/evelyn name = "warden's navy winter coat" @@ -2361,4 +2431,12 @@ Departamental Swimsuits, for general use item_state = "evelyncoat_mob_t" H.update_inv_wear_suit() else - RemoveHood_evelyn() \ No newline at end of file + RemoveHood_evelyn() + +//Uncle_Fruit_VEVO - Bradley Khatibi +/obj/item/clothing/shoes/fluff/airjordans + name = "A pair of Air Jordan 1 Mid 'Black Gym Red's" + desc = "Appearing in a classic Jordan Brand colorway, the Air Jordan 1 Mid 'Black Gym Red' released in May 2021. Built with leather, the shoe's upper sports a white base, contrasted by black on the overlays and highlighted by Gym Red on the padded collar, 'Wings' logo and Swoosh branding. A breathable nylon tongue and perforated toe box support the fit, while underfoot, a standard rubber cupsole with Air in the heel anchors the build." + icon_state = "airjordans" + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_override = 'icons/vore/custom_onmob_vr.dmi' \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 8f1c678a0f..f21eed951f 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -1397,4 +1397,66 @@ hold.can_hold = list(/obj/item/weapon/material/knife, /obj/item/weapon/reagent_containers/glass/bottle) new /obj/item/weapon/material/knife/machete/hatchet/unathiknife/fluff/antoinette(hold) - new /obj/item/weapon/reagent_containers/glass/bottle/poppy(hold) \ No newline at end of file + new /obj/item/weapon/reagent_containers/glass/bottle/poppy(hold) + + +//Hunterbirk - Amaryll +//This is a 'technical item' which basically is meant to represent rippiing things up with bare claws. +/obj/item/weapon/surgical/scalpel/amaryll_claws + name = "Amaryll's Claws" + desc = "This doesn't quite look like what it really is." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "claws" + drop_sound = null + pickup_sound = null + origin_tech = null + matter = null + +//Coolcrow420 - Jade Davis +/obj/item/weapon/stamp/fluff/jade_horror + name = "Council of Mid Horror rubber stamp" + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "stamp-midhorror" + stamptext = "This paper has been certified by The Council of Mid Horror" + +//thedavestdave Lucky +///I know this is pretty bodgey but if it stupid and it works it isn't stupid +/obj/item/clothing/suit/storage/hooded/explorer/lucky + icon = 'icons/vore/custom_clothes_vr.dmi' + icon_state = "luck" + icon_override = 'icons/vore/custom_clothes_vr.dmi' + item_state = "luck" + name = "Lucky's armor" + desc = "A chain mail suit with a badly drawn one eared cat on the front." + + +/obj/item/device/modkit_conversion/crusader_luck + skip_content_check = TRUE + name = "Lucky's armor" + desc = "A chain mail suit with a badly drawn one eared cat on the front." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "modkit" + from_suit = /obj/item/clothing/suit/storage/hooded/explorer + to_suit = /obj/item/clothing/suit/storage/hooded/explorer/lucky + +//RevolverEloise - Revolver Eloise +/obj/item/weapon/sword/fluff/revolver + name = "Catnip" + desc = "A steel claymore with what appears to be a teppi engraved into the hilt and a finely forged metal cuboid for a pommel. The blade is honed and balanced to an unusually high degree and has clearly been meticulously cared for." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "revclaymore" + icon_override = 'icons/vore/custom_items_vr.dmi' + item_state = "revclaymoremob" + force = 1 + sharp = TRUE + edge = TRUE + +//PastelPrinceDan - Kiyoshi/Masumi Maki +/obj/item/toy/plushie/fluff/slimeowshi + name = "Slime-Cat Research Director plushie" + desc = "An adorable stuffed toy that resembles a slime. It's pink, and has little cat ears, as well as a tail! Atop its head is a small beret with a Research Director's insignia." + icon = 'icons/vore/custom_items_vr.dmi' + icon_state = "kimeowshi" + attack_verb = list("blorbled", "slimed", "absorbed", "glomped") + gender = PLURAL // this seems like a good idea but probably prone to changing. todo: ask dan + // the only reason this thought is relevant because the base slimeplush has its gender set to female \ No newline at end of file diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index ec2aead7de..083e12a544 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -173,7 +173,7 @@ var/mob/living/simple_mob/SA = M if(!SA.has_hands) return 0 - if(size_diff >= 0.50 || mob_size < MOB_SMALL) + if(size_diff >= 0.50 || mob_size < MOB_SMALL || size_diff >= get_effective_size()) if(buckled) to_chat(usr,"You have to unbuckle \the [src] before you pick them up.") return 0 diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index efd27d30dd..20db6e308e 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -7,7 +7,7 @@ desc = "A highly advanced ray gun with a knob on the side to adjust the size you desire. Warning: Do not insert into mouth." icon = 'icons/obj/gun_vr.dmi' icon_override = 'icons/obj/gun_vr.dmi' - icon_state = "sizegun100" + icon_state = "sizegun" item_state = "sizegun" fire_sound = 'sound/weapons/wave.ogg' charge_cost = 240 @@ -52,13 +52,38 @@ if(size_set_to < RESIZE_MINIMUM || size_set_to > RESIZE_MAXIMUM) to_chat(usr, "Note: Resizing limited to 25-200% automatically while outside dormatory areas.") //hint that we clamp it in resize +/obj/item/weapon/gun/energy/sizegun/update_icon(var/ignore_inhands) + var/grow_mode = "shrink" + if(size_set_to > 1) + grow_mode = "grow" + if(charge_meter) + var/ratio = power_supply.charge / power_supply.maxcharge + + //make sure that rounding down will not give us the empty state even if we have charge for a shot left. + if(power_supply.charge < charge_cost) + ratio = 0 + else + ratio = max(round(ratio, 0.25) * 100, 25) + + icon_state = "[initial(icon_state)]-[grow_mode][ratio]" + item_state = "[initial(icon_state)]-[grow_mode]" + + if(!ignore_inhands) update_held_icon() + /obj/item/weapon/gun/energy/sizegun/examine(mob/user) . = ..() . += "It is currently set at [size_set_to*100]%" +/obj/item/weapon/gun/energy/sizegun/old + desc = "A highly advanced ray gun with a knob on the side to adjust the size you desire. This one seems to be an older model, but still functional. Warning: Do not insert into mouth." + icon_state = "sizegun-old" + item_state = "sizegun-old" + /obj/item/weapon/gun/energy/sizegun/admin name = "modified size gun" - desc = "Sizegun, without limits on minimum/maximum size, and with unlimited charge. Time to show 'em that size does matter." + desc = "An older model sizegun, modified to be without limits on minimum/maximum size, and have an unlimited charge. Time to show 'em that size does matter." + icon_state = "sizegun_admin" + item_state = "sizegun_admin" charge_cost = 0 projectile_type = /obj/item/projectile/beam/sizelaser/admin @@ -102,8 +127,12 @@ /obj/item/projectile/beam/sizelaser/on_hit(var/atom/target) var/mob/living/M = target var/ignoring_prefs = (target == firer ? TRUE : FALSE) // Resizing yourself - if(istype(M)) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(istype(H.gloves, /obj/item/clothing/gloves/bluespace)) + M.visible_message("\The [H]'s bracelet flashes and absorbs the beam!","Your bracelet flashes and absorbs the beam!") + return if(!M.resize(set_size, uncapped = M.has_large_resize_bounds(), ignore_prefs = ignoring_prefs)) to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() diff --git a/code/modules/xenoarcheaology/anomaly_container.dm b/code/modules/xenoarcheaology/anomaly_container.dm index f9ac6ef4f5..e725254f0b 100644 --- a/code/modules/xenoarcheaology/anomaly_container.dm +++ b/code/modules/xenoarcheaology/anomaly_container.dm @@ -14,6 +14,15 @@ if(A) contain(A) + else + for(var/obj/Ob in loc) + if(can_contain(Ob)) + contain(Ob) + break + +/obj/structure/anomaly_container/proc/can_contain(var/obj/O) + return O.is_anomalous() + /obj/structure/anomaly_container/attack_hand(var/mob/user) release() @@ -37,7 +46,11 @@ underlays.Cut() desc = initial(desc) -/obj/machinery/artifact/MouseDrop(var/obj/structure/anomaly_container/over_object) - if(istype(over_object) && Adjacent(over_object) && CanMouseDrop(over_object, usr)) - Bumped(usr) - over_object.contain(src) \ No newline at end of file +/atom/MouseDrop(var/obj/structure/anomaly_container/over_object) + . = ..() + + if(istype(over_object)) + if(!QDELETED(src) && istype(loc, /turf) && is_anomalous() && Adjacent(over_object) && CanMouseDrop(over_object, usr)) + Bumped(usr) + over_object.contain(src) + diff --git a/code/modules/xenoarcheaology/artifacts/artifact.dm b/code/modules/xenoarcheaology/artifacts/artifact.dm index e723561a73..7a2d73474a 100644 --- a/code/modules/xenoarcheaology/artifacts/artifact.dm +++ b/code/modules/xenoarcheaology/artifacts/artifact.dm @@ -5,42 +5,25 @@ icon_state = "ano00" var/icon_num = 0 density = TRUE - var/datum/artifact_effect/my_effect - var/datum/artifact_effect/secondary_effect - var/being_used = 0 - - var/predefined_effects = FALSE - - var/predefined_primary - var/predefined_secondary var/predefined_icon_num - var/predefined_triggers = FALSE + var/datum/component/artifact_master/artifact_master = /datum/component/artifact_master - var/predefined_trig_primary - var/predefined_trig_secondary + var/being_used = 0 /obj/machinery/artifact/New() ..() - if(predefined_effects && predefined_primary) - my_effect = new predefined_primary(src) + if(ispath(artifact_master)) + AddComponent(artifact_master) - if(predefined_secondary) - secondary_effect = new predefined_secondary(src) - if(prob(75)) - secondary_effect.ToggleActivate(0) + artifact_master = GetComponent(artifact_master) - else - var/effecttype = pick(subtypesof(/datum/artifact_effect)) - my_effect = new effecttype(src) + if(!istype(artifact_master)) + return - if(prob(75)) - effecttype = pick(subtypesof(/datum/artifact_effect)) - secondary_effect = new effecttype(src) - if(prob(75)) - secondary_effect.ToggleActivate(0) + var/datum/artifact_effect/my_effect = artifact_master.get_primary() if(!isnull(predefined_icon_num)) icon_num = predefined_icon_num @@ -77,299 +60,10 @@ if(prob(60)) my_effect.trigger = pick(TRIGGER_TOUCH, TRIGGER_HEAT, TRIGGER_COLD, TRIGGER_PHORON, TRIGGER_OXY, TRIGGER_CO2, TRIGGER_NITRO) - if(predefined_triggers) - if(predefined_trig_primary && my_effect) - my_effect.trigger = predefined_trig_primary - - if(predefined_trig_secondary && secondary_effect) - secondary_effect.trigger = predefined_trig_secondary - -/obj/machinery/artifact/proc/choose_effect() - var/effect_type = tgui_input_list(usr, "What type do you want?", "Effect Type", subtypesof(/datum/artifact_effect)) - if(effect_type) - my_effect = new effect_type(src) - if(tgui_alert(usr, "Do you want a secondary effect?", "Second Effect", list("No", "Yes")) == "Yes") - var/second_effect_type = tgui_input_list(usr, "What type do you want as well?", "Second Effect Type", subtypesof(/datum/artifact_effect) - effect_type) - secondary_effect = new second_effect_type(src) - else - secondary_effect = null - - -/obj/machinery/artifact/process() - var/turf/L = loc - if(!istype(L)) // We're inside a container or on null turf, either way stop processing effects - return - - if(my_effect) - my_effect.process() - if(secondary_effect) - secondary_effect.process() - - if(pulledby) - Bumped(pulledby) - - //if either of our effects rely on environmental factors, work that out - var/trigger_cold = 0 - var/trigger_hot = 0 - var/trigger_phoron = 0 - var/trigger_oxy = 0 - var/trigger_co2 = 0 - var/trigger_nitro = 0 - if( (my_effect.trigger >= TRIGGER_HEAT && my_effect.trigger <= TRIGGER_NITRO) || (my_effect.trigger >= TRIGGER_HEAT && my_effect.trigger <= TRIGGER_NITRO) ) - var/turf/T = get_turf(src) - var/datum/gas_mixture/env = T.return_air() - if(env) - if(env.temperature < 225) - trigger_cold = 1 - else if(env.temperature > 375) - trigger_hot = 1 - - if(env.gas["phoron"] >= 10) - trigger_phoron = 1 - if(env.gas["oxygen"] >= 10) - trigger_oxy = 1 - if(env.gas["carbon_dioxide"] >= 10) - trigger_co2 = 1 - if(env.gas["nitrogen"] >= 10) - trigger_nitro = 1 - - //COLD ACTIVATION - if(trigger_cold) - if(my_effect.trigger == TRIGGER_COLD && !my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_COLD && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - else - if(my_effect.trigger == TRIGGER_COLD && my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_COLD && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - - //HEAT ACTIVATION - if(trigger_hot) - if(my_effect.trigger == TRIGGER_HEAT && !my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - else - if(my_effect.trigger == TRIGGER_HEAT && my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - - //PHORON GAS ACTIVATION - if(trigger_phoron) - if(my_effect.trigger == TRIGGER_PHORON && !my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - else - if(my_effect.trigger == TRIGGER_PHORON && my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_PHORON && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - - //OXYGEN GAS ACTIVATION - if(trigger_oxy) - if(my_effect.trigger == TRIGGER_OXY && !my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_OXY && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - else - if(my_effect.trigger == TRIGGER_OXY && my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_OXY && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - - //CO2 GAS ACTIVATION - if(trigger_co2) - if(my_effect.trigger == TRIGGER_CO2 && !my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_CO2 && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - else - if(my_effect.trigger == TRIGGER_CO2 && my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_CO2 && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - - //NITROGEN GAS ACTIVATION - if(trigger_nitro) - if(my_effect.trigger == TRIGGER_NITRO && !my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_NITRO && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - else - if(my_effect.trigger == TRIGGER_NITRO && my_effect.activated) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_NITRO && !secondary_effect.activated) - secondary_effect.ToggleActivate(0) - -/obj/machinery/artifact/attack_hand(var/mob/user as mob) - if (get_dist(user, src) > 1) - to_chat(user, "You can't reach [src] from here.") - return - if(ishuman(user) && user:gloves) - to_chat(user, "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") - return - - src.add_fingerprint(user) - - if(my_effect.trigger == TRIGGER_TOUCH) - to_chat(user, "You touch [src].") - my_effect.ToggleActivate() - else - to_chat(user, "You touch [src], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") - - if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH) - secondary_effect.ToggleActivate(0) - - if (my_effect.effect == EFFECT_TOUCH) - my_effect.DoEffectTouch(user) - - if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated) - secondary_effect.DoEffectTouch(user) - -/obj/machinery/artifact/attackby(obj/item/weapon/W as obj, mob/living/user as mob) - - if (istype(W, /obj/item/weapon/reagent_containers/)) - if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1)) - if(my_effect.trigger == TRIGGER_WATER) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_WATER && prob(25)) - secondary_effect.ToggleActivate(0) - else if(W.reagents.has_reagent("sacid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1)) - if(my_effect.trigger == TRIGGER_ACID) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_ACID && prob(25)) - secondary_effect.ToggleActivate(0) - else if(W.reagents.has_reagent("phoron", 1) || W.reagents.has_reagent("thermite", 1)) - if(my_effect.trigger == TRIGGER_VOLATILE) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_VOLATILE && prob(25)) - secondary_effect.ToggleActivate(0) - else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amatoxin", 1) || W.reagents.has_reagent("neurotoxin", 1)) - if(my_effect.trigger == TRIGGER_TOXIN) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_TOXIN && prob(25)) - secondary_effect.ToggleActivate(0) - else if(istype(W,/obj/item/weapon/melee/baton) && W:status ||\ - istype(W,/obj/item/weapon/melee/energy) ||\ - istype(W,/obj/item/weapon/melee/cultblade) ||\ - istype(W,/obj/item/weapon/card/emag) ||\ - istype(W,/obj/item/device/multitool)) - if (my_effect.trigger == TRIGGER_ENERGY) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25)) - secondary_effect.ToggleActivate(0) - - else if (istype(W,/obj/item/weapon/flame) && W:lit ||\ - istype(W,/obj/item/weapon/weldingtool) && W:welding) - if(my_effect.trigger == TRIGGER_HEAT) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_HEAT && prob(25)) - secondary_effect.ToggleActivate(0) - else - ..() - if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25)) - secondary_effect.ToggleActivate(0) - -/obj/machinery/artifact/Bumped(M as mob|obj) - ..() - if(istype(M,/obj)) - if(M:throwforce >= 10) - if(my_effect.trigger == TRIGGER_FORCE) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25)) - secondary_effect.ToggleActivate(0) - else if(ishuman(M) && !istype(M:gloves,/obj/item/clothing/gloves)) - var/warn = 0 - - if (my_effect.trigger == TRIGGER_TOUCH && prob(50)) - my_effect.ToggleActivate() - warn = 1 - if(secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH && prob(25)) - secondary_effect.ToggleActivate(0) - warn = 1 - - if (my_effect.effect == EFFECT_TOUCH && prob(50)) - my_effect.DoEffectTouch(M) - warn = 1 - if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated && prob(50)) - secondary_effect.DoEffectTouch(M) - warn = 1 - - if(warn) - to_chat(M, "You accidentally touch \the [src].") +/obj/machinery/artifact/update_icon() ..() -/obj/machinery/artifact/Bump(var/atom/bumped) - if(istype(bumped,/obj)) - if(bumped:throwforce >= 10) - if(my_effect.trigger == TRIGGER_FORCE) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25)) - secondary_effect.ToggleActivate(0) - else if(ishuman(bumped) && GetAnomalySusceptibility(bumped) >= 0.5) - var/warn = 0 - - if (my_effect.trigger == TRIGGER_TOUCH && prob(50)) - my_effect.ToggleActivate() - warn = 1 - if(secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH && prob(25)) - secondary_effect.ToggleActivate(0) - warn = 1 - - if (my_effect.effect == EFFECT_TOUCH && prob(50)) - my_effect.DoEffectTouch(bumped) - warn = 1 - if(secondary_effect && secondary_effect.effect == EFFECT_TOUCH && secondary_effect.activated && prob(50)) - secondary_effect.DoEffectTouch(bumped) - warn = 1 - - if(warn) - to_chat(bumped, "You accidentally touch \the [src] as it hits you.") - - ..() - -/obj/machinery/artifact/bullet_act(var/obj/item/projectile/P) - if(istype(P,/obj/item/projectile/bullet)) - if(my_effect.trigger == TRIGGER_FORCE) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_FORCE && prob(25)) - secondary_effect.ToggleActivate(0) - - else if(istype(P,/obj/item/projectile/beam) ||\ - istype(P,/obj/item/projectile/ion) ||\ - istype(P,/obj/item/projectile/energy)) - if(my_effect.trigger == TRIGGER_ENERGY) - my_effect.ToggleActivate() - if(secondary_effect && secondary_effect.trigger == TRIGGER_ENERGY && prob(25)) - secondary_effect.ToggleActivate(0) - -/obj/machinery/artifact/ex_act(severity) - switch(severity) - if(1.0) qdel(src) - if(2.0) - if (prob(50)) - qdel(src) - else - if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT) - my_effect.ToggleActivate() - if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25)) - secondary_effect.ToggleActivate(0) - if(3.0) - if (my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT) - my_effect.ToggleActivate() - if(secondary_effect && (secondary_effect.trigger == TRIGGER_FORCE || secondary_effect.trigger == TRIGGER_HEAT) && prob(25)) - secondary_effect.ToggleActivate(0) - return - -/obj/machinery/artifact/Moved() - . = ..() - if(my_effect) - my_effect.UpdateMove() - if(secondary_effect) - secondary_effect.UpdateMove() + if(LAZYLEN(artifact_master.get_active_effects())) + icon_state = "ano[icon_num]1" + else + icon_state = "ano[icon_num]0" diff --git a/code/modules/xenoarcheaology/artifacts/predefined/_predefined.dm b/code/modules/xenoarcheaology/artifacts/predefined/_predefined.dm index edec0dd052..bc0fa92645 100644 --- a/code/modules/xenoarcheaology/artifacts/predefined/_predefined.dm +++ b/code/modules/xenoarcheaology/artifacts/predefined/_predefined.dm @@ -1,15 +1,3 @@ /obj/machinery/artifact/predefined name = "alien artifact" - desc = "A large alien device." - - predefined_effects = TRUE - - predefined_primary = null - predefined_secondary = null - - predefined_icon_num = null - - predefined_triggers = FALSE - - predefined_trig_primary = null - predefined_trig_secondary = null + desc = "A large alien device." \ No newline at end of file diff --git a/code/modules/xenoarcheaology/artifacts/predefined/hungry_statue.dm b/code/modules/xenoarcheaology/artifacts/predefined/hungry_statue.dm index 6a81c02b8b..c4141ff192 100644 --- a/code/modules/xenoarcheaology/artifacts/predefined/hungry_statue.dm +++ b/code/modules/xenoarcheaology/artifacts/predefined/hungry_statue.dm @@ -2,14 +2,12 @@ name = "alien artifact" desc = "A large alien device." - predefined_effects = TRUE - - predefined_primary = /datum/artifact_effect/animate_anomaly - predefined_secondary = /datum/artifact_effect/vampire + artifact_master = /datum/component/artifact_master/hungry_statue predefined_icon_num = 14 - predefined_triggers = TRUE - - predefined_trig_primary = TRIGGER_OXY - predefined_trig_secondary = TRIGGER_OXY +/datum/component/artifact_master/hungry_statue + make_effects = list( + /datum/artifact_effect/animate_anomaly, + /datum/artifact_effect/vampire + ) diff --git a/code/modules/xenoarcheaology/boulder.dm b/code/modules/xenoarcheaology/boulder.dm index 7baa254643..b260f0b62a 100644 --- a/code/modules/xenoarcheaology/boulder.dm +++ b/code/modules/xenoarcheaology/boulder.dm @@ -75,8 +75,8 @@ var/obj/O = new spawn_type(get_turf(src)) if(istype(O, /obj/machinery/artifact)) var/obj/machinery/artifact/X = O - if(X.my_effect) - X.my_effect.artifact_id = artifact_find.artifact_id + if(X.artifact_master) + X.artifact_master.artifact_id = artifact_find.artifact_id O.anchored = FALSE // Anchored finds are lame. src.visible_message("\The [src] suddenly crumbles away.") else diff --git a/code/modules/xenoarcheaology/effect.dm b/code/modules/xenoarcheaology/effect.dm index 8b9dd625c1..145bd3e258 100644 --- a/code/modules/xenoarcheaology/effect.dm +++ b/code/modules/xenoarcheaology/effect.dm @@ -3,19 +3,47 @@ var/effect = EFFECT_TOUCH var/effectrange = 4 var/trigger = TRIGGER_TOUCH - var/atom/holder + var/datum/component/artifact_master/master var/activated = 0 - var/chargelevel = 0 + var/chargelevel = 1 var/chargelevelmax = 10 var/artifact_id = "" var/effect_type = 0 -/datum/artifact_effect/New(var/atom/location) + var/req_type = /atom/movable + + var/image/active_effect + var/effect_icon = 'icons/effects/effects.dmi' + var/effect_state = "sparkles" + var/effect_color = "#ffffff" + + // The last time the effect was toggled. + var/last_activation = 0 + +/datum/artifact_effect/Destroy() + if(master) + master = null ..() - holder = location + +/datum/artifact_effect/proc/get_master_holder() // Return the effectmaster's holder, if it is set to an effectmaster. Otherwise, master is the target object. + if(istype(master)) + return master.holder + else + return master + +/datum/artifact_effect/New(var/datum/component/artifact_master/newmaster) + ..() + + master = newmaster effect = rand(0, MAX_EFFECT) trigger = rand(0, MAX_TRIGGER) + if(effect_icon && effect_state) + if(effect_state == "sparkles") + effect_state = "sparkles_[rand(1,4)]" + active_effect = image(effect_icon, effect_state) + active_effect.color = effect_color + //this will be replaced by the excavation code later, but it's here just in case artifact_id = "[pick("kappa","sigma","antaeres","beta","omicron","iota","epsilon","omega","gamma","delta","tau","alpha")]-[rand(100,999)]" @@ -36,21 +64,32 @@ /datum/artifact_effect/proc/ToggleActivate(var/reveal_toggle = 1) //so that other stuff happens first - spawn(0) + set waitfor = FALSE + + var/atom/target = get_master_holder() + + if(world.time - last_activation > 1 SECOND) + last_activation = world.time if(activated) activated = 0 else activated = 1 - if(reveal_toggle && holder) - if(istype(holder, /obj/machinery/artifact)) - var/obj/machinery/artifact/A = holder - A.icon_state = "ano[A.icon_num][activated]" + if(reveal_toggle && target) + if(!isliving(target)) + target.update_icon() var/display_msg if(activated) display_msg = pick("momentarily glows brightly!","distorts slightly for a moment!","flickers slightly!","vibrates!","shimmers slightly for a moment!") else display_msg = pick("grows dull!","fades in intensity!","suddenly becomes very still!","suddenly becomes very quiet!") - var/atom/toplevelholder = holder + + if(active_effect) + if(activated) + target.underlays.Add(active_effect) + else + target.underlays.Remove(active_effect) + + var/atom/toplevelholder = target while(!istype(toplevelholder.loc, /turf)) toplevelholder = toplevelholder.loc toplevelholder.visible_message("[bicon(toplevelholder)] [toplevelholder] [display_msg]") diff --git a/code/modules/xenoarcheaology/effect_master.dm b/code/modules/xenoarcheaology/effect_master.dm new file mode 100644 index 0000000000..f654724b32 --- /dev/null +++ b/code/modules/xenoarcheaology/effect_master.dm @@ -0,0 +1,421 @@ + +/* + * Here there be the base component for artifacts. + */ + +/atom/proc/is_anomalous() + return (GetComponent(/datum/component/artifact_master)) + +/atom/proc/become_anomalous() + if(!is_anomalous()) + AddComponent(/datum/component/artifact_master) + if(istype(src, /obj/item)) + var/obj/item/I = src + LAZYINITLIST(I.origin_tech) + if(prob(50)) + I.origin_tech[TECH_PRECURSOR] += 1 + else + I.origin_tech[TECH_ARCANE] += 1 + var/rand_tech = pick(\ + TECH_MATERIAL,\ + TECH_ENGINEERING,\ + TECH_PHORON,\ + TECH_POWER,\ + TECH_BLUESPACE,\ + TECH_BIO,\ + TECH_COMBAT,\ + TECH_MAGNET,\ + TECH_DATA,\ + TECH_ILLEGAL\ + ) + LAZYSET(I.origin_tech, rand_tech, rand(4,7)) + +/datum/component/artifact_master + var/atom/holder + var/list/my_effects + + dupe_type = /datum/component/artifact_master + + var/effect_generation_chance = 100 + + var/list/make_effects + + var/artifact_id + +/datum/component/artifact_master/New() + . = ..() + holder = parent + + if(!holder) + qdel(src) + return + + my_effects = list() + + START_PROCESSING(SSobj, src) + + do_setup() + return + +/* + * Component System Registry. + * Here be dragons. + */ + +/datum/component/artifact_master/proc/DoRegistry() +//Melee Hit + RegisterSignal(holder, COMSIG_PARENT_ATTACKBY, /datum/component/artifact_master/proc/on_attackby, override = FALSE) +//Explosions + RegisterSignal(holder, COMSIG_ATOM_EX_ACT, /datum/component/artifact_master/proc/on_exact, override = FALSE) +//Bullets + RegisterSignal(holder, COMSIG_ATOM_BULLET_ACT, /datum/component/artifact_master/proc/on_bullet, override = FALSE) + +//Attackhand + RegisterSignal(holder, COMSIG_ATOM_ATTACK_HAND, /datum/component/artifact_master/proc/on_attack_hand, override = FALSE) + +//Bumped / Bumping + RegisterSignal(holder, COMSIG_MOVABLE_BUMP, /datum/component/artifact_master/proc/on_bump, override = FALSE) + RegisterSignal(holder, COMSIG_ATOM_BUMPED, /datum/component/artifact_master/proc/on_bumped, override = FALSE) + +//Moved + RegisterSignal(holder, COMSIG_MOVABLE_MOVED, /datum/component/artifact_master/proc/on_moved, override = FALSE) + +//Splashed with a reagent. + RegisterSignal(holder, COMSIG_REAGENTS_TOUCH, /datum/component/artifact_master/proc/on_reagent, override = FALSE) + +/* + * + */ + +/datum/component/artifact_master/proc/get_active_effects() + var/list/active_effects = list() + for(var/datum/artifact_effect/my_effect in my_effects) + if(my_effect.activated) + active_effects |= my_effect + + return active_effects + +/datum/component/artifact_master/proc/add_effect() + var/effect_type = input(usr, "What type do you want?", "Effect Type") as null|anything in subtypesof(/datum/artifact_effect) + if(effect_type) + var/datum/artifact_effect/my_effect = new effect_type(src) + if(istype(holder, my_effect.req_type)) + my_effects += my_effect + + else + to_chat(usr, "This effect can not be applied to this atom type.") + qdel(my_effect) + +/datum/component/artifact_master/proc/remove_effect() + var/to_remove_effect = input(usr, "What effect do you want to remove?", "Remove Effect") as null|anything in my_effects + + if(to_remove_effect) + var/datum/artifact_effect/AE = to_remove_effect + my_effects.Remove(to_remove_effect) + qdel(AE) + +/datum/component/artifact_master/Destroy() + holder = null + for(var/datum/artifact_effect/AE in my_effects) + AE.master = null + qdel(AE) + + STOP_PROCESSING(SSobj,src) + + . = ..() + +/datum/component/artifact_master/proc/do_setup() + if(LAZYLEN(make_effects)) + for(var/path in make_effects) + var/datum/artifact_effect/new_effect = new path(src) + if(istype(holder, new_effect.req_type)) + my_effects += new_effect + + else + generate_effects() + + DoRegistry() + +/datum/component/artifact_master/proc/generate_effects() + while(effect_generation_chance > 0) + var/chosen_path = pick(subtypesof(/datum/artifact_effect)) + if(effect_generation_chance >= 100) // If we're above 100 percent, just cut a flat amount and add an effect. + var/datum/artifact_effect/AE = new chosen_path(src) + if(istype(holder, AE.req_type)) + my_effects += AE + effect_generation_chance -= 30 + else + AE.master = src + qdel(AE) + continue + + effect_generation_chance /= 2 + + if(prob(effect_generation_chance)) // Otherwise, add effects as normal, with decreasing probability. + my_effects += new chosen_path(src) + + effect_generation_chance = round(effect_generation_chance) + +/datum/component/artifact_master/proc/get_holder() // Returns the holder. + return holder + +/datum/component/artifact_master/proc/get_primary() + if(LAZYLEN(my_effects)) + return my_effects[1] + return FALSE + +/* + * Trigger code. + */ + +/datum/component/artifact_master/proc/on_exact() + var/severity = args[2] + var/triggered = FALSE + for(var/datum/artifact_effect/my_effect in my_effects) + switch(severity) + if(1.0) + if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT || my_effect.trigger == TRIGGER_ENERGY) + my_effect.ToggleActivate() + triggered = TRUE + if(2.0) + if(my_effect.trigger == TRIGGER_FORCE || my_effect.trigger == TRIGGER_HEAT) + my_effect.ToggleActivate() + triggered = TRUE + if(3.0) + if (my_effect.trigger == TRIGGER_FORCE) + my_effect.ToggleActivate() + triggered = TRUE + + if(triggered) + return COMPONENT_IGNORE_EXPLOSION + + return + +/datum/component/artifact_master/proc/on_bullet() + var/obj/item/projectile/P = args[2] + var/triggered = TRUE + for(var/datum/artifact_effect/my_effect in my_effects) + if(istype(P,/obj/item/projectile/bullet)) + if(my_effect.trigger == TRIGGER_FORCE) + my_effect.ToggleActivate() + triggered = TRUE + + else if(istype(P,/obj/item/projectile/beam) ||\ + istype(P,/obj/item/projectile/ion) ||\ + istype(P,/obj/item/projectile/energy)) + if(my_effect.trigger == TRIGGER_ENERGY) + my_effect.ToggleActivate() + triggered = TRUE + + if(triggered) + return COMPONENT_CANCEL_ATTACK_CHAIN + + return + +/datum/component/artifact_master/proc/on_bump() + var/atom/bumped = args[2] + var/warn = FALSE + for(var/datum/artifact_effect/my_effect in my_effects) + if(istype(bumped,/obj)) + if(bumped:throwforce >= 10) + if(my_effect.trigger == TRIGGER_FORCE) + my_effect.ToggleActivate() + + else if(ishuman(bumped) && GetAnomalySusceptibility(bumped) >= 0.5) + if (my_effect.trigger == TRIGGER_TOUCH && prob(50)) + my_effect.ToggleActivate() + warn = 1 + + if (my_effect.effect == EFFECT_TOUCH && prob(50)) + my_effect.DoEffectTouch(bumped) + warn = 1 + + if(warn && isliving(bumped)) + to_chat(bumped, "You accidentally touch \the [holder] as it hits you.") + +/datum/component/artifact_master/proc/on_bumped() + var/atom/movable/M = args[2] + var/warn = FALSE + for(var/datum/artifact_effect/my_effect in my_effects) + if(istype(M,/obj)) + if(M:throwforce >= 10) + if(my_effect.trigger == TRIGGER_FORCE) + my_effect.ToggleActivate() + + else if(ishuman(M) && !istype(M:gloves,/obj/item/clothing/gloves)) + if (my_effect.trigger == TRIGGER_TOUCH && prob(50)) + my_effect.ToggleActivate() + warn = 1 + + if (my_effect.effect == EFFECT_TOUCH && prob(50)) + my_effect.DoEffectTouch(M) + warn = 1 + + if(warn && isliving(M)) + to_chat(M, "You accidentally touch \the [holder].") + +/datum/component/artifact_master/proc/on_attack_hand() + var/mob/living/user = args[2] + if(!istype(user)) + return + + if (get_dist(user, holder) > 1) + to_chat(user, "You can't reach [holder] from here.") + return + if(ishuman(user) && user:gloves) + to_chat(user, "You touch [holder] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") + return + + var/triggered = FALSE + + for(var/datum/artifact_effect/my_effect in my_effects) + + if(my_effect.trigger == TRIGGER_TOUCH) + triggered = TRUE + my_effect.ToggleActivate() + + if (my_effect.effect == EFFECT_TOUCH) + triggered = TRUE + my_effect.DoEffectTouch(user) + + if(triggered) + to_chat(user, "You touch [holder].") + + else + to_chat(user, "You touch [holder], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") + + +/datum/component/artifact_master/proc/on_attackby() + var/obj/item/weapon/W = args[2] + for(var/datum/artifact_effect/my_effect in my_effects) + + if (istype(W, /obj/item/weapon/reagent_containers)) + if(W.reagents.has_reagent("hydrogen", 1) || W.reagents.has_reagent("water", 1)) + if(my_effect.trigger == TRIGGER_WATER) + my_effect.ToggleActivate() + else if(W.reagents.has_reagent("sacid", 1) || W.reagents.has_reagent("pacid", 1) || W.reagents.has_reagent("diethylamine", 1)) + if(my_effect.trigger == TRIGGER_ACID) + my_effect.ToggleActivate() + else if(W.reagents.has_reagent("phoron", 1) || W.reagents.has_reagent("thermite", 1)) + if(my_effect.trigger == TRIGGER_VOLATILE) + my_effect.ToggleActivate() + else if(W.reagents.has_reagent("toxin", 1) || W.reagents.has_reagent("cyanide", 1) || W.reagents.has_reagent("amatoxin", 1) || W.reagents.has_reagent("neurotoxin", 1)) + if(my_effect.trigger == TRIGGER_TOXIN) + my_effect.ToggleActivate() + else if(istype(W,/obj/item/weapon/melee/baton) && W:status ||\ + istype(W,/obj/item/weapon/melee/energy) ||\ + istype(W,/obj/item/weapon/melee/cultblade) ||\ + istype(W,/obj/item/weapon/card/emag) ||\ + istype(W,/obj/item/device/multitool)) + if (my_effect.trigger == TRIGGER_ENERGY) + my_effect.ToggleActivate() + + else if (istype(W,/obj/item/weapon/flame) && W:lit ||\ + istype(W,/obj/item/weapon/weldingtool) && W:welding) + if(my_effect.trigger == TRIGGER_HEAT) + my_effect.ToggleActivate() + else + if (my_effect.trigger == TRIGGER_FORCE && W.force >= 10) + my_effect.ToggleActivate() + +/datum/component/artifact_master/proc/on_reagent() + var/datum/reagent/Touching = args[2] + + var/list/water = list("hydrogen", "water") + var/list/acid = list("sacid", "pacid", "diethylamine") + var/list/volatile = list("phoron","thermite") + var/list/toxic = list("toxin","cyanide","amatoxin","neurotoxin") + + for(var/datum/artifact_effect/my_effect in my_effects) + if(Touching.id in water) + if(my_effect.trigger == TRIGGER_WATER) + my_effect.ToggleActivate() + else if(Touching.id in acid) + if(my_effect.trigger == TRIGGER_ACID) + my_effect.ToggleActivate() + else if(Touching.id in volatile) + if(my_effect.trigger == TRIGGER_VOLATILE) + my_effect.ToggleActivate() + else if(Touching.id in toxic) + if(my_effect.trigger == TRIGGER_TOXIN) + my_effect.ToggleActivate() + +/datum/component/artifact_master/proc/on_moved() + for(var/datum/artifact_effect/my_effect in my_effects) + if(my_effect) + my_effect.UpdateMove() + +/datum/component/artifact_master/process() + if(!holder) // Some instances can be created and rapidly lose their holder, if they are destroyed rapidly on creation. IE, during excavation. + STOP_PROCESSING(SSobj, src) + if(!QDELETED(src)) + qdel(src) + return + + var/turf/L = holder.loc + if(!istype(L) && !isliving(L)) // We're inside a non-mob container or on null turf, either way stop processing effects + return + + if(istype(holder, /atom/movable)) + var/atom/movable/HA = holder + if(HA.pulledby) + on_bumped(holder, HA.pulledby) + + for(var/datum/artifact_effect/my_effect in my_effects) + if(my_effect) + my_effect.UpdateMove() + + //if any of our effects rely on environmental factors, work that out + var/trigger_cold = 0 + var/trigger_hot = 0 + var/trigger_phoron = 0 + var/trigger_oxy = 0 + var/trigger_co2 = 0 + var/trigger_nitro = 0 + + var/turf/T = get_turf(holder) + var/datum/gas_mixture/env = T.return_air() + if(env) + if(env.temperature < 225) + trigger_cold = 1 + else if(env.temperature > 375) + trigger_hot = 1 + + if(env.gas["phoron"] >= 10) + trigger_phoron = 1 + if(env.gas["oxygen"] >= 10) + trigger_oxy = 1 + if(env.gas["carbon_dioxide"] >= 10) + trigger_co2 = 1 + if(env.gas["nitrogen"] >= 10) + trigger_nitro = 1 + + for(var/datum/artifact_effect/my_effect in my_effects) + my_effect.artifact_id = artifact_id + + my_effect.process() + + //COLD ACTIVATION + if(my_effect.trigger == TRIGGER_COLD && (trigger_cold ^ my_effect.activated)) + my_effect.ToggleActivate() + + //HEAT ACTIVATION + if(my_effect.trigger == TRIGGER_HEAT && (trigger_hot ^ my_effect.activated)) + my_effect.ToggleActivate() + + //PHORON GAS ACTIVATION + if(my_effect.trigger == TRIGGER_PHORON && (trigger_phoron ^ my_effect.activated)) + my_effect.ToggleActivate() + + //OXYGEN GAS ACTIVATION + if(my_effect.trigger == TRIGGER_OXY && (trigger_oxy ^ my_effect.activated)) + my_effect.ToggleActivate() + + //CO2 GAS ACTIVATION + if(my_effect.trigger == TRIGGER_CO2 && (trigger_co2 ^ my_effect.activated)) + my_effect.ToggleActivate() + + //NITROGEN GAS ACTIVATION + if(my_effect.trigger == TRIGGER_NITRO && (trigger_nitro ^ my_effect.activated)) + my_effect.ToggleActivate() + diff --git a/code/modules/xenoarcheaology/effects/animate_anomaly.dm b/code/modules/xenoarcheaology/effects/animate_anomaly.dm index c0c17e4aaf..7cf3e408e9 100644 --- a/code/modules/xenoarcheaology/effects/animate_anomaly.dm +++ b/code/modules/xenoarcheaology/effects/animate_anomaly.dm @@ -4,6 +4,9 @@ effect_type = EFFECT_PSIONIC var/mob/living/target = null + effect_state = "pulsing" + effect_color = "#00c3ff" + /datum/artifact_effect/animate_anomaly/ToggleActivate(var/reveal_toggle = 1) ..() find_target() @@ -13,21 +16,24 @@ effectrange = max(3, effectrange) /datum/artifact_effect/animate_anomaly/proc/find_target() - if(!target || target.z != holder.z || get_dist(target, holder) > effectrange) + var/atom/masterholder = get_master_holder() + + if(!target || target.z != masterholder.z || get_dist(target, masterholder) > effectrange) var/mob/living/ClosestMob = null - for(var/mob/living/L in range(effectrange, holder)) + for(var/mob/living/L in range(effectrange, get_turf(masterholder))) if(!L.mind) continue if(!ClosestMob) ClosestMob = L continue if(!L.stat) - if(get_dist(holder, L) < get_dist(holder, ClosestMob)) + if(get_dist(masterholder, L) < get_dist(masterholder, ClosestMob)) ClosestMob = L target = ClosestMob /datum/artifact_effect/animate_anomaly/DoEffectTouch(var/mob/living/user) + var/atom/holder = get_master_holder() var/obj/O = holder var/turf/T = get_step_away(O, user) @@ -36,25 +42,23 @@ O.visible_message("\The [holder] lurches away from [user]") /datum/artifact_effect/animate_anomaly/DoEffectAura() - var/obj/O = holder - if(!target || target.z != O.z || get_dist(target, O) > effectrange) - target = null - find_target() - var/turf/T = get_step_to(O, target) + var/obj/O = get_master_holder() + find_target() - if(target && istype(T) && istype(O.loc, /turf)) - if(get_dist(O, T) > 1) - O.Move(T) - O.visible_message("\The [holder] lurches toward [target]") + if(!target || !istype(O)) + return + + O.dir = get_dir(O, target) + + if(!target || !istype(O)) + return + + O.dir = get_dir(O, target) + + if(istype(O.loc, /turf)) + if(get_dist(O.loc, target.loc) > 1) + O.Move(get_step_to(O, target)) + O.visible_message("\The [O] lurches toward [target]") /datum/artifact_effect/animate_anomaly/DoEffectPulse() - var/obj/O = holder - if(!target || target.z != O.z || get_dist(target, O) > effectrange) - target = null - find_target() - var/turf/T = get_step_to(O, target) - - if(target && istype(T) && istype(O.loc, /turf)) - if(get_dist(O, T) > 1) - O.Move(T) - O.visible_message("\The [holder] lurches toward [target]") + DoEffectAura() diff --git a/code/modules/xenoarcheaology/effects/badfeeling.dm b/code/modules/xenoarcheaology/effects/badfeeling.dm index a0aa7dc775..2a7e480e18 100644 --- a/code/modules/xenoarcheaology/effects/badfeeling.dm +++ b/code/modules/xenoarcheaology/effects/badfeeling.dm @@ -25,6 +25,9 @@ "OH GOD!", "HELP ME!") + effect_state = "summoning" + effect_color = "#643232" + /datum/artifact_effect/badfeeling/DoEffectTouch(var/mob/user) if(user) if (istype(user, /mob/living/carbon/human)) @@ -39,6 +42,7 @@ H.dizziness += rand(3,5) /datum/artifact_effect/badfeeling/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/human/H in range(src.effectrange,T)) @@ -53,6 +57,7 @@ return 1 /datum/artifact_effect/badfeeling/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/human/H in range(src.effectrange,T)) diff --git a/code/modules/xenoarcheaology/effects/berserk.dm b/code/modules/xenoarcheaology/effects/berserk.dm index a221c9104c..4965747909 100644 --- a/code/modules/xenoarcheaology/effects/berserk.dm +++ b/code/modules/xenoarcheaology/effects/berserk.dm @@ -2,6 +2,9 @@ name = "berserk" effect_type = EFFECT_PSIONIC + effect_state = "summoning" + effect_color = "#5f0000" + /datum/artifact_effect/berserk/proc/apply_berserk(var/mob/living/L) if(!istype(L)) return FALSE @@ -28,6 +31,7 @@ return TRUE /datum/artifact_effect/berserk/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for(var/mob/living/L in range(src.effectrange,T)) @@ -36,6 +40,7 @@ return TRUE /datum/artifact_effect/berserk/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for(var/mob/living/L in range(src.effectrange,T)) diff --git a/code/modules/xenoarcheaology/effects/cannibal.dm b/code/modules/xenoarcheaology/effects/cannibal.dm index 04a0b5a9e8..ad584ccc7c 100644 --- a/code/modules/xenoarcheaology/effects/cannibal.dm +++ b/code/modules/xenoarcheaology/effects/cannibal.dm @@ -25,6 +25,9 @@ "Butcher them!", "Feast!") + effect_state = "summoning" + effect_color = "#c50303" + /datum/artifact_effect/cannibalfeeling/DoEffectTouch(var/mob/user) if(user) if (istype(user, /mob/living/carbon/human)) @@ -41,6 +44,7 @@ H.nutrition = H.nutrition / 1.5 /datum/artifact_effect/cannibalfeeling/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/human/H in range(src.effectrange,T)) @@ -57,6 +61,7 @@ return 1 /datum/artifact_effect/cannibalfeeling/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/human/H in range(src.effectrange,T)) diff --git a/code/modules/xenoarcheaology/effects/cellcharge.dm b/code/modules/xenoarcheaology/effects/cellcharge.dm index b5c8e6224b..42f64eb8dd 100644 --- a/code/modules/xenoarcheaology/effects/cellcharge.dm +++ b/code/modules/xenoarcheaology/effects/cellcharge.dm @@ -4,6 +4,8 @@ effect_type = EFFECT_ELECTRO var/last_message + effect_color = "#ffee06" + /datum/artifact_effect/cellcharge/DoEffectTouch(var/mob/user) if(user) if(isrobot(user)) @@ -14,6 +16,7 @@ return 1 /datum/artifact_effect/cellcharge/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/obj/machinery/power/apc/C in GLOB.apcs) @@ -42,6 +45,7 @@ return 1 /datum/artifact_effect/cellcharge/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/obj/machinery/power/apc/C in GLOB.apcs) diff --git a/code/modules/xenoarcheaology/effects/celldrain.dm b/code/modules/xenoarcheaology/effects/celldrain.dm index ee279032ec..c8a270c059 100644 --- a/code/modules/xenoarcheaology/effects/celldrain.dm +++ b/code/modules/xenoarcheaology/effects/celldrain.dm @@ -4,6 +4,9 @@ effect_type = EFFECT_ELECTRO var/last_message + effect_state = "pulsing" + effect_color = "#fbff02" + /datum/artifact_effect/celldrain/DoEffectTouch(var/mob/user) if(user) if(istype(user, /mob/living/silicon/robot)) @@ -16,6 +19,7 @@ return 1 /datum/artifact_effect/celldrain/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/obj/machinery/power/apc/C in GLOB.apcs) @@ -44,6 +48,7 @@ return 1 /datum/artifact_effect/celldrain/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/obj/machinery/power/apc/C in GLOB.apcs) diff --git a/code/modules/xenoarcheaology/effects/cold.dm b/code/modules/xenoarcheaology/effects/cold.dm index 9855ac280b..f20fdf00d5 100644 --- a/code/modules/xenoarcheaology/effects/cold.dm +++ b/code/modules/xenoarcheaology/effects/cold.dm @@ -3,6 +3,8 @@ name = "cold" var/target_temp + effect_color = "#b3f6ff" + /datum/artifact_effect/cold/New() ..() target_temp = rand(0, 250) @@ -10,6 +12,7 @@ effect_type = pick(EFFECT_ORGANIC, EFFECT_BLUESPACE, EFFECT_SYNTH) /datum/artifact_effect/cold/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() if(holder) to_chat(user, "A chill passes up your spine!") var/datum/gas_mixture/env = holder.loc.return_air() @@ -17,6 +20,7 @@ env.temperature = max(env.temperature - rand(5,50), 0) /datum/artifact_effect/cold/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/datum/gas_mixture/env = holder.loc.return_air() if(env && env.temperature > target_temp) diff --git a/code/modules/xenoarcheaology/effects/dnaswitch.dm b/code/modules/xenoarcheaology/effects/dnaswitch.dm index c4c36cb5b1..f9d20475f7 100644 --- a/code/modules/xenoarcheaology/effects/dnaswitch.dm +++ b/code/modules/xenoarcheaology/effects/dnaswitch.dm @@ -4,6 +4,9 @@ effect_type = EFFECT_ORGANIC var/severity + effect_state = "smoke" + effect_color = "#77ff83" + /datum/artifact_effect/dnaswitch/New() ..() if(effect == EFFECT_AURA) @@ -28,6 +31,7 @@ return 1 /datum/artifact_effect/dnaswitch/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for(var/mob/living/carbon/human/H in range(src.effectrange,T)) @@ -47,6 +51,7 @@ scramble(0, H, weakness * severity) /datum/artifact_effect/dnaswitch/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for(var/mob/living/carbon/human/H in range(200, T)) diff --git a/code/modules/xenoarcheaology/effects/electric_field.dm b/code/modules/xenoarcheaology/effects/electric_field.dm index 3b27e8fe42..1ba181bb45 100644 --- a/code/modules/xenoarcheaology/effects/electric_field.dm +++ b/code/modules/xenoarcheaology/effects/electric_field.dm @@ -3,7 +3,10 @@ name = "electric field" effect_type = EFFECT_ENERGY + effect_color = "#ffff00" + /datum/artifact_effect/electric_field/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() var/list/nearby_mobs = list() for(var/mob/living/L in oview(effectrange, get_turf(holder))) if(L == user) // You're "grounded" when you contact the artifact. @@ -27,6 +30,7 @@ L.electrocute_act(rand(25, 40), holder, 0.75, BP_TORSO) /datum/artifact_effect/electric_field/DoEffectAura() + var/atom/holder = get_master_holder() var/list/nearby_mobs = list() for(var/mob/living/L in oview(effectrange, get_turf(holder))) if(!L.stat) @@ -48,6 +52,7 @@ L.electrocute_act(rand(1, 10), holder, 0.75, BP_TORSO) /datum/artifact_effect/electric_field/DoEffectPulse() + var/atom/holder = get_master_holder() var/list/nearby_mobs = list() for(var/mob/living/L in oview(effectrange, get_turf(holder))) if(!L.stat) diff --git a/code/modules/xenoarcheaology/effects/emp.dm b/code/modules/xenoarcheaology/effects/emp.dm index fd30420b57..8b9d969a3e 100644 --- a/code/modules/xenoarcheaology/effects/emp.dm +++ b/code/modules/xenoarcheaology/effects/emp.dm @@ -2,11 +2,14 @@ name = "emp" effect_type = EFFECT_ELECTRO + effect_state = "empdisable" + /datum/artifact_effect/emp/New() ..() effect = EFFECT_PULSE /datum/artifact_effect/emp/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) empulse(T, effectrange/4, effectrange/3, effectrange/2, effectrange) diff --git a/code/modules/xenoarcheaology/effects/feysight.dm b/code/modules/xenoarcheaology/effects/feysight.dm index 379dc0cc54..70bceb7bcc 100644 --- a/code/modules/xenoarcheaology/effects/feysight.dm +++ b/code/modules/xenoarcheaology/effects/feysight.dm @@ -2,6 +2,9 @@ name = "feysight" effect_type = EFFECT_PSIONIC + effect_state = "pulsing" + effect_color = "#00c763" + /datum/artifact_effect/feysight/proc/apply_modifier(var/mob/living/L) if(!istype(L)) return FALSE @@ -28,6 +31,7 @@ return TRUE /datum/artifact_effect/feysight/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for(var/mob/living/L in range(src.effectrange,T)) @@ -36,6 +40,7 @@ return TRUE /datum/artifact_effect/feysight/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for(var/mob/living/L in range(src.effectrange,T)) diff --git a/code/modules/xenoarcheaology/effects/forcefield.dm b/code/modules/xenoarcheaology/effects/forcefield.dm index f4f1a3ab07..661563ccc7 100644 --- a/code/modules/xenoarcheaology/effects/forcefield.dm +++ b/code/modules/xenoarcheaology/effects/forcefield.dm @@ -3,11 +3,15 @@ var/list/created_field = list() effect_type = EFFECT_PARTICLE + effect_state = "shield-old" + effect_color = "#00b7ff" + /datum/artifact_effect/forcefield/New() ..() trigger = TRIGGER_TOUCH /datum/artifact_effect/forcefield/ToggleActivate() + var/atom/holder = get_master_holder() ..() if(created_field.len) for(var/obj/effect/energy_field/F in created_field) @@ -35,6 +39,7 @@ E.adjust_strength(0.25, 0) /datum/artifact_effect/forcefield/UpdateMove() + var/atom/holder = get_master_holder() if(created_field.len && holder) var/turf/T = get_turf(holder) while(created_field.len < 16) diff --git a/code/modules/xenoarcheaology/effects/gaia.dm b/code/modules/xenoarcheaology/effects/gaia.dm index 1a89149818..42869fd556 100644 --- a/code/modules/xenoarcheaology/effects/gaia.dm +++ b/code/modules/xenoarcheaology/effects/gaia.dm @@ -5,6 +5,8 @@ var/list/my_glitterflies = list() + effect_color = "#8cd448" + /datum/artifact_effect/gaia/proc/age_plantlife(var/obj/machinery/portable_atmospherics/hydroponics/Tray = null) if(istype(Tray) && Tray.seed) Tray.health += rand(1,3) * HYDRO_SPEED_MULTIPLIER @@ -30,6 +32,7 @@ P.update_icon() /datum/artifact_effect/gaia/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() to_chat(user, "You feel the presence of something long forgotten.") for(var/obj/machinery/portable_atmospherics/hydroponics/Tray in view(world.view,get_turf(holder))) age_plantlife(Tray) @@ -44,6 +47,7 @@ age_plantlife(P) /datum/artifact_effect/gaia/DoEffectAura() + var/atom/holder = get_master_holder() for(var/obj/machinery/portable_atmospherics/hydroponics/Tray in view(effectrange,holder)) age_plantlife(Tray) if(prob(2)) @@ -57,6 +61,7 @@ age_plantlife(P) /datum/artifact_effect/gaia/DoEffectPulse() + var/atom/holder = get_master_holder() for(var/obj/machinery/portable_atmospherics/hydroponics/Tray in view(effectrange,holder)) age_plantlife(Tray) if(prob(10)) @@ -70,6 +75,7 @@ age_plantlife(P) /datum/artifact_effect/gaia/process() + var/atom/holder = get_master_holder() ..() listclearnulls(my_glitterflies) diff --git a/code/modules/xenoarcheaology/effects/gasco2.dm b/code/modules/xenoarcheaology/effects/gasco2.dm index 264dca7352..5543517dac 100644 --- a/code/modules/xenoarcheaology/effects/gasco2.dm +++ b/code/modules/xenoarcheaology/effects/gasco2.dm @@ -1,18 +1,22 @@ /datum/artifact_effect/gasco2 name = "CO2 creation" + effect_color = "#a5a5a5" + /datum/artifact_effect/gasco2/New() ..() effect = pick(EFFECT_TOUCH, EFFECT_AURA) effect_type = pick(EFFECT_BLUESPACE, EFFECT_SYNTH) /datum/artifact_effect/gasco2/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) holder_loc.assume_gas("carbon_dioxide", rand(2, 15)) /datum/artifact_effect/gasco2/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) diff --git a/code/modules/xenoarcheaology/effects/gasnitro.dm b/code/modules/xenoarcheaology/effects/gasnitro.dm index 42b440fc1c..e076ff3aa3 100644 --- a/code/modules/xenoarcheaology/effects/gasnitro.dm +++ b/code/modules/xenoarcheaology/effects/gasnitro.dm @@ -1,18 +1,22 @@ /datum/artifact_effect/gasnitro name = "N2 creation" + effect_color = "#c2d3d8" + /datum/artifact_effect/gasnitro/New() ..() effect = pick(EFFECT_TOUCH, EFFECT_AURA) effect_type = pick(EFFECT_BLUESPACE, EFFECT_SYNTH) /datum/artifact_effect/gasnitro/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) holder_loc.assume_gas("nitrogen", rand(2, 15)) /datum/artifact_effect/gasnitro/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) diff --git a/code/modules/xenoarcheaology/effects/gasoxy.dm b/code/modules/xenoarcheaology/effects/gasoxy.dm index bb159509dc..798154e38a 100644 --- a/code/modules/xenoarcheaology/effects/gasoxy.dm +++ b/code/modules/xenoarcheaology/effects/gasoxy.dm @@ -7,12 +7,14 @@ effect_type = pick(EFFECT_BLUESPACE, EFFECT_SYNTH) /datum/artifact_effect/gasoxy/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) holder_loc.assume_gas("oxygen", rand(2, 15)) /datum/artifact_effect/gasoxy/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) diff --git a/code/modules/xenoarcheaology/effects/gasphoron.dm b/code/modules/xenoarcheaology/effects/gasphoron.dm index b84296fbb8..66cdee98c2 100644 --- a/code/modules/xenoarcheaology/effects/gasphoron.dm +++ b/code/modules/xenoarcheaology/effects/gasphoron.dm @@ -1,18 +1,22 @@ /datum/artifact_effect/gasphoron name = "phoron creation" + effect_color = "#c408ba" + /datum/artifact_effect/gasphoron/New() ..() effect = pick(EFFECT_TOUCH, EFFECT_AURA) effect_type = pick(EFFECT_BLUESPACE, EFFECT_SYNTH) /datum/artifact_effect/gasphoron/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) holder_loc.assume_gas("phoron", rand(2, 15)) /datum/artifact_effect/gasphoron/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) diff --git a/code/modules/xenoarcheaology/effects/gassleeping.dm b/code/modules/xenoarcheaology/effects/gassleeping.dm index 3c12f8f91c..a77ca5b88d 100644 --- a/code/modules/xenoarcheaology/effects/gassleeping.dm +++ b/code/modules/xenoarcheaology/effects/gassleeping.dm @@ -7,12 +7,14 @@ effect_type = pick(EFFECT_BLUESPACE, EFFECT_SYNTH) /datum/artifact_effect/gassleeping/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) holder_loc.assume_gas("nitrous_oxide", rand(2, 15)) /datum/artifact_effect/gassleeping/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/holder_loc = holder.loc if(istype(holder_loc)) diff --git a/code/modules/xenoarcheaology/effects/goodfeeling.dm b/code/modules/xenoarcheaology/effects/goodfeeling.dm index c5d05adc5e..42b1be7e3a 100644 --- a/code/modules/xenoarcheaology/effects/goodfeeling.dm +++ b/code/modules/xenoarcheaology/effects/goodfeeling.dm @@ -23,6 +23,9 @@ "You're so happy suddenly, you almost want to dance and sing.", "You feel like the world is out to help you.") + effect_state = "summoning" + effect_color = "#009118" + /datum/artifact_effect/goodfeeling/DoEffectTouch(var/mob/user) if(user) if (istype(user, /mob/living/carbon/human)) @@ -37,6 +40,7 @@ H.dizziness += rand(3,5) /datum/artifact_effect/goodfeeling/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/human/H in range(src.effectrange,T)) @@ -51,6 +55,7 @@ return 1 /datum/artifact_effect/goodfeeling/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/human/H in range(src.effectrange,T)) diff --git a/code/modules/xenoarcheaology/effects/gravitational_waves.dm b/code/modules/xenoarcheaology/effects/gravitational_waves.dm index 6798eef64c..d34b352ea0 100644 --- a/code/modules/xenoarcheaology/effects/gravitational_waves.dm +++ b/code/modules/xenoarcheaology/effects/gravitational_waves.dm @@ -5,10 +5,14 @@ var/last_wave_pull = 0 + effect_state = "gravisphere" + effect_color = "#d8c3ff" + /datum/artifact_effect/gravity_wave/DoEffectTouch(var/mob/user) gravwave(user, effectrange, STAGE_TWO) /datum/artifact_effect/gravity_wave/DoEffectAura() + var/atom/holder = get_master_holder() var/seconds_since_last_pull = max(0, round((last_wave_pull - world.time) / 10)) if(prob(10 + seconds_since_last_pull)) @@ -17,6 +21,7 @@ gravwave(get_turf(holder), effectrange, STAGE_TWO) /datum/artifact_effect/gravity_wave/DoEffectPulse() + var/atom/holder = get_master_holder() holder.visible_message("\The [holder] distorts as local gravity intensifies, and shifts toward it.") gravwave(get_turf(holder), effectrange, STAGE_TWO) diff --git a/code/modules/xenoarcheaology/effects/heal.dm b/code/modules/xenoarcheaology/effects/heal.dm index 39bb09d04e..313bbc011e 100644 --- a/code/modules/xenoarcheaology/effects/heal.dm +++ b/code/modules/xenoarcheaology/effects/heal.dm @@ -1,6 +1,7 @@ /datum/artifact_effect/heal name = "heal" effect_type = EFFECT_ORGANIC + effect_color = "#4649ff" /datum/artifact_effect/heal/DoEffectTouch(var/mob/toucher) //todo: check over this properly @@ -33,6 +34,7 @@ return 1 /datum/artifact_effect/heal/DoEffectAura() + var/atom/holder = get_master_holder() //todo: check over this properly if(holder) var/turf/T = get_turf(holder) @@ -49,6 +51,7 @@ C.updatehealth() /datum/artifact_effect/heal/DoEffectPulse() + var/atom/holder = get_master_holder() //todo: check over this properly if(holder) var/turf/T = get_turf(holder) diff --git a/code/modules/xenoarcheaology/effects/heat.dm b/code/modules/xenoarcheaology/effects/heat.dm index 720d146443..0bb3ae1f10 100644 --- a/code/modules/xenoarcheaology/effects/heat.dm +++ b/code/modules/xenoarcheaology/effects/heat.dm @@ -2,6 +2,7 @@ /datum/artifact_effect/heat name = "heat" var/target_temp + effect_color = "#ff6600" /datum/artifact_effect/heat/New() ..() @@ -10,6 +11,7 @@ target_temp = rand(300, 600) /datum/artifact_effect/heat/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() if(holder) to_chat(user, " You feel a wave of heat travel up your spine!") var/datum/gas_mixture/env = holder.loc.return_air() @@ -17,6 +19,7 @@ env.temperature += rand(5,50) /datum/artifact_effect/heat/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/datum/gas_mixture/env = holder.loc.return_air() if(env && env.temperature < target_temp) diff --git a/code/modules/xenoarcheaology/effects/hurt.dm b/code/modules/xenoarcheaology/effects/hurt.dm index 14aff4e624..a2c8d54163 100644 --- a/code/modules/xenoarcheaology/effects/hurt.dm +++ b/code/modules/xenoarcheaology/effects/hurt.dm @@ -2,6 +2,8 @@ name = "hurt" effect_type = EFFECT_ORGANIC + effect_color = "#6d1212" + /datum/artifact_effect/hurt/DoEffectTouch(var/mob/toucher) if(toucher) var/weakness = GetAnomalySusceptibility(toucher) @@ -20,6 +22,7 @@ C.weakened += 6 * weakness /datum/artifact_effect/hurt/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/C in range(src.effectrange,T)) @@ -35,6 +38,7 @@ C.updatehealth() /datum/artifact_effect/hurt/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/C in range(effectrange, T)) diff --git a/code/modules/xenoarcheaology/effects/poltergeist.dm b/code/modules/xenoarcheaology/effects/poltergeist.dm index 189c0ea4cd..5b270fd38c 100644 --- a/code/modules/xenoarcheaology/effects/poltergeist.dm +++ b/code/modules/xenoarcheaology/effects/poltergeist.dm @@ -3,6 +3,9 @@ name = "poltergeist" effect_type = EFFECT_ENERGY + effect_state = "shield2" + effect_color = "#a824c9" + /datum/artifact_effect/poltergeist/proc/throw_at_mob(var/mob/living/target, var/damage = 20) var/list/valid_targets = list() @@ -19,6 +22,7 @@ throw_at_mob(user, rand(10, 30)) /datum/artifact_effect/poltergeist/DoEffectAura() + var/atom/holder = get_master_holder() var/mob/living/target = null for(var/mob/living/L in oview(get_turf(holder), effectrange)) if(L.stat || !L.mind) @@ -33,6 +37,7 @@ throw_at_mob(target, rand(15, 30)) /datum/artifact_effect/poltergeist/DoEffectPulse() + var/atom/holder = get_master_holder() var/mob/living/target = null for(var/mob/living/L in oview(get_turf(holder), effectrange)) if(L.stat || !L.mind) diff --git a/code/modules/xenoarcheaology/effects/radiate.dm b/code/modules/xenoarcheaology/effects/radiate.dm index e38540eb04..88a37b3e06 100644 --- a/code/modules/xenoarcheaology/effects/radiate.dm +++ b/code/modules/xenoarcheaology/effects/radiate.dm @@ -2,6 +2,8 @@ name = "radiation" var/radiation_amount + effect_color = "#007006" + /datum/artifact_effect/radiate/New() ..() radiation_amount = rand(1, 10) @@ -14,11 +16,13 @@ return 1 /datum/artifact_effect/radiate/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) SSradiation.flat_radiate(holder, radiation_amount, src.effectrange) return 1 /datum/artifact_effect/radiate/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) SSradiation.radiate(holder, ((radiation_amount * 3) * (sqrt(src.effectrange)))) //Need to get feedback on this //VOREStation Edit - Was too crazy-strong. return 1 diff --git a/code/modules/xenoarcheaology/effects/resurrect.dm b/code/modules/xenoarcheaology/effects/resurrect.dm index e54ca276ea..0fbb8c6aef 100644 --- a/code/modules/xenoarcheaology/effects/resurrect.dm +++ b/code/modules/xenoarcheaology/effects/resurrect.dm @@ -4,7 +4,11 @@ var/stored_life = 0 + effect_state = "pulsing" + effect_color = "#ff0000" + /datum/artifact_effect/resurrect/proc/steal_life(var/mob/living/target = null) + var/atom/holder = get_master_holder() if(!istype(target)) return 0 @@ -16,6 +20,7 @@ return 0 /datum/artifact_effect/resurrect/proc/give_life(var/mob/living/target = null) + var/atom/holder = get_master_holder() if(!istype(target)) return @@ -34,6 +39,7 @@ stored_life = 0 /datum/artifact_effect/resurrect/proc/attempt_revive(var/mob/living/L = null) + var/atom/holder = get_master_holder() spawn() if(istype(L, /mob/living/simple_mob)) var/mob/living/simple_mob/SM = L @@ -70,6 +76,7 @@ holder.visible_message("\The [H]'s eyes open in a flash of light!") /datum/artifact_effect/resurrect/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() for(var/mob/living/L in oview(effectrange, get_turf(holder))) stored_life += 4 * steal_life(L) @@ -80,6 +87,7 @@ break /datum/artifact_effect/resurrect/DoEffectAura() + var/atom/holder = get_master_holder() for(var/mob/living/L in oview(effectrange, get_turf(holder))) stored_life += steal_life(L) @@ -90,6 +98,7 @@ break /datum/artifact_effect/resurrect/DoEffectPulse() + var/atom/holder = get_master_holder() for(var/mob/living/L in oview(effectrange, get_turf(holder))) stored_life += 2 * steal_life(L) diff --git a/code/modules/xenoarcheaology/effects/roboheal.dm b/code/modules/xenoarcheaology/effects/roboheal.dm index 0052a53979..16660029b7 100644 --- a/code/modules/xenoarcheaology/effects/roboheal.dm +++ b/code/modules/xenoarcheaology/effects/roboheal.dm @@ -2,6 +2,8 @@ name = "robotic healing" var/last_message + effect_color = "#3879ad" + /datum/artifact_effect/roboheal/New() ..() effect_type = pick(EFFECT_ELECTRO, EFFECT_PARTICLE) @@ -16,6 +18,7 @@ return 1 /datum/artifact_effect/roboheal/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) @@ -28,6 +31,7 @@ return 1 /datum/artifact_effect/roboheal/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) diff --git a/code/modules/xenoarcheaology/effects/robohurt.dm b/code/modules/xenoarcheaology/effects/robohurt.dm index 8ed47a9e28..8b93e04ead 100644 --- a/code/modules/xenoarcheaology/effects/robohurt.dm +++ b/code/modules/xenoarcheaology/effects/robohurt.dm @@ -2,6 +2,8 @@ name = "robotic harm" var/last_message + effect_color = "#5432cf" + /datum/artifact_effect/robohurt/New() ..() effect_type = pick(EFFECT_ELECTRO, EFFECT_PARTICLE) @@ -16,6 +18,7 @@ return 1 /datum/artifact_effect/robohurt/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) @@ -28,6 +31,7 @@ return 1 /datum/artifact_effect/robohurt/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) diff --git a/code/modules/xenoarcheaology/effects/sleepy.dm b/code/modules/xenoarcheaology/effects/sleepy.dm index 6a0439460a..244814a1da 100644 --- a/code/modules/xenoarcheaology/effects/sleepy.dm +++ b/code/modules/xenoarcheaology/effects/sleepy.dm @@ -1,6 +1,7 @@ //todo /datum/artifact_effect/sleepy name = "sleepy" + effect_color = "#a36fa1" /datum/artifact_effect/sleepy/New() ..() @@ -20,6 +21,7 @@ return 1 /datum/artifact_effect/sleepy/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/human/H in range(src.effectrange,T)) @@ -34,6 +36,7 @@ return 1 /datum/artifact_effect/sleepy/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for(var/mob/living/carbon/human/H in range(src.effectrange, T)) diff --git a/code/modules/xenoarcheaology/effects/stun.dm b/code/modules/xenoarcheaology/effects/stun.dm index ab00465477..12ca276b93 100644 --- a/code/modules/xenoarcheaology/effects/stun.dm +++ b/code/modules/xenoarcheaology/effects/stun.dm @@ -1,5 +1,6 @@ /datum/artifact_effect/stun name = "stun" + effect_color = "#00eeff" /datum/artifact_effect/stun/New() ..() @@ -16,6 +17,7 @@ C.Stun(rand(1,10) * susceptibility) /datum/artifact_effect/stun/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/C in range(src.effectrange,T)) @@ -30,6 +32,7 @@ to_chat(C, "You feel numb.") /datum/artifact_effect/stun/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/carbon/C in range(src.effectrange,T)) diff --git a/code/modules/xenoarcheaology/effects/teleport.dm b/code/modules/xenoarcheaology/effects/teleport.dm index 36b90afd31..2c766323db 100644 --- a/code/modules/xenoarcheaology/effects/teleport.dm +++ b/code/modules/xenoarcheaology/effects/teleport.dm @@ -1,8 +1,11 @@ /datum/artifact_effect/teleport name = "teleport" effect_type = EFFECT_BLUESPACE + effect_state = "pulsing" + effect_color = "#88ffdb" /datum/artifact_effect/teleport/DoEffectTouch(var/mob/user) + var/atom/holder = get_master_holder() var/weakness = GetAnomalySusceptibility(user) if(prob(100 * weakness)) to_chat(user, "You are suddenly zapped away elsewhere!") @@ -20,6 +23,7 @@ sparks.start() /datum/artifact_effect/teleport/DoEffectAura() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/M in range(src.effectrange,T)) @@ -39,6 +43,7 @@ sparks.start() /datum/artifact_effect/teleport/DoEffectPulse() + var/atom/holder = get_master_holder() if(holder) var/turf/T = get_turf(holder) for (var/mob/living/M in range(src.effectrange, T)) diff --git a/code/modules/xenoarcheaology/effects/vampire.dm b/code/modules/xenoarcheaology/effects/vampire.dm index e5a069b935..7c6ed91a5f 100644 --- a/code/modules/xenoarcheaology/effects/vampire.dm +++ b/code/modules/xenoarcheaology/effects/vampire.dm @@ -9,7 +9,11 @@ var/charges = 0 var/list/nearby_mobs = list() + effect_state = "gravisphere" + effect_color = "#ff0000" + /datum/artifact_effect/vampire/proc/bloodcall(var/mob/living/carbon/human/M) + var/atom/holder = get_master_holder() last_bloodcall = world.time if(istype(M)) playsound(holder, pick('sound/hallucinations/wail.ogg','sound/hallucinations/veryfar_noise.ogg','sound/hallucinations/far_noise.ogg'), 50, 1, -3) @@ -23,30 +27,29 @@ B.target_turf = pick(range(1, get_turf(holder))) B.blood_DNA = list() B.blood_DNA[M.dna.unique_enzymes] = M.dna.b_type - M.vessel.remove_reagent("blood",rand(25,50)) + M.vessel.remove_reagent("blood",rand(10,30)) /datum/artifact_effect/vampire/DoEffectTouch(var/mob/user) bloodcall(user) DoEffectAura() /datum/artifact_effect/vampire/DoEffectAura() - if (nearby_mobs.len) + var/atom/holder = get_master_holder() + if(nearby_mobs.len) nearby_mobs.Cut() - var/turf/T = get_turf(holder) for(var/mob/living/L in oview(effectrange, T)) if(!L.stat && L.mind) nearby_mobs |= L - if(world.time - last_bloodcall > bloodcall_interval && nearby_mobs.len) + if(world.time - bloodcall_interval >= last_bloodcall && LAZYLEN(nearby_mobs)) var/mob/living/carbon/human/M = pick(nearby_mobs) - if(M in view(effectrange,holder) && M.health > 20) - if(prob(50)) - bloodcall(M) - holder.Beam(M, icon_state = "drainbeam", time = 1 SECOND) + if(get_dist(M, T) <= effectrange && M.health > 20) + bloodcall(M) + holder.Beam(M, icon_state = "drainbeam", time = 1 SECOND) - if(world.time - last_eat > eat_interval) + if(world.time - last_eat >= eat_interval) var/obj/effect/decal/cleanable/blood/B = locate() in range(2,holder) if(B) last_eat = world.time @@ -62,13 +65,13 @@ if(charges >= 10) charges -= 10 var/manifestation = pick(/obj/item/device/soulstone, /mob/living/simple_mob/faithless/cult/strong, /mob/living/simple_mob/creature/cult/strong, /mob/living/simple_mob/animal/space/bats/cult/strong) - new manifestation(get_turf(pick(view(1,T)))) + new manifestation(pick(RANGE_TURFS(1,T))) if(charges >= 3) if(prob(5)) charges -= 1 var/spawn_type = pick(/mob/living/simple_mob/animal/space/bats, /mob/living/simple_mob/creature, /mob/living/simple_mob/faithless) - new spawn_type(get_turf(pick(view(1,T)))) + new spawn_type(pick(RANGE_TURFS(1,T))) playsound(holder, pick('sound/hallucinations/growl1.ogg','sound/hallucinations/growl2.ogg','sound/hallucinations/growl3.ogg'), 50, 1, -3) if(charges >= 1 && nearby_mobs.len && prob(15 * nearby_mobs.len)) diff --git a/code/modules/xenoarcheaology/finds/find_spawning.dm b/code/modules/xenoarcheaology/finds/find_spawning.dm index 2b6e125855..354c160a8a 100644 --- a/code/modules/xenoarcheaology/finds/find_spawning.dm +++ b/code/modules/xenoarcheaology/finds/find_spawning.dm @@ -15,18 +15,20 @@ var/additional_desc = "" var/obj/item/weapon/new_item var/source_material = "" - var/apply_material_decorations = 1 - var/apply_image_decorations = 0 + var/apply_material_decorations = TRUE + var/apply_image_decorations = FALSE var/material_descriptor = "" - var/apply_prefix = 1 + var/apply_prefix = TRUE + + var/become_anomalous = FALSE if(prob(40)) material_descriptor = pick("rusted ","dusty ","archaic ","fragile ", "damaged", "pristine") source_material = pick("cordite","quadrinium","steel","titanium","aluminium","ferritic-alloy","plasteel","duranium") - var/talkative = 0 + var/talkative = FALSE if(prob(5)) - talkative = 1 + talkative = TRUE //for all items here: //icon_state @@ -41,7 +43,7 @@ new_item = new /obj/item/weapon/reagent_containers/glass/beaker(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "bowl" - apply_image_decorations = 1 + apply_image_decorations = TRUE if(prob(40)) new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255)) if(prob(20)) @@ -55,7 +57,7 @@ new_item = new /obj/item/weapon/reagent_containers/glass/beaker(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "urn[rand(1,2)]" - apply_image_decorations = 1 + apply_image_decorations = TRUE if(prob(20)) additional_desc = "It [pick("whispers faintly","makes a quiet roaring sound","whistles softly","thrums quietly","throbs")] if you put it to your ear." if(ARCHAEO_CUTLERY) @@ -88,7 +90,9 @@ item_type = "instrument" icon_state = "instrument" if(prob(30)) - apply_image_decorations = 1 + become_anomalous = TRUE + if(prob(30)) + apply_image_decorations = TRUE additional_desc = "[pick("You're not sure how anyone could have played this",\ "You wonder how many mouths the creator had",\ "You wonder what it sounds like",\ @@ -109,16 +113,16 @@ chance += 10 item_type = new_item.name - apply_prefix = 0 - apply_material_decorations = 0 - apply_image_decorations = 1 + apply_prefix = FALSE + apply_material_decorations = FALSE + apply_image_decorations = TRUE if(ARCHAEO_HANDCUFFS) item_type = "handcuffs" new_item = new /obj/item/weapon/handcuffs(src.loc) additional_desc = "[pick("They appear to be for securing two things together","Looks kinky","Doesn't seem like a children's toy")]." if(ARCHAEO_BEARTRAP) item_type = "[pick("wicked","evil","byzantine","dangerous")] looking [pick("device","contraption","thing","trap")]" - apply_prefix = 0 + apply_prefix = FALSE new_item = new /obj/item/weapon/beartrap(src.loc) if(prob(40)) new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255)) @@ -130,7 +134,7 @@ new_item = new /obj/item/weapon/flame/lighter(src.loc) additional_desc = "There is a tiny device attached." if(prob(30)) - apply_image_decorations = 1 + apply_image_decorations = TRUE if(ARCHAEO_BOX) item_type = "box" new_item = new /obj/item/weapon/storage/box(src.loc) @@ -142,7 +146,7 @@ new_box.max_storage_space = rand(storage_amount, storage_amount * 10) if(prob(30)) LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) - apply_image_decorations = 1 + apply_image_decorations = TRUE if(ARCHAEO_GASTANK) item_type = "[pick("cylinder","tank","chamber")]" if(prob(25)) @@ -163,12 +167,12 @@ new_item = new /obj/item/weapon/tool/screwdriver(src.loc) if(prob(40)) new_item.color = rgb(rand(0,255),rand(0,255),rand(0,255)) - apply_image_decorations = 1 + apply_image_decorations = TRUE additional_desc = "[pick("It doesn't look safe.",\ "You wonder what it was used for",\ "There appear to be [pick("dark red","dark purple","dark green","dark blue")] stains on it")]." if(ARCHAEO_METAL) - apply_material_decorations = 0 + apply_material_decorations = FALSE var/list/possible_spawns = list() possible_spawns += /obj/item/stack/material/steel possible_spawns += /obj/item/stack/material/plasteel @@ -193,9 +197,11 @@ icon = 'icons/obj/xenoarchaeology.dmi' icon_state = "pen1" LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) - apply_image_decorations = 1 + apply_image_decorations = TRUE if(ARCHAEO_CRYSTAL) - apply_prefix = 0 + if(prob(40)) + become_anomalous = TRUE + apply_prefix = FALSE if(prob(25)) icon = 'icons/obj/xenoarchaeology.dmi' item_type = "smooth green crystal" @@ -210,9 +216,9 @@ icon_state = "changerock" additional_desc = pick("It shines faintly as it catches the light.","It appears to have a faint inner glow.","It seems to draw you inward as you look it at.","Something twinkles faintly as you look at it.","It's mesmerizing to behold.") - apply_material_decorations = 0 + apply_material_decorations = FALSE if(prob(10)) - apply_image_decorations = 1 + apply_image_decorations = TRUE if(prob(25)) new_item = new /obj/item/device/soulstone(src.loc) new_item.icon = 'icons/obj/xenoarchaeology.dmi' @@ -220,18 +226,18 @@ LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) if(ARCHAEO_CULTBLADE) //cultblade - apply_prefix = 0 + apply_prefix = FALSE new_item = new /obj/item/weapon/melee/cultblade(src.loc) - apply_material_decorations = 0 - apply_image_decorations = 0 + apply_material_decorations = FALSE + apply_image_decorations = FALSE if(ARCHAEO_TELEBEACON) new_item = new /obj/item/device/radio/beacon(src.loc) - talkative = 0 + talkative = FALSE new_item.icon = 'icons/obj/xenoarchaeology.dmi' new_item.icon_state = "unknown[rand(1,4)]" new_item.desc = "" if(ARCHAEO_CLAYMORE) - apply_prefix = 0 + apply_prefix = FALSE new_item = new /obj/item/weapon/material/sword(src.loc) new_item.force = 10 new_item.name = pick("great-sword","claymore","longsword","broadsword","shortsword","gladius") @@ -241,7 +247,7 @@ new_item.icon_state = "blade1" if(ARCHAEO_CULTROBES) //arcane clothing - apply_prefix = 0 + apply_prefix = FALSE var/list/possible_spawns = list(/obj/item/clothing/head/culthood, /obj/item/clothing/head/culthood/magus, /obj/item/clothing/head/culthood/alt, @@ -252,25 +258,28 @@ LAZYSET(new_item.origin_tech, TECH_ARCANE, 1) if(ARCHAEO_SOULSTONE) //soulstone - apply_prefix = 0 + become_anomalous = TRUE + apply_prefix = FALSE new_item = new /obj/item/device/soulstone(src.loc) item_type = new_item.name - apply_material_decorations = 0 + apply_material_decorations = FALSE LAZYSET(new_item.origin_tech, TECH_ARCANE, 2) if(ARCHAEO_SHARD) if(prob(50)) new_item = new /obj/item/weapon/material/shard(src.loc) else new_item = new /obj/item/weapon/material/shard/phoron(src.loc) - apply_prefix = 0 - apply_image_decorations = 0 - apply_material_decorations = 0 + apply_prefix = FALSE + apply_image_decorations = FALSE + apply_material_decorations = FALSE if(ARCHAEO_RODS) - apply_prefix = 0 + apply_prefix = FALSE new_item = new /obj/item/stack/rods(src.loc) - apply_image_decorations = 0 - apply_material_decorations = 0 + apply_image_decorations = FALSE + apply_material_decorations = FALSE if(ARCHAEO_STOCKPARTS) + if(prob(30)) + become_anomalous = TRUE var/list/possible_spawns = typesof(/obj/item/weapon/stock_parts) possible_spawns -= /obj/item/weapon/stock_parts possible_spawns -= /obj/item/weapon/stock_parts/subspace @@ -278,9 +287,9 @@ var/new_type = pick(possible_spawns) new_item = new new_type(src.loc) item_type = new_item.name - apply_material_decorations = 0 + apply_material_decorations = FALSE if(ARCHAEO_KATANA) - apply_prefix = 0 + apply_prefix = FALSE new_item = new /obj/item/weapon/material/sword/katana(src.loc) new_item.force = 10 new_item.name = "katana" @@ -349,9 +358,11 @@ item_type = "gun" if(ARCHAEO_UNKNOWN) + if(prob(20)) + become_anomalous = TRUE //completely unknown alien device if(prob(50)) - apply_image_decorations = 0 + apply_image_decorations = FALSE if(ARCHAEO_FOSSIL) //fossil bone/skull //new_item = new /obj/item/weapon/fossil/base(src.loc) @@ -362,30 +373,30 @@ var/spawn_type = pickweight(candidates) new_item = new spawn_type(src.loc) - apply_prefix = 0 + apply_prefix = FALSE additional_desc = "A fossilised part of an alien, long dead." - apply_image_decorations = 0 - apply_material_decorations = 0 + apply_image_decorations = FALSE + apply_material_decorations = FALSE if(ARCHAEO_SHELL) //fossil shell new_item = new /obj/item/weapon/fossil/shell(src.loc) - apply_prefix = 0 + apply_prefix = FALSE additional_desc = "A fossilised, pre-Stygian alien crustacean." - apply_image_decorations = 0 - apply_material_decorations = 0 + apply_image_decorations = FALSE + apply_material_decorations = FALSE if(prob(10)) - apply_image_decorations = 1 + apply_image_decorations = TRUE if(ARCHAEO_PLANT) //fossil plant new_item = new /obj/item/weapon/fossil/plant(src.loc) item_type = new_item.name additional_desc = "A fossilised shred of alien plant matter." - apply_image_decorations = 0 - apply_material_decorations = 0 - apply_prefix = 0 + apply_image_decorations = FALSE + apply_material_decorations = FALSE + apply_prefix = FALSE if(ARCHAEO_REMAINS_HUMANOID) //humanoid remains - apply_prefix = 0 + apply_prefix = FALSE item_type = "humanoid [pick("remains","skeleton")]" icon = 'icons/effects/blood.dmi' icon_state = "remains" @@ -396,11 +407,11 @@ "The bones are scored by numerous burns and partially melted.",\ "The are battered and broken, in some cases less than splinters are left.",\ "The mouth is wide open in a death rictus, the victim would appear to have died screaming.") - apply_image_decorations = 0 - apply_material_decorations = 0 + apply_image_decorations = FALSE + apply_material_decorations = FALSE if(ARCHAEO_REMAINS_ROBOT) //robot remains - apply_prefix = 0 + apply_prefix = FALSE item_type = "[pick("mechanical","robotic","cyborg")] [pick("remains","chassis","debris")]" icon = 'icons/mob/robots.dmi' icon_state = "remainsrobot" @@ -411,11 +422,11 @@ "The chassis is scored by numerous burns and partially melted.",\ "The chassis is battered and broken, in some cases only chunks of metal are left.",\ "A pile of wires and crap metal that looks vaguely robotic.") - apply_image_decorations = 0 - apply_material_decorations = 0 + apply_image_decorations = FALSE + apply_material_decorations = FALSE if(ARCHAEO_REMAINS_XENO) //xenos remains - apply_prefix = 0 + apply_prefix = FALSE item_type = "alien [pick("remains","skeleton")]" icon = 'icons/effects/blood.dmi' icon_state = "remainsxeno" @@ -427,8 +438,8 @@ "The are battered and broken, in some cases less than splinters are left.",\ "This creature would have been twisted and monstrous when it was alive.",\ "It doesn't look human.") - apply_image_decorations = 0 - apply_material_decorations = 0 + apply_image_decorations = FALSE + apply_material_decorations = FALSE if(ARCHAEO_GASMASK) //gas mask if(prob(25)) @@ -551,7 +562,7 @@ var/obj/item/weapon/reagent_containers/syringe/S = new_item S.volume = 30 - //If S hasn't initialized yet, S.reagents will be null. + //If S hasn't initialized yet, S.reagents will be null. //However, in that case Initialize will set the maximum volume to the volume for us, so we don't need to do anything. S.reagents?.maximum_volume = 30 @@ -680,6 +691,9 @@ new_item.origin_tech[TECH_ARCANE] += 1 new_item.origin_tech[TECH_PRECURSOR] += 1 + if(become_anomalous) + new_item.become_anomalous() + var/turf/simulated/mineral/T = get_turf(new_item) if(istype(T)) T.last_find = new_item @@ -691,3 +705,6 @@ LAZYINITLIST(origin_tech) origin_tech[TECH_ARCANE] += 1 origin_tech[TECH_PRECURSOR] += 1 + + if(become_anomalous) + become_anomalous() diff --git a/code/modules/xenoarcheaology/tools/artifact_analyser.dm b/code/modules/xenoarcheaology/tools/artifact_analyser.dm index 44afa6ea2c..32259e774a 100644 --- a/code/modules/xenoarcheaology/tools/artifact_analyser.dm +++ b/code/modules/xenoarcheaology/tools/artifact_analyser.dm @@ -138,13 +138,37 @@ var/obj/machinery/artifact/A = scanned_obj var/out = "Anomalous alien device - composed of an unknown alloy.

" - if(A.my_effect) - out += A.my_effect.getDescription() + var/datum/component/artifact_master/AMast = A.artifact_master + var/datum/artifact_effect/AEff = AMast.get_primary() - if(A.secondary_effect && A.secondary_effect.activated) + out += AEff.getDescription() + + if(AMast.my_effects.len > 1) out += "

Internal scans indicate ongoing secondary activity operating independently from primary systems.

" - out += A.secondary_effect.getDescription() + for(var/datum/artifact_effect/my_effect in A.artifact_master.my_effects - AEff) + + if(my_effect) + out += my_effect.getDescription() return out else + + var/datum/component/artifact_master/ScannedMaster = scanned_obj.GetComponent(/datum/component/artifact_master) + + if(istype(ScannedMaster)) + var/out = "Anomalous reality warp - Object has been altered to disobey known laws of physics.

" + + var/datum/artifact_effect/AEff = ScannedMaster.get_primary() + + out += AEff.getDescription() + + if(ScannedMaster.my_effects.len > 1) + out += "

Resonant scans indicate asynchronous reality modulation:

" + for(var/datum/artifact_effect/my_effect in ScannedMaster.my_effects - AEff) + + if(my_effect) + out += my_effect.getDescription() + + return out + return "[scanned_obj.name] - mundane application." diff --git a/code/modules/xenoarcheaology/tools/artifact_harvester.dm b/code/modules/xenoarcheaology/tools/artifact_harvester.dm index 05aa87442d..03f0fdb484 100644 --- a/code/modules/xenoarcheaology/tools/artifact_harvester.dm +++ b/code/modules/xenoarcheaology/tools/artifact_harvester.dm @@ -148,10 +148,12 @@ cur_artifact = analysed //if both effects are active, we can't harvest either - if(cur_artifact.my_effect && cur_artifact.my_effect.activated && cur_artifact.secondary_effect && cur_artifact.secondary_effect.activated) + var/list/active_effects = cur_artifact.artifact_master.get_active_effects() + + if(active_effects.len > 1) atom_say("Cannot harvest. Source is emitting conflicting energy signatures.") return - if(!cur_artifact.my_effect.activated && !(cur_artifact.secondary_effect && cur_artifact.secondary_effect.activated)) + else if(!active_effects.len) atom_say("Cannot harvest. No energy emitting from source.") return @@ -163,34 +165,24 @@ // var/datum/artifact_effect/source_effect + var/datum/artifact_effect/active_effect = active_effects[1] //if we already have charge in the battery, we can only recharge it from the source artifact if(inserted_battery.stored_charge > 0) var/battery_matches_primary_id = 0 - if(inserted_battery.battery_effect && inserted_battery.battery_effect.artifact_id == cur_artifact.my_effect.artifact_id) + if(inserted_battery.battery_effect && inserted_battery.battery_effect.artifact_id == cur_artifact.artifact_master.artifact_id) battery_matches_primary_id = 1 - if(battery_matches_primary_id && cur_artifact.my_effect.activated) + if(battery_matches_primary_id && active_effect.activated) //we're good to recharge the primary effect! - source_effect = cur_artifact.my_effect - - var/battery_matches_secondary_id = 0 - if(inserted_battery.battery_effect && inserted_battery.battery_effect.artifact_id == cur_artifact.secondary_effect.artifact_id) - battery_matches_secondary_id = 1 - if(battery_matches_secondary_id && cur_artifact.secondary_effect.activated) - //we're good to recharge the secondary effect! - source_effect = cur_artifact.secondary_effect + source_effect = active_effect if(!source_effect) atom_say("Cannot harvest. Battery is charged with a different energy signature.") else //we're good to charge either - if(cur_artifact.my_effect.activated) + if(active_effect.activated) //charge the primary effect - source_effect = cur_artifact.my_effect - - else if(cur_artifact.secondary_effect.activated) - //charge the secondary effect - source_effect = cur_artifact.secondary_effect + source_effect = active_effect if(source_effect) @@ -258,3 +250,134 @@ inserted_battery.battery_effect.ToggleActivate() src.visible_message("[name] states, \"Battery dump completed.\"") icon_state = "incubator" + +/obj/machinery/artifact_harvester/Topic(href, href_list) + + if (href_list["harvest"]) + if(!inserted_battery) + src.visible_message("[src] states, \"Cannot harvest. No battery inserted.\"") + + else if(inserted_battery.stored_charge >= inserted_battery.capacity) + src.visible_message("[src] states, \"Cannot harvest. battery is full.\"") + + else + + //locate artifact on analysis pad + cur_artifact = null + var/articount = 0 + var/obj/machinery/artifact/analysed + for(var/obj/machinery/artifact/A in get_turf(owned_scanner)) + analysed = A + articount++ + + if(articount <= 0) + var/message = "[src] states, \"Cannot harvest. No noteworthy energy signature isolated.\"" + src.visible_message(message) + + else if(analysed && analysed.being_used) + src.visible_message("[src] states, \"Cannot harvest. Source already being harvested.\"") + + else + if(articount > 1) + state("Cannot harvest. Too many artifacts on the pad.") + else if(analysed) + cur_artifact = analysed + + //if both effects are active, we can't harvest either + var/list/active_effects = cur_artifact.artifact_master.get_active_effects() + + if(active_effects.len > 1) + src.visible_message("[src] states, \"Cannot harvest. Source is emitting conflicting energy signatures.\"") + else if(!active_effects.len) + src.visible_message("[src] states, \"Cannot harvest. No energy emitting from source.\"") + + else + //see if we can clear out an old effect + //delete it when the ids match to account for duplicate ids having different effects + if(inserted_battery.battery_effect && inserted_battery.stored_charge <= 0) + qdel(inserted_battery.battery_effect) + inserted_battery.battery_effect = null + + // + var/datum/artifact_effect/source_effect + var/datum/artifact_effect/active_effect = active_effects[1] + + //if we already have charge in the battery, we can only recharge it from the source artifact + if(inserted_battery.stored_charge > 0) + var/battery_matches_primary_id = 0 + if(inserted_battery.battery_effect && inserted_battery.battery_effect.artifact_id == cur_artifact.artifact_master.artifact_id) + battery_matches_primary_id = 1 + if(battery_matches_primary_id && active_effect.activated) + //we're good to recharge the primary effect! + source_effect = active_effect + + if(!source_effect) + src.visible_message("[src] states, \"Cannot harvest. Battery is charged with a different energy signature.\"") + else + //we're good to charge either + if(active_effect.activated) + //charge the primary effect + source_effect = active_effect + + if(source_effect) + harvesting = 1 + update_use_power(USE_POWER_ACTIVE) + cur_artifact.anchored = 1 + cur_artifact.being_used = 1 + icon_state = "incubator_on" + var/message = "[src] states, \"Beginning energy harvesting.\"" + src.visible_message(message) + last_process = world.time + + //duplicate the artifact's effect datum + if(!inserted_battery.battery_effect) + var/effecttype = source_effect.type + var/datum/artifact_effect/E = new effecttype(inserted_battery) + + //duplicate it's unique settings + for(var/varname in list("chargelevelmax","artifact_id","effect","effectrange","trigger")) + E.vars[varname] = source_effect.vars[varname] + + //copy the new datum into the battery + inserted_battery.battery_effect = E + inserted_battery.stored_charge = 0 + + if (href_list["stopharvest"]) + if(harvesting) + if(harvesting < 0 && inserted_battery.battery_effect && inserted_battery.battery_effect.activated) + inserted_battery.battery_effect.ToggleActivate() + harvesting = 0 + cur_artifact.anchored = 0 + cur_artifact.being_used = 0 + cur_artifact = null + src.visible_message("[name] states, \"Energy harvesting interrupted.\"") + icon_state = "incubator" + + if (href_list["ejectbattery"]) + src.inserted_battery.loc = src.loc + src.inserted_battery = null + + if (href_list["drainbattery"]) + if(inserted_battery) + if(inserted_battery.battery_effect && inserted_battery.stored_charge > 0) + if(alert("This action will dump all charge, safety gear is recommended before proceeding","Warning","Continue","Cancel")) + if(!inserted_battery.battery_effect.activated) + inserted_battery.battery_effect.ToggleActivate(1) + last_process = world.time + harvesting = -1 + update_use_power(USE_POWER_ACTIVE) + icon_state = "incubator_on" + var/message = "[src] states, \"Warning, battery charge dump commencing.\"" + src.visible_message(message) + else + var/message = "[src] states, \"Cannot dump energy. Battery is drained of charge already.\"" + src.visible_message(message) + else + var/message = "[src] states, \"Cannot dump energy. No battery inserted.\"" + src.visible_message(message) + + if(href_list["close"]) + usr << browse(null, "window=artharvester") + usr.unset_machine(src) + + updateDialog() diff --git a/code/modules/xenoarcheaology/tools/suspension_generator.dm b/code/modules/xenoarcheaology/tools/suspension_generator.dm index 08d41fc121..2f2c87954e 100644 --- a/code/modules/xenoarcheaology/tools/suspension_generator.dm +++ b/code/modules/xenoarcheaology/tools/suspension_generator.dm @@ -13,6 +13,15 @@ /obj/machinery/suspension_gen/Initialize() . = ..() cell = new /obj/item/weapon/cell/high(src) + power_change() + +/obj/machinery/suspension_gen/power_change() + var/oldstat = stat + if(cell) + stat &= ~NOPOWER + else + stat |= NOPOWER + return (stat != oldstat) /obj/machinery/suspension_gen/process() if(suspension_field) @@ -56,7 +65,7 @@ /obj/machinery/suspension_gen/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state) var/list/data = ..() - + data["cell"] = cell data["cellCharge"] = cell?.charge data["cellMaxCharge"] = cell?.maxcharge diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt index 1a4e4a0735..e955b0ef1b 100644 --- a/config/alienwhitelist.txt +++ b/config/alienwhitelist.txt @@ -1,3 +1,4 @@ +1062aphelion - Protean admiraldragon - Vox aetherelemental - Daemon alphaprime1 - Protean @@ -8,6 +9,7 @@ arokha - Protean aruis - Diona aruis - Protean aruis - Xenochimera +auraribbon - Black-Eyed Shadekin azmodan412 - Xenochimera beyondmylife - Protean bothnevarbackwards - Diona @@ -19,34 +21,42 @@ chargae - Protean chemlight - Xenochimera chillyfang - Black-Eyed Shadekin comradenitro - Protean +coolcrow420 - Black-Eyed Shadekin crossexonar - Protean +cryohydra - Protean detectivegoogle - Protean +digi5 - Protean digitalsquirrel95 - Black-Eyed Shadekin digitalsquirrel95 - Protean draycu - Vox +falloutdog3 - Black-Eyed Shadekin flaktual - Vox flurriee - Protean funnyman2003 - Xenochimera greennyy - Protean h0lysquirr3l - Protean hawkerthegreat - Vox +heroman3003 - Xenochimera hollifex - Diona huenererschrecker - Xenochimera +hunterbirk - Protean hunterbirk - Xenochimera idcaboutaname - Protean inuzari - Diona jademanique - Black-Eyed Shadekin +jademanique - Teppi jademanique - Xenochimera joltze - Black-Eyed Shadekin khanivore - Protean killjaden - Protean ktccd - Diona -liache - Black-Eyed Shadekin lillianfyre - Xenochimera lizehrd - Xenochimera lordlag - Black-Eyed Shadekin +lorgenz - Protean losstinspess - Xenochimera magpiemayhem - Vox +magpiemayhem - Xenochimera marcobarko - Protean mewchild - Diona mewchild - Vox @@ -56,12 +66,14 @@ natje - Xenochimera nerdass - Protean newyorks - Protean oneofmanynames385 - Protean +ontejbjoav - Black-Eyed Shadekin ontejbjoav - Diona oreganovulgaris - Xenochimera owwy - Black-Eyed Shadekin oxenfree - Protean paradoxspace - Xenochimera pastelprincedan - Black-Eyed Shadekin +pastelprincedan - Protean pearlprophet - Protean pemdesos - Protean phoenixx0 - Vox @@ -76,6 +88,7 @@ rubyflamewing - Protean rykkastormheart - Xenochimera ryumi - Protean ryumi - Xenochimera +satinisle - Black-Eyed Shadekin scoutisafolflol - Xenochimera seiga - Vox sepulchre - Vox @@ -85,9 +98,9 @@ silvertalismen - Xenochimera skylarks - Black-Eyed Shadekin spirit1299 - Black-Eyed Shadekin stackerrobot - Protean -stobarico - Protean storesund97 - Protean syzygyrior - Black-Eyed Shadekin +tankthebirb - Black-Eyed Shadekin tastypred - Black-Eyed Shadekin tastypred - Protean tastypred - Xenochimera @@ -98,10 +111,13 @@ thedavestdave - Protean timidvi - Diona trifireblade - Protean trikonei - Protean +umbraferros - Black-Eyed Shadekin +umbraferros - Protean umbrenos - Black-Eyed Shadekin varonis - Xenochimera verkister - Xenochimera verysoft - Black-Eyed Shadekin +verysoft - Teppi vitoras - Protean voidalynx - Black-Eyed Shadekin voidalynx - Protean @@ -110,6 +126,8 @@ xioen - Diona xioen - Protean xioen - Xenochimera xonkon - Protean +yecrowbarman - Protean +yeehawguvnah - Protean zalvine - Shadekin Empathy zammyman215 - Vox -zeracyfr - Xenochimera \ No newline at end of file +zeracyfr - Xenochimera diff --git a/config/jobwhitelist.txt b/config/jobwhitelist.txt index 0c848472a4..b547a78176 100644 --- a/config/jobwhitelist.txt +++ b/config/jobwhitelist.txt @@ -1,20 +1,22 @@ # Job whitelist in format ckey - jobname # Like arokha - clown -awkwarddryad - mime akram - clown amshaegaar - mime +auraribbon - clown +awkwarddryad - mime +chargae - mime +h0lysquirr3l - clown +joey4298 - mime +pastelprincedan - mime +pastelprincedan - clown +radishfriend - clown seiga - mime +sgtryder - mime +siennaathens - clown silvertalismen - clown suicidalpickles - mime -joey4298 - mime -whiskyrose - clown tinybear16 - clown -chargae - mime -verkister - clown -H0lySquirr3l - clown -sgtryder - mime tygertac - clown -radishfriend - clown -siennaathens - clown -pastelprincedan - mime -pastelprincedan - clown \ No newline at end of file +verkister - clown +whiskyrose - clown +yecrowbarman - mime \ No newline at end of file diff --git a/icons/_nanomaps/sd_deck1.png b/icons/_nanomaps/sd_deck1.png index 6b2be044b8..835180e331 100644 Binary files a/icons/_nanomaps/sd_deck1.png and b/icons/_nanomaps/sd_deck1.png differ diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png index e8510b3a4d..1ad2755b7c 100644 Binary files a/icons/_nanomaps/tether_nanomap_z1.png and b/icons/_nanomaps/tether_nanomap_z1.png differ diff --git a/icons/_nanomaps/tether_nanomap_z2.png b/icons/_nanomaps/tether_nanomap_z2.png index a2d478b413..d30a99906b 100644 Binary files a/icons/_nanomaps/tether_nanomap_z2.png and b/icons/_nanomaps/tether_nanomap_z2.png differ diff --git a/icons/_nanomaps/tether_nanomap_z3.png b/icons/_nanomaps/tether_nanomap_z3.png index 31ccab1e4f..3c55412116 100644 Binary files a/icons/_nanomaps/tether_nanomap_z3.png and b/icons/_nanomaps/tether_nanomap_z3.png differ diff --git a/icons/_nanomaps/tether_nanomap_z4.png b/icons/_nanomaps/tether_nanomap_z4.png index 510d22b3d6..c2623219ee 100644 Binary files a/icons/_nanomaps/tether_nanomap_z4.png and b/icons/_nanomaps/tether_nanomap_z4.png differ diff --git a/icons/_nanomaps/tether_nanomap_z5.png b/icons/_nanomaps/tether_nanomap_z5.png index 6a368871fd..0e85f1c55a 100644 Binary files a/icons/_nanomaps/tether_nanomap_z5.png and b/icons/_nanomaps/tether_nanomap_z5.png differ diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi index 9c51533b02..766a661e79 100644 Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ diff --git a/icons/inventory/accessory/item_vr.dmi b/icons/inventory/accessory/item_vr.dmi index c39fad3292..2f4624f1cf 100644 Binary files a/icons/inventory/accessory/item_vr.dmi and b/icons/inventory/accessory/item_vr.dmi differ diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi index dcf3765fe4..b6e325e2d8 100644 Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ diff --git a/icons/inventory/back/item_vr.dmi b/icons/inventory/back/item_vr.dmi index 942813b127..cbeb1b0bc8 100644 Binary files a/icons/inventory/back/item_vr.dmi and b/icons/inventory/back/item_vr.dmi differ diff --git a/icons/inventory/back/mob_vr.dmi b/icons/inventory/back/mob_vr.dmi index bfede208b8..62b4e68d05 100644 Binary files a/icons/inventory/back/mob_vr.dmi and b/icons/inventory/back/mob_vr.dmi differ diff --git a/icons/inventory/belt/item.dmi b/icons/inventory/belt/item.dmi index 8c32c4552b..bde59b458b 100644 Binary files a/icons/inventory/belt/item.dmi and b/icons/inventory/belt/item.dmi differ diff --git a/icons/inventory/belt/mob.dmi b/icons/inventory/belt/mob.dmi index 25de974858..a8e2aaacd7 100644 Binary files a/icons/inventory/belt/mob.dmi and b/icons/inventory/belt/mob.dmi differ diff --git a/icons/inventory/belt/mob_teshari.dmi b/icons/inventory/belt/mob_teshari.dmi index fa68573c10..54741b82c0 100644 Binary files a/icons/inventory/belt/mob_teshari.dmi and b/icons/inventory/belt/mob_teshari.dmi differ diff --git a/icons/inventory/ears/mob.dmi b/icons/inventory/ears/mob.dmi index 174ed17469..95ec0e9c8a 100644 Binary files a/icons/inventory/ears/mob.dmi and b/icons/inventory/ears/mob.dmi differ diff --git a/icons/inventory/eyes/item.dmi b/icons/inventory/eyes/item.dmi index bcd48ade6b..a465f414c3 100644 Binary files a/icons/inventory/eyes/item.dmi and b/icons/inventory/eyes/item.dmi differ diff --git a/icons/inventory/eyes/mob.dmi b/icons/inventory/eyes/mob.dmi index 1d4e1fe2ca..f2fdd8a45f 100644 Binary files a/icons/inventory/eyes/mob.dmi and b/icons/inventory/eyes/mob.dmi differ diff --git a/icons/inventory/face/item.dmi b/icons/inventory/face/item.dmi index 0d18ec906f..fb8c950859 100644 Binary files a/icons/inventory/face/item.dmi and b/icons/inventory/face/item.dmi differ diff --git a/icons/inventory/face/mob.dmi b/icons/inventory/face/mob.dmi index e7e5626fde..83095f8a10 100644 Binary files a/icons/inventory/face/mob.dmi and b/icons/inventory/face/mob.dmi differ diff --git a/icons/inventory/feet/item.dmi b/icons/inventory/feet/item.dmi index 94c360ec2f..5da36d908a 100644 Binary files a/icons/inventory/feet/item.dmi and b/icons/inventory/feet/item.dmi differ diff --git a/icons/inventory/feet/mob.dmi b/icons/inventory/feet/mob.dmi index 702111404f..f89178cc90 100644 Binary files a/icons/inventory/feet/mob.dmi and b/icons/inventory/feet/mob.dmi differ diff --git a/icons/inventory/hands/item_vr.dmi b/icons/inventory/hands/item_vr.dmi index 749d4df189..302f4be618 100644 Binary files a/icons/inventory/hands/item_vr.dmi and b/icons/inventory/hands/item_vr.dmi differ diff --git a/icons/inventory/hands/mob_vr.dmi b/icons/inventory/hands/mob_vr.dmi index 3a8806e48c..8aed1c166d 100644 Binary files a/icons/inventory/hands/mob_vr.dmi and b/icons/inventory/hands/mob_vr.dmi differ diff --git a/icons/inventory/hands/mob_vr_teshari.dmi b/icons/inventory/hands/mob_vr_teshari.dmi new file mode 100644 index 0000000000..2d79a8ac14 Binary files /dev/null and b/icons/inventory/hands/mob_vr_teshari.dmi differ diff --git a/icons/inventory/hands/mob_vr_vox.dmi b/icons/inventory/hands/mob_vr_vox.dmi new file mode 100644 index 0000000000..405ce4b76f Binary files /dev/null and b/icons/inventory/hands/mob_vr_vox.dmi differ diff --git a/icons/inventory/hands/mob_vr_werebeast.dmi b/icons/inventory/hands/mob_vr_werebeast.dmi index 7b14f5bf96..f117406623 100644 Binary files a/icons/inventory/hands/mob_vr_werebeast.dmi and b/icons/inventory/hands/mob_vr_werebeast.dmi differ diff --git a/icons/inventory/head/item.dmi b/icons/inventory/head/item.dmi index 3d4ec81121..76b8118409 100644 Binary files a/icons/inventory/head/item.dmi and b/icons/inventory/head/item.dmi differ diff --git a/icons/inventory/head/item_skrell.dmi b/icons/inventory/head/item_skrell.dmi index 3977261932..86844d8526 100644 Binary files a/icons/inventory/head/item_skrell.dmi and b/icons/inventory/head/item_skrell.dmi differ diff --git a/icons/inventory/head/item_tajaran.dmi b/icons/inventory/head/item_tajaran.dmi index b4fd4241e0..b649db2403 100644 Binary files a/icons/inventory/head/item_tajaran.dmi and b/icons/inventory/head/item_tajaran.dmi differ diff --git a/icons/inventory/head/item_unathi.dmi b/icons/inventory/head/item_unathi.dmi index a3a6bf1fff..96ae1725cd 100644 Binary files a/icons/inventory/head/item_unathi.dmi and b/icons/inventory/head/item_unathi.dmi differ diff --git a/icons/inventory/head/item_vr.dmi b/icons/inventory/head/item_vr.dmi index 1f298898de..54a988a2b7 100644 Binary files a/icons/inventory/head/item_vr.dmi and b/icons/inventory/head/item_vr.dmi differ diff --git a/icons/inventory/head/item_vr_akula.dmi b/icons/inventory/head/item_vr_akula.dmi index 3fd5294057..cf2ea23141 100644 Binary files a/icons/inventory/head/item_vr_akula.dmi and b/icons/inventory/head/item_vr_akula.dmi differ diff --git a/icons/inventory/head/item_vr_sergal.dmi b/icons/inventory/head/item_vr_sergal.dmi index 48908b9e39..e9536d2ecc 100644 Binary files a/icons/inventory/head/item_vr_sergal.dmi and b/icons/inventory/head/item_vr_sergal.dmi differ diff --git a/icons/inventory/head/item_vr_vulpkanin.dmi b/icons/inventory/head/item_vr_vulpkanin.dmi index dce35a0549..c3be906c44 100644 Binary files a/icons/inventory/head/item_vr_vulpkanin.dmi and b/icons/inventory/head/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/head/mob.dmi b/icons/inventory/head/mob.dmi index 045b311269..0917a414bd 100644 Binary files a/icons/inventory/head/mob.dmi and b/icons/inventory/head/mob.dmi differ diff --git a/icons/inventory/head/mob_skrell.dmi b/icons/inventory/head/mob_skrell.dmi index e862a0730e..ab3267b937 100644 Binary files a/icons/inventory/head/mob_skrell.dmi and b/icons/inventory/head/mob_skrell.dmi differ diff --git a/icons/inventory/head/mob_tajaran.dmi b/icons/inventory/head/mob_tajaran.dmi index 6493b9948f..3527c445b7 100644 Binary files a/icons/inventory/head/mob_tajaran.dmi and b/icons/inventory/head/mob_tajaran.dmi differ diff --git a/icons/inventory/head/mob_unathi.dmi b/icons/inventory/head/mob_unathi.dmi index c48827c6bf..d78cf385aa 100644 Binary files a/icons/inventory/head/mob_unathi.dmi and b/icons/inventory/head/mob_unathi.dmi differ diff --git a/icons/inventory/head/mob_vr_akula.dmi b/icons/inventory/head/mob_vr_akula.dmi index a952c48923..6ea289d7f7 100644 Binary files a/icons/inventory/head/mob_vr_akula.dmi and b/icons/inventory/head/mob_vr_akula.dmi differ diff --git a/icons/inventory/head/mob_vr_sergal.dmi b/icons/inventory/head/mob_vr_sergal.dmi index d1c60634b2..eb67a6dc5c 100644 Binary files a/icons/inventory/head/mob_vr_sergal.dmi and b/icons/inventory/head/mob_vr_sergal.dmi differ diff --git a/icons/inventory/head/mob_vr_vulpkanin.dmi b/icons/inventory/head/mob_vr_vulpkanin.dmi index 902887853f..d829c51711 100644 Binary files a/icons/inventory/head/mob_vr_vulpkanin.dmi and b/icons/inventory/head/mob_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/item.dmi b/icons/inventory/suit/item.dmi index beb1f9c3a7..e5d75cd19e 100644 Binary files a/icons/inventory/suit/item.dmi and b/icons/inventory/suit/item.dmi differ diff --git a/icons/inventory/suit/item_skrell.dmi b/icons/inventory/suit/item_skrell.dmi index d0ac340426..6e7e1a49f5 100644 Binary files a/icons/inventory/suit/item_skrell.dmi and b/icons/inventory/suit/item_skrell.dmi differ diff --git a/icons/inventory/suit/item_tajaran.dmi b/icons/inventory/suit/item_tajaran.dmi index 6b12d49204..1b36db164d 100644 Binary files a/icons/inventory/suit/item_tajaran.dmi and b/icons/inventory/suit/item_tajaran.dmi differ diff --git a/icons/inventory/suit/item_unathi.dmi b/icons/inventory/suit/item_unathi.dmi index e9870c4f97..d99bc1a683 100644 Binary files a/icons/inventory/suit/item_unathi.dmi and b/icons/inventory/suit/item_unathi.dmi differ diff --git a/icons/inventory/suit/item_vr.dmi b/icons/inventory/suit/item_vr.dmi index 30fc466955..0261f8b6a3 100644 Binary files a/icons/inventory/suit/item_vr.dmi and b/icons/inventory/suit/item_vr.dmi differ diff --git a/icons/inventory/suit/item_vr_akula.dmi b/icons/inventory/suit/item_vr_akula.dmi index 4804ce6e4a..1cc43648d4 100644 Binary files a/icons/inventory/suit/item_vr_akula.dmi and b/icons/inventory/suit/item_vr_akula.dmi differ diff --git a/icons/inventory/suit/item_vr_sergal.dmi b/icons/inventory/suit/item_vr_sergal.dmi index 1c30a0b6af..2af20ae433 100644 Binary files a/icons/inventory/suit/item_vr_sergal.dmi and b/icons/inventory/suit/item_vr_sergal.dmi differ diff --git a/icons/inventory/suit/item_vr_vulpkanin.dmi b/icons/inventory/suit/item_vr_vulpkanin.dmi index 92b5f1fc06..6dbafa8c48 100644 Binary files a/icons/inventory/suit/item_vr_vulpkanin.dmi and b/icons/inventory/suit/item_vr_vulpkanin.dmi differ diff --git a/icons/inventory/suit/mob.dmi b/icons/inventory/suit/mob.dmi index a313002203..0eb7b2b6e1 100644 Binary files a/icons/inventory/suit/mob.dmi and b/icons/inventory/suit/mob.dmi differ diff --git a/icons/inventory/suit/mob_skrell.dmi b/icons/inventory/suit/mob_skrell.dmi index 45b47bb1df..6e369c2071 100644 Binary files a/icons/inventory/suit/mob_skrell.dmi and b/icons/inventory/suit/mob_skrell.dmi differ diff --git a/icons/inventory/suit/mob_tajaran.dmi b/icons/inventory/suit/mob_tajaran.dmi index 22afb1bd85..0ae85bd0c4 100644 Binary files a/icons/inventory/suit/mob_tajaran.dmi and b/icons/inventory/suit/mob_tajaran.dmi differ diff --git a/icons/inventory/suit/mob_unathi.dmi b/icons/inventory/suit/mob_unathi.dmi index 1fd3aaba97..1926142454 100644 Binary files a/icons/inventory/suit/mob_unathi.dmi and b/icons/inventory/suit/mob_unathi.dmi differ diff --git a/icons/inventory/suit/mob_vr.dmi b/icons/inventory/suit/mob_vr.dmi index 4288fd0326..d5e2082d0e 100644 Binary files a/icons/inventory/suit/mob_vr.dmi and b/icons/inventory/suit/mob_vr.dmi differ diff --git a/icons/inventory/suit/mob_vr_akula.dmi b/icons/inventory/suit/mob_vr_akula.dmi index 3ab9c20220..3de3f4b632 100644 Binary files a/icons/inventory/suit/mob_vr_akula.dmi and b/icons/inventory/suit/mob_vr_akula.dmi differ diff --git a/icons/inventory/suit/mob_vr_sergal.dmi b/icons/inventory/suit/mob_vr_sergal.dmi index 66ed483095..9cc66a352f 100644 Binary files a/icons/inventory/suit/mob_vr_sergal.dmi and b/icons/inventory/suit/mob_vr_sergal.dmi differ diff --git a/icons/inventory/suit/mob_vr_vulpkanin.dmi b/icons/inventory/suit/mob_vr_vulpkanin.dmi index 8e6bf59b58..aa79c164a5 100644 Binary files a/icons/inventory/suit/mob_vr_vulpkanin.dmi and b/icons/inventory/suit/mob_vr_vulpkanin.dmi differ diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 9f46849608..8188b08848 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi index e3242dda79..6b7566f888 100644 Binary files a/icons/inventory/uniform/item_vr.dmi and b/icons/inventory/uniform/item_vr.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index a6bb42e1d7..4e0bb00389 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi index 3dc58ffd2c..2230061fce 100644 Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ diff --git a/icons/mecha/mecha_equipment_vr.dmi b/icons/mecha/mecha_equipment_vr.dmi index ec23292b90..068953a893 100644 Binary files a/icons/mecha/mecha_equipment_vr.dmi and b/icons/mecha/mecha_equipment_vr.dmi differ diff --git a/icons/mob/alienanimals_x32.dmi b/icons/mob/alienanimals_x32.dmi index f3cb748708..b187ad5873 100644 Binary files a/icons/mob/alienanimals_x32.dmi and b/icons/mob/alienanimals_x32.dmi differ diff --git a/icons/mob/animal.dmi b/icons/mob/animal.dmi index fd99eed3f0..def737dcc3 100644 Binary files a/icons/mob/animal.dmi and b/icons/mob/animal.dmi differ diff --git a/icons/mob/animal_vr.dmi b/icons/mob/animal_vr.dmi index 12b65c71c8..5d29e60511 100644 Binary files a/icons/mob/animal_vr.dmi and b/icons/mob/animal_vr.dmi differ diff --git a/icons/mob/hud_jobs_vr.dmi b/icons/mob/hud_jobs_vr.dmi index 8d8561c080..4a52481088 100644 Binary files a/icons/mob/hud_jobs_vr.dmi and b/icons/mob/hud_jobs_vr.dmi differ diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi index f67b29720d..7d433c9f41 100644 Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ diff --git a/icons/mob/human_face_vr.dmi b/icons/mob/human_face_vr.dmi index 15b9d3eaf9..1c00c166ce 100644 Binary files a/icons/mob/human_face_vr.dmi and b/icons/mob/human_face_vr.dmi differ diff --git a/icons/mob/human_face_vr_add.dmi b/icons/mob/human_face_vr_add.dmi index bdbfe16ff7..d99aec1497 100644 Binary files a/icons/mob/human_face_vr_add.dmi and b/icons/mob/human_face_vr_add.dmi differ diff --git a/icons/mob/human_races/markings.dmi b/icons/mob/human_races/markings.dmi index f9f91da90b..de0dcafb7c 100644 Binary files a/icons/mob/human_races/markings.dmi and b/icons/mob/human_races/markings.dmi differ diff --git a/icons/mob/human_races/sprite_accessories/tails.dmi b/icons/mob/human_races/sprite_accessories/tails.dmi index 5e4a27597f..960a44d5e2 100644 Binary files a/icons/mob/human_races/sprite_accessories/tails.dmi and b/icons/mob/human_races/sprite_accessories/tails.dmi differ diff --git a/icons/mob/items/lefthand_holder.dmi b/icons/mob/items/lefthand_holder.dmi index e0af896f82..aa7e7807cc 100644 Binary files a/icons/mob/items/lefthand_holder.dmi and b/icons/mob/items/lefthand_holder.dmi differ diff --git a/icons/mob/items/righthand_holder.dmi b/icons/mob/items/righthand_holder.dmi index 70a1131190..bad25f481b 100644 Binary files a/icons/mob/items/righthand_holder.dmi and b/icons/mob/items/righthand_holder.dmi differ diff --git a/icons/mob/robots_vr.dmi b/icons/mob/robots_vr.dmi index 2e34ed66d5..a05fa9c79f 100644 Binary files a/icons/mob/robots_vr.dmi and b/icons/mob/robots_vr.dmi differ diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi index f762fe371c..e2abc031b1 100644 Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ diff --git a/icons/mob/snake_vr.dmi b/icons/mob/snake_vr.dmi index 42631b85de..6802aecc47 100644 Binary files a/icons/mob/snake_vr.dmi and b/icons/mob/snake_vr.dmi differ diff --git a/icons/mob/species/teshari/back.dmi b/icons/mob/species/teshari/back.dmi new file mode 100644 index 0000000000..cdf3c6e559 Binary files /dev/null and b/icons/mob/species/teshari/back.dmi differ diff --git a/icons/mob/species/teshari/head.dmi b/icons/mob/species/teshari/head.dmi new file mode 100644 index 0000000000..0bb0637c4e Binary files /dev/null and b/icons/mob/species/teshari/head.dmi differ diff --git a/icons/mob/species/teshari/masks.dmi b/icons/mob/species/teshari/masks.dmi new file mode 100644 index 0000000000..6fde2b8e38 Binary files /dev/null and b/icons/mob/species/teshari/masks.dmi differ diff --git a/icons/mob/species/teshari/suit.dmi b/icons/mob/species/teshari/suit.dmi new file mode 100644 index 0000000000..09d72fa461 Binary files /dev/null and b/icons/mob/species/teshari/suit.dmi differ diff --git a/icons/mob/species/teshari/uniform.dmi b/icons/mob/species/teshari/uniform.dmi new file mode 100644 index 0000000000..37fcf0c76b Binary files /dev/null and b/icons/mob/species/teshari/uniform.dmi differ diff --git a/icons/mob/vore/ears_32x64.dmi b/icons/mob/vore/ears_32x64.dmi index d790034cda..df92e62a42 100644 Binary files a/icons/mob/vore/ears_32x64.dmi and b/icons/mob/vore/ears_32x64.dmi differ diff --git a/icons/mob/vore/ears_uneven.dmi b/icons/mob/vore/ears_uneven.dmi new file mode 100644 index 0000000000..f0c7aef81e Binary files /dev/null and b/icons/mob/vore/ears_uneven.dmi differ diff --git a/icons/mob/vore/tails_vr.dmi b/icons/mob/vore/tails_vr.dmi index 922b153daf..d5a4d7ad57 100644 Binary files a/icons/mob/vore/tails_vr.dmi and b/icons/mob/vore/tails_vr.dmi differ diff --git a/icons/mob/vore/taurs_vr.dmi b/icons/mob/vore/taurs_vr.dmi index 54e865150b..8772db082a 100644 Binary files a/icons/mob/vore/taurs_vr.dmi and b/icons/mob/vore/taurs_vr.dmi differ diff --git a/icons/mob/vore/wings_vr.dmi b/icons/mob/vore/wings_vr.dmi index 40f5f02d92..4dac461599 100644 Binary files a/icons/mob/vore/wings_vr.dmi and b/icons/mob/vore/wings_vr.dmi differ diff --git a/icons/mob/widerobot_eng_vr.dmi b/icons/mob/widerobot_eng_vr.dmi index b5c55b53c8..df678f433e 100644 Binary files a/icons/mob/widerobot_eng_vr.dmi and b/icons/mob/widerobot_eng_vr.dmi differ diff --git a/icons/obj/ammo_boxes.dmi b/icons/obj/ammo_boxes.dmi new file mode 100644 index 0000000000..3706970041 Binary files /dev/null and b/icons/obj/ammo_boxes.dmi differ diff --git a/icons/obj/capture_crystal_vr.dmi b/icons/obj/capture_crystal_vr.dmi new file mode 100644 index 0000000000..7cd9208b2b Binary files /dev/null and b/icons/obj/capture_crystal_vr.dmi differ diff --git a/icons/obj/card_alt_vr.dmi b/icons/obj/card_alt_vr.dmi index 445dddb156..d18adbb882 100644 Binary files a/icons/obj/card_alt_vr.dmi and b/icons/obj/card_alt_vr.dmi differ diff --git a/icons/obj/clothing/knights_vr.dmi b/icons/obj/clothing/knights_vr.dmi index eb4c1a6074..969b7530bb 100644 Binary files a/icons/obj/clothing/knights_vr.dmi and b/icons/obj/clothing/knights_vr.dmi differ diff --git a/icons/obj/computer.dmi b/icons/obj/computer.dmi index a52ac02d69..8ae5c06b72 100644 Binary files a/icons/obj/computer.dmi and b/icons/obj/computer.dmi differ diff --git a/icons/obj/device_vr.dmi b/icons/obj/device_vr.dmi index b75163e881..3c4a3c5d09 100644 Binary files a/icons/obj/device_vr.dmi and b/icons/obj/device_vr.dmi differ diff --git a/icons/obj/doors/DoorHazardHidden_shuttle.dmi b/icons/obj/doors/DoorHazardHidden_shuttle.dmi new file mode 100644 index 0000000000..2aa9056837 Binary files /dev/null and b/icons/obj/doors/DoorHazardHidden_shuttle.dmi differ diff --git a/icons/obj/doors/rapid_pdoor.dmi b/icons/obj/doors/rapid_pdoor.dmi index 01ab429f32..eb72f0521d 100644 Binary files a/icons/obj/doors/rapid_pdoor.dmi and b/icons/obj/doors/rapid_pdoor.dmi differ diff --git a/icons/obj/flora/mushrooms.dmi b/icons/obj/flora/mushrooms.dmi new file mode 100644 index 0000000000..755acb8d64 Binary files /dev/null and b/icons/obj/flora/mushrooms.dmi differ diff --git a/icons/obj/food_vr.dmi b/icons/obj/food_vr.dmi index 9adbcc00c5..64b55a6b26 100644 Binary files a/icons/obj/food_vr.dmi and b/icons/obj/food_vr.dmi differ diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index c94a289290..9de92931db 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/icons/obj/gun_toy.dmi b/icons/obj/gun_toy.dmi new file mode 100644 index 0000000000..bee6bcc49d Binary files /dev/null and b/icons/obj/gun_toy.dmi differ diff --git a/icons/obj/gun_vr.dmi b/icons/obj/gun_vr.dmi index a623c02134..7f44ea9802 100644 Binary files a/icons/obj/gun_vr.dmi and b/icons/obj/gun_vr.dmi differ diff --git a/icons/obj/hydroponics_growing.dmi b/icons/obj/hydroponics_growing.dmi index 52146b3793..0a0a96aa6f 100644 Binary files a/icons/obj/hydroponics_growing.dmi and b/icons/obj/hydroponics_growing.dmi differ diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi index cb0e503692..fd04428843 100644 Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ diff --git a/icons/obj/machines/reagent.dmi b/icons/obj/machines/reagent.dmi index 7495451380..7a284942bc 100644 Binary files a/icons/obj/machines/reagent.dmi and b/icons/obj/machines/reagent.dmi differ diff --git a/icons/obj/objects_vr.dmi b/icons/obj/objects_vr.dmi index db7f71aef3..0cfacc4fd0 100644 Binary files a/icons/obj/objects_vr.dmi and b/icons/obj/objects_vr.dmi differ diff --git a/icons/obj/playing_cards.dmi b/icons/obj/playing_cards.dmi index 04e7af96fe..0195f8e6f4 100644 Binary files a/icons/obj/playing_cards.dmi and b/icons/obj/playing_cards.dmi differ diff --git a/icons/obj/refill_cartridges.dmi b/icons/obj/refill_cartridges.dmi new file mode 100644 index 0000000000..61818e977c Binary files /dev/null and b/icons/obj/refill_cartridges.dmi differ diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi index a63fcc23a8..841733ee72 100644 Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index 2ed8360e95..f7d75f25b6 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ diff --git a/icons/obj/sofas.dmi b/icons/obj/sofas.dmi index 9864a923ac..b8ef1d5c0a 100644 Binary files a/icons/obj/sofas.dmi and b/icons/obj/sofas.dmi differ diff --git a/icons/obj/stationobjs_vr.dmi b/icons/obj/stationobjs_vr.dmi index 74732a334a..aa6df06395 100644 Binary files a/icons/obj/stationobjs_vr.dmi and b/icons/obj/stationobjs_vr.dmi differ diff --git a/icons/obj/toy.dmi b/icons/obj/toy.dmi index b7235b7e58..98519ef659 100644 Binary files a/icons/obj/toy.dmi and b/icons/obj/toy.dmi differ diff --git a/icons/obj/toy_vr.dmi b/icons/obj/toy_vr.dmi index 3ad106945b..9b3ca4d9d0 100644 Binary files a/icons/obj/toy_vr.dmi and b/icons/obj/toy_vr.dmi differ diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi index a1fbfc9479..91285fd3a1 100755 Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ diff --git a/icons/obj/vending_job.dmi b/icons/obj/vending_job.dmi index 77d22e3dd1..b0398272ff 100644 Binary files a/icons/obj/vending_job.dmi and b/icons/obj/vending_job.dmi differ diff --git a/icons/turf/fancy_shuttles/_fancy_helpers.dmi b/icons/turf/fancy_shuttles/_fancy_helpers.dmi index 8b7fcb5eaf..2ddcb7fb06 100644 Binary files a/icons/turf/fancy_shuttles/_fancy_helpers.dmi and b/icons/turf/fancy_shuttles/_fancy_helpers.dmi differ diff --git a/icons/turf/fancy_shuttles/medbus.dmi b/icons/turf/fancy_shuttles/medbus.dmi new file mode 100644 index 0000000000..68f0fb96e6 Binary files /dev/null and b/icons/turf/fancy_shuttles/medbus.dmi differ diff --git a/icons/turf/fancy_shuttles/medbus_preview.dmi b/icons/turf/fancy_shuttles/medbus_preview.dmi new file mode 100644 index 0000000000..61a3093728 Binary files /dev/null and b/icons/turf/fancy_shuttles/medbus_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/medical.dmi b/icons/turf/fancy_shuttles/medical.dmi deleted file mode 100644 index dc1833cc55..0000000000 Binary files a/icons/turf/fancy_shuttles/medical.dmi and /dev/null differ diff --git a/icons/turf/fancy_shuttles/medical_preview.dmi b/icons/turf/fancy_shuttles/medical_preview.dmi deleted file mode 100644 index 1b688eb8f0..0000000000 Binary files a/icons/turf/fancy_shuttles/medical_preview.dmi and /dev/null differ diff --git a/icons/turf/fancy_shuttles/sd_shuttle.dmi b/icons/turf/fancy_shuttles/sd_shuttle.dmi new file mode 100644 index 0000000000..856a771d80 Binary files /dev/null and b/icons/turf/fancy_shuttles/sd_shuttle.dmi differ diff --git a/icons/turf/fancy_shuttles/sd_shuttle_preview.dmi b/icons/turf/fancy_shuttles/sd_shuttle_preview.dmi new file mode 100644 index 0000000000..7d6177b164 Binary files /dev/null and b/icons/turf/fancy_shuttles/sd_shuttle_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/secbus.dmi b/icons/turf/fancy_shuttles/secbus.dmi new file mode 100644 index 0000000000..d47f5fc552 Binary files /dev/null and b/icons/turf/fancy_shuttles/secbus.dmi differ diff --git a/icons/turf/fancy_shuttles/secbus_preview.dmi b/icons/turf/fancy_shuttles/secbus_preview.dmi new file mode 100644 index 0000000000..cfc42fb2e2 Binary files /dev/null and b/icons/turf/fancy_shuttles/secbus_preview.dmi differ diff --git a/icons/turf/fancy_shuttles/security.dmi b/icons/turf/fancy_shuttles/security.dmi deleted file mode 100644 index 70fdbfbc65..0000000000 Binary files a/icons/turf/fancy_shuttles/security.dmi and /dev/null differ diff --git a/icons/turf/fancy_shuttles/security_preview.dmi b/icons/turf/fancy_shuttles/security_preview.dmi deleted file mode 100644 index d0017da2a4..0000000000 Binary files a/icons/turf/fancy_shuttles/security_preview.dmi and /dev/null differ diff --git a/icons/turf/fancy_shuttles/tourbus.dmi b/icons/turf/fancy_shuttles/tourbus.dmi index beb0b4b30d..c9e1d4d5e1 100644 Binary files a/icons/turf/fancy_shuttles/tourbus.dmi and b/icons/turf/fancy_shuttles/tourbus.dmi differ diff --git a/icons/turf/fancy_shuttles/tourbus_preview.dmi b/icons/turf/fancy_shuttles/tourbus_preview.dmi index 56e5b6d455..e174aec5b7 100644 Binary files a/icons/turf/fancy_shuttles/tourbus_preview.dmi and b/icons/turf/fancy_shuttles/tourbus_preview.dmi differ diff --git a/icons/turf/flooring/asteroid.dmi b/icons/turf/flooring/asteroid.dmi index 9df9089658..c7f2b12948 100644 Binary files a/icons/turf/flooring/asteroid.dmi and b/icons/turf/flooring/asteroid.dmi differ diff --git a/icons/turf/flooring/weird_vr.dmi b/icons/turf/flooring/weird_vr.dmi new file mode 100644 index 0000000000..b8e10ec136 Binary files /dev/null and b/icons/turf/flooring/weird_vr.dmi differ diff --git a/icons/vore/custom_clothes_left_hand_vr.dmi b/icons/vore/custom_clothes_left_hand_vr.dmi index ec5dd4b55a..17ac4c3a7e 100644 Binary files a/icons/vore/custom_clothes_left_hand_vr.dmi and b/icons/vore/custom_clothes_left_hand_vr.dmi differ diff --git a/icons/vore/custom_clothes_right_hand_vr.dmi b/icons/vore/custom_clothes_right_hand_vr.dmi index 2fc3bdb14f..d77e0fa248 100644 Binary files a/icons/vore/custom_clothes_right_hand_vr.dmi and b/icons/vore/custom_clothes_right_hand_vr.dmi differ diff --git a/icons/vore/custom_clothes_vr.dmi b/icons/vore/custom_clothes_vr.dmi index 5d75cf88b9..cc7b242670 100644 Binary files a/icons/vore/custom_clothes_vr.dmi and b/icons/vore/custom_clothes_vr.dmi differ diff --git a/icons/vore/custom_items_vr.dmi b/icons/vore/custom_items_vr.dmi index b8fe78c759..ca6f3dfa19 100644 Binary files a/icons/vore/custom_items_vr.dmi and b/icons/vore/custom_items_vr.dmi differ diff --git a/icons/vore/custom_onmob_32x48_vr.dmi b/icons/vore/custom_onmob_32x48_vr.dmi index 2889db5cc0..827ab1fb47 100644 Binary files a/icons/vore/custom_onmob_32x48_vr.dmi and b/icons/vore/custom_onmob_32x48_vr.dmi differ diff --git a/icons/vore/custom_onmob_vr.dmi b/icons/vore/custom_onmob_vr.dmi index 5e2d399fd8..e90afae8d4 100644 Binary files a/icons/vore/custom_onmob_vr.dmi and b/icons/vore/custom_onmob_vr.dmi differ diff --git a/maps/cynosure/cynosure-1.dmm b/maps/cynosure/cynosure-1.dmm index 61b5d30ceb..48a0b40a9a 100644 --- a/maps/cynosure/cynosure-1.dmm +++ b/maps/cynosure/cynosure-1.dmm @@ -16534,6 +16534,9 @@ /area/surface/station/hallway/primary/bmt/west/elevator) "Kc" = ( /obj/structure/stairs/spawner/south, +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/surface/station/medical/hallway/bmt) "Kd" = ( @@ -19063,6 +19066,9 @@ /turf/simulated/floor/plating, /area/surface/station/maintenance/incineratormaint) "Ph" = ( +/obj/structure/railing{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/surface/station/medical/hallway/bmt) "Pi" = ( @@ -54513,7 +54519,7 @@ RQ RQ xW xW -RQ +xW RQ RQ RQ @@ -55025,7 +55031,7 @@ RQ RQ RQ RQ -xW +RQ xW xW xW @@ -56327,7 +56333,7 @@ RQ RQ RQ RQ -RQ +Kj Kj Kj Kj diff --git a/maps/cynosure/cynosure-2.dmm b/maps/cynosure/cynosure-2.dmm index 2f3ede3d5c..832f0090da 100644 --- a/maps/cynosure/cynosure-2.dmm +++ b/maps/cynosure/cynosure-2.dmm @@ -473,6 +473,9 @@ }, /turf/simulated/floor/lino, /area/surface/station/security/detectives_office) +"aqn" = ( +/turf/simulated/floor/outdoors/snow/sif/planetuse, +/area/surface/outside/plains/station) "aqK" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -583,6 +586,12 @@ }, /turf/simulated/floor/plating, /area/surface/station/maintenance/north/gnd) +"ate" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "atU" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 @@ -1032,6 +1041,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/surface/station/security/lobby) +"aEE" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/plains/plateau) "aFa" = ( /obj/effect/floor_decal/techfloor{ dir = 9 @@ -1266,6 +1279,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/storage/primarytool) +"aHG" = ( +/obj/structure/cliff/automatic{ + dir = 9 + }, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/plains/plateau) "aHL" = ( /obj/effect/zone_divider, /turf/simulated/floor/plating, @@ -1953,6 +1972,9 @@ /obj/machinery/meter, /turf/simulated/floor/tiled, /area/surface/station/engineering/atmos) +"aWW" = ( +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "aXC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1992,10 +2014,6 @@ }, /turf/simulated/floor/plating, /area/surface/station/security/lockerroom) -"aYy" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, -/area/surface/outside/plains/plateau) "aYV" = ( /obj/machinery/firealarm{ dir = 4; @@ -2038,6 +2056,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/surface/station/ai/upload_foyer) +"aZV" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/surface/station/engineering/hallway) "aZZ" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloorwhite/corner{ @@ -2092,9 +2116,7 @@ /obj/structure/cliff/automatic/ramp{ dir = 9 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "baV" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -2975,12 +2997,6 @@ }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/storage/primary_storage) -"bsv" = ( -/obj/structure/fence/corner{ - dir = 8 - }, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/surface/outside/plains/station) "bsy" = ( /obj/machinery/door/blast/regular/open{ id = "atmoslockdown"; @@ -3535,10 +3551,6 @@ }, /turf/simulated/floor/plating, /area/surface/station/security/interrogation) -"bGJ" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/surface/outside/plains/station) "bGL" = ( /obj/machinery/vending/dinnerware{ dir = 4 @@ -3581,9 +3593,7 @@ /area/surface/station/hydroponics) "bHg" = ( /obj/structure/cliff/automatic/ramp, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "bHr" = ( /obj/machinery/door/airlock{ @@ -4182,6 +4192,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/medical/etc) +"bVN" = ( +/obj/structure/cliff/automatic, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/plains/plateau) "bWC" = ( /obj/structure/window/reinforced, /obj/structure/closet/emcloset, @@ -4278,8 +4292,9 @@ dir = 4 }, /obj/machinery/door/window/northright{ - name = "Rig Suit"; - req_one_access = list(48) + name = "Coffin Storage"; + req_access = list(27); + req_one_access = null }, /turf/simulated/floor/wood/sif, /area/surface/station/chapel/main) @@ -4417,9 +4432,7 @@ /area/surface/station/crew_quarters/gym) "cbu" = ( /obj/structure/cliff/automatic, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/dirt/sif, /area/surface/outside/plains/plateau) "cco" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4866,10 +4879,10 @@ /turf/simulated/floor/tiled/techmaint, /area/surface/station/rnd/exploration) "cos" = ( -/obj/structure/cliff/automatic/corner{ - dir = 9 +/obj/structure/cliff/automatic{ + dir = 8 }, -/turf/simulated/floor/outdoors/dirt/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "cow" = ( /obj/structure/table/marble, @@ -5093,9 +5106,7 @@ /area/surface/station/engineering/foyer) "cwH" = ( /obj/effect/map_effect/portal/master/side_a/plains_to_wilderness, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/plains/plateau) "cwR" = ( /obj/machinery/hologram/holopad, @@ -6763,7 +6774,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway) "dfs" = ( @@ -6802,7 +6812,7 @@ /turf/simulated/floor/plating, /area/surface/station/janitor) "dgP" = ( -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/snow/sif/planetuse, /area/space) "diu" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -7554,10 +7564,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/surface/station/garage) -"dzs" = ( -/obj/structure/fence, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/surface/outside/plains/station) "dzz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, @@ -7954,7 +7960,7 @@ dir = 8 }, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "dKa" = ( /obj/structure/sign/directions/ladderwell{ @@ -8130,6 +8136,12 @@ }, /turf/simulated/wall/r_wall, /area/surface/station/park) +"dNR" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "dNY" = ( /obj/machinery/conveyor{ dir = 4 @@ -8585,7 +8597,6 @@ /obj/machinery/camera/network/medbay{ c_tag = "MED - Operating Theatre 2" }, -/obj/machinery/optable, /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery2) "ecL" = ( @@ -8841,6 +8852,12 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/simulated/floor/plating, /area/surface/station/engineering/reactor_room) +"ehK" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "ehL" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/grille, @@ -9116,7 +9133,7 @@ /area/surface/station/janitor) "eoi" = ( /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "eor" = ( /obj/structure/cable{ @@ -10571,9 +10588,7 @@ /area/surface/station/crew_quarters/kitchen) "eSe" = ( /obj/effect/map_effect/portal/line/side_a, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/plains/plateau) "eSh" = ( /obj/structure/cable/green{ @@ -10681,7 +10696,7 @@ /turf/simulated/floor/tiled/neutral, /area/surface/station/rnd/xenobiology) "eSN" = ( -/turf/simulated/floor/outdoors/grass/sif{ +/turf/simulated/floor/outdoors/snow/sif/planetuse{ outdoors = 0 }, /area/surface/outside/plains/station) @@ -10877,7 +10892,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/medical/emt_bay) "eXA" = ( -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "eXO" = ( /obj/structure/cable/cyan{ @@ -11425,6 +11440,10 @@ /obj/machinery/gibber, /turf/simulated/floor/tiled/freezer, /area/surface/station/crew_quarters/kitchen) +"fkd" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "fkm" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -13562,6 +13581,10 @@ }, /turf/simulated/floor/tiled/white, /area/surface/station/medical/etc) +"gmr" = ( +/obj/effect/zone_divider, +/turf/simulated/floor/outdoors/snow/sif/planetuse, +/area/surface/outside/plains/station) "gmu" = ( /obj/structure/table/marble, /obj/item/weapon/storage/box/donkpockets, @@ -14062,9 +14085,7 @@ /obj/structure/cliff/automatic/corner{ dir = 9 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/dirt/sif, /area/surface/outside/plains/plateau) "gyg" = ( /obj/effect/catwalk_plated/dark, @@ -14133,9 +14154,9 @@ /area/surface/station/ai/upload) "gAH" = ( /obj/structure/cliff/automatic{ - dir = 5 + dir = 4 }, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "gAJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ @@ -14234,7 +14255,7 @@ /obj/structure/fence/end{ dir = 1 }, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "gBL" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -14415,7 +14436,8 @@ /area/surface/station/crew_quarters/heads/hop) "gEG" = ( /obj/machinery/power/smes/buildable{ - RCon_tag = "Solar - Northeast"; + RCon_tag = "Solar - West"; + cur_coils = 2; input_attempt = 1; input_level = 300000; output_level = 200000 @@ -14965,7 +14987,7 @@ }, /obj/machinery/power/terminal, /obj/structure/disposalpipe/segment{ - dir = 1; + dir = 8; icon_state = "pipe-c" }, /obj/effect/catwalk_plated/dark, @@ -15084,7 +15106,7 @@ /obj/structure/fence/corner{ dir = 8 }, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "gTA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15113,9 +15135,7 @@ /obj/structure/sign/bigname/seg_7{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "gUf" = ( /obj/machinery/conveyor{ @@ -15410,6 +15430,12 @@ "hbn" = ( /turf/simulated/floor/tiled/old_cargo/gray, /area/surface/station/storage/primarytool) +"hbo" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "hby" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -15587,10 +15613,6 @@ /obj/machinery/status_display, /turf/simulated/floor/plating, /area/surface/station/storage/primarytool) -"hin" = ( -/obj/structure/fence/corner, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/surface/outside/plains/station) "hiw" = ( /obj/machinery/dna_scannernew, /obj/effect/floor_decal/borderfloorwhite, @@ -17017,9 +17039,7 @@ /obj/structure/sign/bigname/seg_4{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "hSO" = ( /obj/structure/cable{ @@ -17361,9 +17381,24 @@ }, /turf/simulated/floor/tiled/dark, /area/surface/station/hallway/primary/groundfloor/west) +"idj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/overlay/snow/floor, +/turf/simulated/floor/tiled/steel/sif/planetuse{ + icon_state = "steel_dirty"; + initial_flooring = /decl/flooring/tiling/steel_dirty; + outdoors = 0 + }, +/area/surface/outside/plains/station) "idr" = ( /obj/structure/fence, -/turf/simulated/floor/outdoors/grass/sif{ +/turf/simulated/floor/outdoors/snow/sif/planetuse{ outdoors = 0 }, /area/surface/outside/plains/station) @@ -18396,9 +18431,7 @@ /obj/structure/sign/bigname/seg_3{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "iHY" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -18684,10 +18717,6 @@ }, /turf/simulated/floor/tiled/dark, /area/surface/station/hallway/primary/groundfloor/north) -"iNE" = ( -/obj/structure/fence/end, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/surface/outside/plains/station) "iNR" = ( /obj/structure/cable{ d1 = 1; @@ -19034,7 +19063,7 @@ /area/surface/station/hallway/primary/groundfloor/south) "iVY" = ( /obj/structure/fence/end, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "iWb" = ( /obj/machinery/honey_extractor, @@ -19091,7 +19120,7 @@ /obj/structure/fence/corner{ dir = 10 }, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "iYA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ @@ -20484,7 +20513,7 @@ /area/surface/station/crew_quarters/heads/hos) "jIh" = ( /obj/structure/fence/post, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "jIj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -20946,7 +20975,7 @@ "jRb" = ( /obj/structure/fence, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "jRo" = ( /obj/structure/disposalpipe/segment, @@ -21700,6 +21729,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, /obj/machinery/power/sensor{ name = "Powernet Sensor - Master Grid"; name_tag = "Master" @@ -22392,6 +22425,7 @@ /obj/structure/disposalpipe/up{ dir = 8 }, +/obj/effect/overlay/snow/floor, /turf/simulated/floor/plating/sif/planetuse, /area/surface/outside/plains/station) "kvY" = ( @@ -22501,6 +22535,9 @@ /area/surface/station/medical/emt_bay) "kxM" = ( /obj/structure/stairs/spawner/east, +/obj/structure/railing{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/surface/station/engineering/hallway) "kyJ" = ( @@ -22633,9 +22670,7 @@ /obj/structure/sign/bigname{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "kBn" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -25968,9 +26003,6 @@ dir = 6 }, /obj/effect/floor_decal/steeldecal/steel_decals_central7, -/obj/machinery/recharger/wallcharger{ - pixel_x = 32 - }, /obj/structure/table/steel_reinforced, /obj/item/ammo_magazine/s45/practice, /obj/item/ammo_magazine/s45/practice, @@ -25987,6 +26019,12 @@ /obj/item/ammo_magazine/m9mmt/practice, /obj/item/weapon/storage/box/blanks/large, /obj/item/weapon/storage/box/blanks/large, +/obj/machinery/magnetic_controller{ + autolink = 1; + density = 0; + dir = 4; + pixel_x = 30 + }, /turf/simulated/floor/tiled, /area/surface/station/security/range) "maD" = ( @@ -27540,9 +27578,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/hallway/primary/groundfloor/west/elevator) -"mHW" = ( -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/surface/outside/plains/station) "mIc" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8 @@ -27659,9 +27694,7 @@ /area/surface/station/security/detectives_office/lab) "mMn" = ( /obj/effect/map_effect/portal/line/side_a, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/plains/normal) "mMH" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ @@ -27855,9 +27888,7 @@ dir = 9 }, /obj/structure/cliff/automatic/corner, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "mQx" = ( /obj/structure/cable{ @@ -28043,6 +28074,11 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/surface/station/medical/etc) +"mSM" = ( +/turf/simulated/floor/outdoors/grass/sif/random{ + tree_chance = 0 + }, +/area/surface/outside/plains/station) "mSO" = ( /obj/structure/table/standard, /obj/effect/floor_decal/borderfloor{ @@ -29402,7 +29438,7 @@ /turf/simulated/floor/tiled/dark, /area/surface/station/crew_quarters/heads/hos) "nCe" = ( -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "nCg" = ( /obj/structure/table/marble, @@ -29899,7 +29935,7 @@ /area/surface/station/engineering/workshop) "nME" = ( /obj/structure/fence/corner, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "nMJ" = ( /obj/structure/cable{ @@ -31474,6 +31510,10 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/medical/reception) +"otX" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/surface/station/medical/surgery2) "oub" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -32627,9 +32667,7 @@ /obj/structure/cliff/automatic{ dir = 6 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/plains/plateau) "oTU" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -32882,9 +32920,7 @@ /obj/structure/sign/bigname/seg_6{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "oYh" = ( /obj/structure/bed/chair/shuttle{ @@ -32907,6 +32943,12 @@ }, /turf/simulated/floor/wood, /area/surface/station/crew_quarters/cafeteria) +"oYl" = ( +/obj/structure/cliff/automatic{ + dir = 5 + }, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/plains/plateau) "oYn" = ( /obj/structure/reagent_dispensers/water_cooler/full, /obj/effect/floor_decal/borderfloor, @@ -32920,10 +32962,6 @@ }, /turf/simulated/floor/tiled, /area/surface/station/crew_quarters/gym) -"oYE" = ( -/obj/structure/cliff/automatic/corner, -/turf/simulated/floor/outdoors/grass/sif, -/area/surface/outside/plains/plateau) "oYI" = ( /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor/hole/right, @@ -33545,7 +33583,7 @@ "plA" = ( /obj/structure/fence/corner, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "plP" = ( /turf/simulated/wall, @@ -34008,9 +34046,7 @@ /obj/structure/cliff/automatic{ dir = 9 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/dirt/sif, /area/surface/outside/plains/plateau) "ptB" = ( /obj/effect/floor_decal/industrial/warning{ @@ -34485,6 +34521,12 @@ }, /turf/simulated/floor/tiled, /area/surface/station/hallway/primary/groundfloor/west/elevator) +"pEp" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "pEt" = ( /obj/structure/cable{ d1 = 1; @@ -34833,10 +34875,8 @@ /turf/simulated/floor/outdoors/dirt/sif/planetuse, /area/surface/outside/plains/station) "pNy" = ( -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/normal) +/turf/simulated/floor/outdoors/sidewalk, +/area/surface/outside/plains/station) "pNC" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 9 @@ -34901,10 +34941,8 @@ /turf/simulated/floor/tiled/hydro, /area/surface/station/rnd/xenobiology/xenoflora) "pPG" = ( -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/plateau) +/turf/simulated/floor/outdoors/sidewalk/slab, +/area/surface/outside/plains/station) "pPS" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -35142,6 +35180,12 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/surface/station/arrivals/cynosure) +"pXz" = ( +/obj/structure/fence, +/turf/simulated/floor/outdoors/dirt/sif{ + outdoors = 0 + }, +/area/surface/outside/plains/station) "pXC" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/effect/floor_decal/industrial/warning/corner{ @@ -35746,11 +35790,8 @@ /turf/simulated/floor/plating, /area/surface/station/engineering/reactor_waste) "qkr" = ( -/obj/structure/cliff/automatic/corner, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/plateau) +/turf/simulated/floor/outdoors/sidewalk/side, +/area/surface/outside/plains/station) "qkt" = ( /obj/structure/cable/green{ d2 = 4; @@ -36128,6 +36169,7 @@ icon_state = "map_vent_out"; use_power = 1 }, +/obj/effect/overlay/snow/floor, /turf/simulated/floor/plating/sif/planetuse, /area/surface/station/engineering/atmos) "qqX" = ( @@ -37225,10 +37267,6 @@ initial_flooring = /decl/flooring/tiling/asteroidfloor }, /area/surface/outside/plains/station) -"qNG" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, -/area/surface/outside/plains/normal) "qOg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -37570,7 +37608,6 @@ /obj/machinery/camera/network/medbay{ c_tag = "MED - Operating Theatre 1" }, -/obj/machinery/optable, /turf/simulated/floor/tiled/white, /area/surface/station/medical/surgery) "qVW" = ( @@ -38786,12 +38823,6 @@ /obj/effect/zone_divider, /turf/simulated/floor/plating, /area/surface/station/engineering/reactor_smes) -"ryx" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/plateau) "ryD" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -39208,6 +39239,10 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/surface/station/maintenance/surgery) +"rIW" = ( +/obj/machinery/optable, +/turf/simulated/floor/tiled/white, +/area/surface/station/medical/surgery) "rJl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -39895,14 +39930,6 @@ has_fish = 0 }, /area/surface/outside/station/reactorpond) -"rZo" = ( -/obj/structure/cliff/automatic{ - dir = 5 - }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/plateau) "rZq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -39939,11 +39966,6 @@ }, /turf/simulated/floor/tiled, /area/surface/station/park) -"sbd" = ( -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/station) "sbl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 4 @@ -39970,9 +39992,7 @@ /obj/structure/sign/bigname/seg_5{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "scm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -40308,7 +40328,7 @@ /obj/structure/fence/corner{ dir = 9 }, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "snA" = ( /obj/effect/floor_decal/borderfloor, @@ -41230,7 +41250,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /obj/effect/catwalk_plated/dark, /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/light/small{ @@ -41357,7 +41380,7 @@ /obj/structure/fence/post{ dir = 4 }, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "sLv" = ( /turf/simulated/floor/tiled/techfloor/grid, @@ -42263,7 +42286,7 @@ /area/surface/station/chapel/main) "tjO" = ( /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "tjX" = ( /obj/machinery/alarm{ @@ -42580,6 +42603,10 @@ /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 32; + pixel_y = -10 + }, /turf/simulated/floor/tiled, /area/surface/station/security/range) "toQ" = ( @@ -42827,9 +42854,7 @@ /obj/structure/cliff/automatic/corner{ dir = 6 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/plains/plateau) "twn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -44062,6 +44087,12 @@ }, /turf/simulated/floor/wood/sif, /area/surface/station/chapel/main) +"tYs" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "tYt" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -44187,6 +44218,7 @@ "uaT" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Solar - Northeast"; + cur_coils = 2; input_attempt = 1; input_level = 300000; output_level = 200000 @@ -45057,10 +45089,7 @@ /area/surface/station/maintenance/weststairwell/gnd) "uxn" = ( /obj/effect/shuttle_landmark/cynosure/supply_station, -/turf/simulated/floor/tiled/steel/sif/planetuse{ - icon_state = "asteroidfloor"; - initial_flooring = /decl/flooring/tiling/asteroidfloor - }, +/turf/simulated/floor/tiled/asteroid_steel, /area/surface/outside/plains/station) "uxE" = ( /obj/effect/floor_decal/industrial/warning, @@ -45296,14 +45325,6 @@ /obj/machinery/status_display, /turf/simulated/floor/plating, /area/surface/station/rnd/xenobiology) -"uEP" = ( -/obj/structure/cliff/automatic{ - dir = 4 - }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/plateau) "uEX" = ( /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/yellow/bordercorner, @@ -47254,7 +47275,7 @@ /turf/simulated/floor/tiled/white, /area/surface/station/medical/ward) "vwy" = ( -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/normal) "vwK" = ( /obj/machinery/atmospherics/pipe/cap/visible{ @@ -47508,12 +47529,6 @@ "vCy" = ( /turf/simulated/wall/r_wall, /area/surface/station/crew_quarters/locker) -"vCL" = ( -/obj/structure/fence/corner{ - dir = 4 - }, -/turf/simulated/floor/outdoors/grass/sif, -/area/surface/outside/plains/station) "vDa" = ( /obj/machinery/door/firedoor/border_only, /obj/structure/grille, @@ -48000,7 +48015,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/surface/station/engineering/hallway) "vNz" = ( @@ -48358,6 +48372,12 @@ }, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/lockerroom) +"vZt" = ( +/obj/structure/cliff/automatic/corner{ + dir = 9 + }, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/plains/plateau) "vZO" = ( /obj/structure/target_stake, /obj/effect/floor_decal/industrial/hatch/yellow, @@ -48999,9 +49019,7 @@ /obj/structure/sign/bigname/seg_2{ pixel_y = 32 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/snow/sif/planetuse, /area/surface/outside/plains/station) "wqH" = ( /obj/effect/floor_decal/industrial/outline/blue, @@ -49331,9 +49349,7 @@ "wAU" = ( /obj/structure/cliff/automatic/corner, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "wBO" = ( /obj/structure/cable{ @@ -49389,6 +49405,12 @@ }, /turf/simulated/floor/tiled/monotile, /area/surface/station/hallway/primary/groundfloor/west) +"wCG" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/surface/outside/plains/station) "wCT" = ( /obj/structure/cable/green{ d1 = 2; @@ -49682,12 +49704,6 @@ /obj/machinery/shield_gen, /turf/simulated/floor/tiled/techmaint, /area/surface/station/engineering/storage) -"wJY" = ( -/obj/structure/fence{ - dir = 4 - }, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/surface/outside/plains/station) "wKc" = ( /obj/effect/zone_divider, /turf/simulated/wall, @@ -50356,13 +50372,6 @@ }, /turf/simulated/floor/tiled/white, /area/surface/station/rnd/xenobiology) -"wUO" = ( -/obj/structure/cliff/automatic, -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/plateau) "wUX" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass{ @@ -50658,9 +50667,7 @@ /obj/structure/cliff/automatic{ dir = 8 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/plains/plateau) "xcE" = ( /obj/effect/zone_divider, @@ -50668,7 +50675,7 @@ /area/surface/station/engineering/reactor_room) "xdu" = ( /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/normal) "xdA" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -51083,7 +51090,7 @@ /area/surface/station/maintenance/kitchen) "xpd" = ( /obj/structure/fence, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "xpy" = ( /obj/structure/table/woodentable, @@ -51558,7 +51565,7 @@ /obj/structure/fence/corner{ dir = 4 }, -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "xBS" = ( /obj/machinery/atmospherics/binary/pump{ @@ -51770,9 +51777,7 @@ dir = 5 }, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/plateau) "xHf" = ( /obj/machinery/vending/hydronutrients{ @@ -52040,6 +52045,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/hydro, /area/surface/station/rnd/xenobiology/xenoflora) +"xNj" = ( +/obj/structure/cliff/automatic, +/obj/effect/zone_divider, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/plains/plateau) "xNB" = ( /obj/structure/cable/green{ d1 = 1; @@ -52677,7 +52687,7 @@ dir = 4 }, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "xXF" = ( /obj/structure/closet, @@ -52868,12 +52878,6 @@ /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled/kafel_full/gray, /area/shuttle/exploration/cockpit) -"ybi" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/plains/normal) "ybo" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ @@ -53042,7 +53046,7 @@ /obj/structure/fence{ dir = 4 }, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/plains/station) "yeD" = ( /obj/structure/disposalpipe/segment{ @@ -53689,244 +53693,244 @@ htf (2,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv -jhv -jhv -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe +bVN +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -53946,244 +53950,244 @@ wYa (3,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -eXA -jhv -jhv +bVN eXA eXA -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe vwy vwy vwy -nOe -nOe vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy -nOe vwy vwy -nOe xdu vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -54203,25 +54207,52 @@ wYa (4,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -eXA -jhv +bVN eXA eXA eXA -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -54229,49 +54260,16 @@ vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe vwy -nOe -nOe xdu vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe vwy vwy vwy @@ -54291,156 +54289,162 @@ vwy vwy vwy vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy vwy -nOe -nOe -nOe -vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -54460,243 +54464,243 @@ wYa (5,1,1) = {" wYa qpk -rZo -qkr -pPG -jhv -jhv +oYl +aEE eXA -jhv -jhv -jhv -jhv -jhv -rZo -qkr -pNy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe xdu vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -54718,242 +54722,242 @@ wYa wYa qpk qpk -cbu -pPG +bVN eXA -jhv eXA -jhv -jhv -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe -nOe -qNG -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe vwy vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -54975,242 +54979,242 @@ wYa wYa qpk qpk -cbu -pPG +bVN eXA eXA -jhv -jhv eXA -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -vwy -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -nOe vwy vwy vwy -nOe vwy vwy vwy -nOe -vwy -vwy -nOe vwy vwy vwy -nOe xdu vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -55232,31 +55236,46 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -jhv +bVN eXA -jhv -jhv eXA -jhv -jhv -cbu -pNy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -vwy -nOe -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -55265,209 +55284,194 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe vwy vwy -nOe vwy -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe xdu -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy vwy -nOe -nOe -vwy -nOe vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe vwy vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -55489,242 +55493,242 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -jhv -jhv +bVN eXA eXA eXA -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe xdu vwy vwy -nOe -nOe -vwy -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -55746,242 +55750,242 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA eXA eXA -jhv eXA -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe -qNG +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe vwy vwy vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe -nOe vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM dXk @@ -56003,29 +56007,45 @@ wYa wYa qpk qpk -cbu -pPG +bVN eXA -jhv eXA -jhv -jhv -jhv -jhv eXA -jhv -rZo -qkr -pNy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -56035,210 +56055,194 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe -vwy -nOe -nOe vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe vwy vwy -nOe xdu vwy vwy vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -nOe -nOe vwy vwy vwy vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM dXk @@ -56260,243 +56264,243 @@ wYa wYa qpk qpk -cbu -pPG -eXA -eXA -jhv -jhv +bVN eXA eXA eXA eXA -jhv -jhv -cbu -pNy -nOe -vwy -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe xdu vwy -nOe vwy vwy vwy vwy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -nOe vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe vwy vwy -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy xdu -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM dXk @@ -56517,89 +56521,219 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv +bVN eXA eXA eXA -jhv -jhv eXA -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -qNG -nOe -vwy -nOe -nOe -vwy -vwy -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -56610,149 +56744,19 @@ vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe vwy vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -56774,242 +56778,242 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA -jhv eXA -jhv -jhv -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe xdu -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -57031,40 +57035,53 @@ wYa wYa qpk qpk -cbu -pPG +bVN eXA -jhv eXA -jhv -jhv -jhv eXA -jhv -jhv -jhv -cbu -pNy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -57072,28 +57089,11 @@ vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe xdu -nOe -nOe -nOe -nOe vwy vwy vwy @@ -57102,171 +57102,175 @@ vwy vwy vwy vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -57287,243 +57291,243 @@ wYa (16,1,1) = {" wYa qpk -ptv -gxR -pPG +aHG +vZt eXA -jhv -jhv -jhv eXA -jhv eXA -jhv -jhv -jhv -cbu -pNy -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -qNG -vwy -vwy -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe vwy vwy vwy vwy vwy -nOe vwy vwy -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -57544,73 +57548,68 @@ wYa (17,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv -eXA -jhv -jhv +bVN eXA eXA eXA eXA -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy -nOe vwy vwy -nOe -vwy -nOe vwy vwy -nOe xdu vwy vwy -nOe -nOe -nOe -nOe -nOe vwy vwy vwy @@ -57618,169 +57617,174 @@ vwy vwy vwy vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -57801,29 +57805,42 @@ wYa (18,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv +bVN eXA -jhv -jhv -jhv eXA -jhv -jhv eXA -jhv -cbu -pNy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -57836,40 +57853,22 @@ vwy vwy vwy vwy -nOe vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe xdu vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe vwy vwy vwy @@ -57877,13 +57876,6 @@ vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe vwy vwy vwy @@ -57891,26 +57883,6 @@ vwy vwy vwy vwy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe vwy vwy vwy @@ -57918,126 +57890,158 @@ vwy vwy vwy vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -qNG -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -58058,34 +58062,43 @@ wYa (19,1,1) = {" wYa qpk -cbu -pPG -jhv -eXA -jhv +bVN eXA eXA eXA -jhv -jhv -jhv -jhv -jhv -rZo -qkr -pNy -vwy -vwy -vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -58094,207 +58107,198 @@ vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe -nOe vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe xdu -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -58315,113 +58319,70 @@ wYa (20,1,1) = {" wYa qpk -cbu -pPG -eXA -eXA -jhv -eXA -jhv +bVN eXA eXA eXA -jhv eXA eXA -jhv -cbu -pNy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy vwy -nOe xdu vwy vwy vwy vwy -nOe -nOe -nOe -vwy -vwy -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy vwy @@ -58432,127 +58393,170 @@ vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM dXk @@ -58572,244 +58576,244 @@ wYa (21,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv -jhv +bVN eXA eXA -jhv eXA eXA -jhv eXA -jhv -cbu -pNy -vwy -nOe -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy -nOe xdu vwy vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM dXk @@ -58829,75 +58833,217 @@ wYa (22,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv +bVN eXA eXA eXA -jhv eXA -jhv -jhv eXA -jhv -jhv -cbu -pNy -vwy -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -qNG -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -58909,163 +59055,21 @@ vwy vwy vwy vwy -nOe -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -59086,32 +59090,48 @@ wYa (23,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv +bVN eXA eXA -jhv eXA eXA -jhv -jhv -jhv -jhv -jhv -cbu -pNy -vwy -vwy -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -59119,210 +59139,194 @@ vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -nOe vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy -nOe vwy -nOe vwy vwy xdu vwy vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe vwy vwy vwy vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -59343,91 +59347,47 @@ wYa (24,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv -eXA -jhv +bVN eXA eXA -jhv eXA -jhv -jhv -jhv -cbu -pNy -nOe -vwy -vwy -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe -qNG -vwy -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -59437,149 +59397,193 @@ vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy -nOe -vwy -nOe -nOe -nOe vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe xdu -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -59600,50 +59604,53 @@ wYa (25,1,1) = {" wYa qpk -rZo -qkr -pPG -eXA -jhv -jhv -jhv +oYl +aEE eXA eXA -jhv -jhv -jhv -jhv -jhv -cbu -pNy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -vwy -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -59652,191 +59659,188 @@ vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe -nOe xdu vwy vwy -nOe -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy vwy -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM dXk @@ -59858,47 +59862,51 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -eXA -jhv +bVN eXA eXA -jhv -jhv -jhv -jhv -jhv -cbu -pNy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -59906,27 +59914,15 @@ vwy vwy vwy vwy -nOe -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe xdu vwy vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe vwy vwy vwy @@ -59936,163 +59932,171 @@ vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy vwy vwy vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -60115,158 +60119,158 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -jhv -jhv -jhv -jhv -jhv +bVN eXA eXA -jhv -jhv -cbu -pNy -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -qNG vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -60277,78 +60281,78 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -60372,53 +60376,55 @@ wYa wYa qpk qpk -cbu -pPG -eXA -jhv +bVN eXA eXA eXA eXA eXA -jhv eXA eXA -ptv -gxR -pNy -vwy -vwy -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -vwy -vwy -vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -60426,102 +60432,100 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe xdu vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -60536,75 +60540,75 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -60629,46 +60633,51 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA -jhv -jhv -jhv eXA -jhv -jhv -jhv -jhv -cbu -pNy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -60676,31 +60685,14 @@ vwy vwy vwy vwy -nOe -vwy -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe xdu vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe vwy vwy vwy @@ -60709,72 +60701,84 @@ vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -60797,71 +60801,71 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -qNG -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -60886,64 +60890,64 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA eXA -jhv -jhv -jhv eXA -jhv -jhv -jhv -cbu -pNy -nOe -vwy -nOe -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe vwy -nOe xdu vwy vwy @@ -60952,13 +60956,6 @@ vwy vwy vwy vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy @@ -60966,60 +60963,67 @@ vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe -nOe vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -61027,10 +61031,10 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy aNW aNW aNW @@ -61055,70 +61059,70 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -61143,61 +61147,61 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv +bVN eXA -jhv -jhv -jhv -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy vwy -nOe vwy vwy -nOe -nOe vwy vwy vwy @@ -61206,73 +61210,73 @@ vwy vwy vwy vwy -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe vwy vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -61315,66 +61319,66 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -61400,45 +61404,51 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -jhv +bVN eXA -jhv eXA -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -61447,38 +61457,12 @@ vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -vwy -nOe vwy vwy -nOe xdu -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -vwy -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy vwy @@ -61493,41 +61477,61 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -61574,64 +61578,64 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -61656,28 +61660,39 @@ wYa (33,1,1) = {" wYa qpk -ptv -gxR -pPG -jhv -jhv -jhv -eXA -jhv +aHG +vZt eXA eXA -jhv -jhv -jhv -cbu -pNy -nOe -vwy -nOe -nOe -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -61691,7 +61706,6 @@ vwy vwy vwy vwy -nOe vwy vwy vwy @@ -61700,43 +61714,13 @@ vwy vwy vwy vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe vwy vwy vwy vwy vwy -nOe xdu vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe vwy vwy vwy @@ -61746,41 +61730,61 @@ vwy vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -nOe vwy vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -61833,61 +61837,61 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -61913,33 +61917,47 @@ wYa (34,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -eXA -jhv +bVN eXA eXA -jhv -jhv eXA -jhv -jhv -cbu -pNy -nOe -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -61954,88 +61972,74 @@ vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe xdu vwy -nOe -nOe -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -62094,57 +62098,57 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -62170,45 +62174,50 @@ wYa (35,1,1) = {" wYa qpk -cbu -pPG -jhv -eXA -jhv +bVN eXA eXA -jhv -eXA -jhv eXA eXA -jhv -cbu -pNy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -62216,13 +62225,8 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe vwy vwy vwy @@ -62232,66 +62236,66 @@ vwy xdu vwy vwy -nOe -nOe -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe -vwy -vwy -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe vwy vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -62319,89 +62323,89 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -aNW -aNW -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +aNW +aNW +aNW +aNW +aNW +aNW +aNW +aNW +aNW +aNW +aNW +oum +oum +oum +oum +oum +oum +oum +oum +aNW +aNW +aNW +aNW +aNW +aNW +aNW +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -62427,126 +62431,126 @@ wYa (36,1,1) = {" wYa qpk -cbu -pPG -jhv -eXA -jhv -jhv -jhv -eXA -jhv +bVN eXA eXA -jhv -jhv -cbu -pNy -nOe -vwy -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe vwy -nOe vwy -nOe xdu -nOe -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -62563,30 +62567,30 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -62611,54 +62615,54 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -62684,26 +62688,48 @@ wYa (37,1,1) = {" wYa qpk -rZo -qkr -pPG -eXA -jhv -eXA -jhv -jhv -eXA -jhv +oYl +aEE eXA eXA -jhv -cbu -pNy -nOe -nOe -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -62711,97 +62737,75 @@ vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe vwy vwy vwy vwy vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy -nOe vwy -nOe xdu -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -nOe -nOe vwy vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -62813,40 +62817,40 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -62869,53 +62873,53 @@ aNW aNW aNW aNW -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -62942,45 +62946,49 @@ wYa wYa qpk qpk -cbu -pPG +bVN eXA eXA -jhv eXA -jhv eXA -jhv -jhv eXA -jhv -cbu -pNy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -62991,72 +62999,68 @@ vwy vwy vwy vwy -nOe vwy vwy vwy -nOe vwy -nOe vwy -nOe xdu vwy -nOe -vwy -nOe -nOe vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe vwy vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -63068,46 +63072,46 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -63128,51 +63132,51 @@ aNW aNW aNW aNW -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -63199,41 +63203,49 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA -jhv -jhv -jhv eXA -jhv eXA -jhv -jhv -cbu -pNy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -63241,24 +63253,15 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe vwy vwy -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe vwy vwy xdu -nOe vwy vwy vwy @@ -63272,46 +63275,47 @@ vwy vwy vwy vwy -nOe -nOe vwy vwy vwy vwy -nOe -nOe vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe vwy -nOe -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -63325,51 +63329,51 @@ aNW aNW aNW vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW -nOe +vwy aNW aNW aNW @@ -63387,50 +63391,50 @@ aNW aNW aNW wVF -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -63456,44 +63460,50 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA -jhv eXA -jhv -jhv eXA -jhv -jhv -jhv -cbu -pNy -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -63501,11 +63511,6 @@ vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe vwy vwy vwy @@ -63513,60 +63518,59 @@ vwy vwy vwy vwy -nOe xdu vwy vwy vwy vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -63580,53 +63584,53 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -63646,48 +63650,48 @@ aNW wVF aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -63712,77 +63716,68 @@ wYa (41,1,1) = {" wYa qpk -ptv -gxR -pPG -jhv +aHG +vZt eXA -jhv eXA -jhv -jhv -jhv eXA -jhv -jhv -cbu -pNy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe xdu vwy vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe vwy vwy vwy @@ -63790,37 +63785,46 @@ vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -63835,58 +63839,58 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -63905,46 +63909,46 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -63969,48 +63973,50 @@ wYa (42,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv +bVN eXA eXA eXA -jhv eXA -jhv -jhv -jhv -ptv -gxR -pNy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -64020,12 +64026,10 @@ vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe vwy vwy xdu @@ -64034,25 +64038,6 @@ vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy @@ -64060,23 +64045,42 @@ vwy vwy vwy vwy -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -64088,65 +64092,65 @@ oum oum aNW aNW -nOe -nOe +vwy +vwy kgZ kgZ kgZ -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW -nOe +vwy aNW aNW aNW @@ -64164,44 +64168,44 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -64226,112 +64230,112 @@ wYa (43,1,1) = {" wYa qpk -cbu -pPG -jhv -eXA -jhv -jhv +bVN eXA eXA eXA eXA -jhv -jhv -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe xdu vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -vwy -vwy -vwy -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -64344,68 +64348,68 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -64424,42 +64428,42 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -64483,37 +64487,52 @@ wYa (44,1,1) = {" wYa qpk -rZo -qkr -pPG +oYl +aEE eXA eXA -jhv -jhv -jhv eXA eXA -jhv -jhv -cbu -pNy -nOe -nOe -vwy -vwy -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -64522,36 +64541,15 @@ vwy vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy vwy -nOe vwy xdu vwy vwy vwy -nOe -nOe -vwy -vwy -nOe -nOe vwy vwy vwy @@ -64563,7 +64561,6 @@ vwy vwy vwy vwy -nOe vwy vwy vwy @@ -64571,22 +64568,29 @@ vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -64599,71 +64603,71 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -64683,41 +64687,41 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -64741,108 +64745,108 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA eXA eXA eXA -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -vwy -vwy -vwy -vwy -vwy -nOe -nOe -qNG -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -64854,75 +64858,75 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -64941,40 +64945,40 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -64998,55 +65002,56 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv +bVN eXA -jhv -jhv -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -65055,50 +65060,49 @@ vwy vwy vwy vwy -nOe xdu -nOe -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -65110,78 +65114,78 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -65200,38 +65204,38 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -65255,25 +65259,91 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -eXA -jhv +bVN eXA eXA eXA eXA -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -65281,79 +65351,13 @@ vwy vwy vwy vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -qNG -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -65365,34 +65369,34 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -65413,7 +65417,6 @@ nCe nCe nCe nCe -mHW nCe nCe nCe @@ -65426,22 +65429,23 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy wVF aNW aNW @@ -65459,37 +65463,37 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -65512,21 +65516,86 @@ wYa wYa qpk qpk -cbu -pPG -eXA -jhv -jhv -jhv -jhv +bVN eXA eXA -jhv -jhv -cbu -pNy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -65534,82 +65603,17 @@ vwy vwy vwy vwy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -vwy -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -nOe -qNG -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -65621,29 +65625,29 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -65689,18 +65693,18 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy aNW aNW aNW @@ -65717,36 +65721,36 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -65769,40 +65773,46 @@ wYa wYa qpk qpk -cbu -pPG -jhv -eXA -jhv -jhv +bVN eXA eXA -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -vwy -vwy -vwy -vwy -vwy -vwy -vwy -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -65813,58 +65823,52 @@ vwy vwy vwy vwy -nOe vwy vwy vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe vwy -nOe xdu vwy vwy vwy vwy -nOe vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -65877,89 +65881,89 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy aNW aNW aNW @@ -65975,35 +65979,35 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -66026,74 +66030,66 @@ wYa wYa qpk qpk -cbu -pPG +bVN eXA -jhv -jhv eXA -jhv eXA -jhv -jhv -jhv -rZo -qkr -pNy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe vwy vwy -nOe vwy -nOe -nOe -nOe xdu vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy @@ -66103,24 +66099,32 @@ vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe vwy vwy vwy vwy -nOe -nOe -nOe vwy vwy vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -66133,93 +66137,93 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -66233,34 +66237,34 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -66283,44 +66287,78 @@ wYa wYa qpk qpk -cbu -pPG +bVN eXA eXA -jhv -jhv eXA eXA -jhv -jhv eXA -jhv -cbu -pNy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -66329,7 +66367,6 @@ vwy vwy vwy vwy -nOe vwy vwy vwy @@ -66338,45 +66375,12 @@ vwy vwy vwy vwy -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe vwy vwy vwy -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -66389,95 +66393,95 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -66492,31 +66496,31 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -66540,35 +66544,44 @@ wYa wYa qpk qpk -rZo -qkr -pPG -jhv +oYl +aEE eXA -jhv eXA -jhv -jhv -jhv -jhv -jhv -cbu -pNy -nOe -vwy -vwy -vwy -vwy -vwy -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -66582,54 +66595,45 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe vwy -nOe vwy -nOe vwy -nOe xdu vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -66645,33 +66649,33 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -66717,26 +66721,26 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -66751,29 +66755,29 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -66798,93 +66802,93 @@ wYa qpk qpk qpk -cbu -pPG -jhv -jhv -jhv -eXA -jhv +bVN eXA eXA -jhv -jhv -cbu -pNy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -nOe -nOe -qNG vwy vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -66900,35 +66904,35 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -66974,27 +66978,27 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -67010,26 +67014,26 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -67054,91 +67058,91 @@ wYa wYa qpk qpk -ptv -gxR -pPG -jhv -jhv -eXA -jhv -jhv +aHG +vZt eXA eXA -jhv -jhv -cbu -pNy -nOe -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy -nOe -nOe xdu vwy vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -67156,35 +67160,35 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -67224,7 +67228,7 @@ nCe nCe nCe nCe -vCL +xBq iXd nCe nCe @@ -67232,28 +67236,28 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -67269,24 +67273,24 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -67311,89 +67315,89 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA eXA -jhv eXA -jhv eXA -jhv eXA -jhv -cbu -pNy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -qNG +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -67412,36 +67416,36 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -67489,30 +67493,30 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -67528,22 +67532,22 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -67568,47 +67572,49 @@ wYa wYa qpk qpk -cbu -pPG -jhv -eXA -jhv -jhv +bVN eXA eXA -jhv -jhv -jhv -jhv -cbu -pNy -nOe -vwy -nOe -vwy -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -67617,38 +67623,36 @@ vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe vwy vwy vwy xdu vwy -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -67667,38 +67671,38 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -67746,31 +67750,31 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -67786,20 +67790,20 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -67825,84 +67829,84 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN eXA -jhv -jhv eXA -jhv eXA -jhv -jhv -jhv -cbu -pNy -nOe -vwy -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy vwy vwy vwy vwy vwy vwy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -nOe vwy vwy vwy vwy vwy -nOe vwy vwy vwy -qNG vwy vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -67922,40 +67926,40 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -68003,32 +68007,32 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy xdu -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -68045,18 +68049,18 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -68082,50 +68086,53 @@ wYa wYa qpk qpk -cbu -pPG +bVN eXA eXA eXA eXA -jhv -jhv -jhv -jhv -jhv -jhv -cbu -pNy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -68135,16 +68142,9 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe -nOe xdu -nOe -nOe -vwy -nOe vwy vwy vwy @@ -68153,11 +68153,15 @@ vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -68177,42 +68181,42 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -68260,34 +68264,34 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -qNG -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -68303,17 +68307,17 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -68339,81 +68343,81 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -jhv -jhv +bVN eXA -jhv -jhv -jhv -jhv -ptv -gxR -pNy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu vwy vwy vwy -nOe vwy vwy vwy -nOe vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe -vwy -nOe -nOe -qNG vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -68433,43 +68437,43 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -68517,35 +68521,35 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -68561,16 +68565,16 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -68596,137 +68600,137 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -eXA -eXA -jhv +bVN eXA eXA eXA -jhv -cbu -pNy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy vwy -nOe vwy vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe xdu vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -aNW -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +aNW +aNW +aNW +aNW +oum +oum +oum +oum +oum +oum +oum +oum +oum +oum +oum +aNW +aNW +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -68774,37 +68778,37 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -68820,14 +68824,14 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -68852,79 +68856,79 @@ wYa (61,1,1) = {" wYa qpk -ptv -gxR -pPG -jhv +aHG +vZt eXA eXA eXA -jhv -jhv eXA -jhv -jhv -cbu -pNy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +bVN vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -qNG vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -68944,46 +68948,46 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -69031,39 +69035,39 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -69081,9 +69085,9 @@ aNW aNW aNW aNW -nOe -nOe -nOe +vwy +vwy +vwy aNW iGM iGM @@ -69109,30 +69113,19 @@ wYa (62,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv +bVN eXA eXA -jhv eXA -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN vwy vwy vwy @@ -69141,45 +69134,56 @@ vwy vwy vwy vwy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -nOe -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -qNG vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -69199,48 +69203,48 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -69288,40 +69292,40 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -69366,76 +69370,76 @@ wYa (63,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -eXA -eXA -jhv -jhv +bVN eXA eXA eXA -jhv -cbu -pNy -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -69454,50 +69458,50 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -69545,42 +69549,42 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -69623,75 +69627,75 @@ wYa (64,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -eXA -jhv -jhv -jhv +bVN eXA eXA -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN vwy vwy -nOe -vwy -nOe vwy vwy -nOe vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -69710,51 +69714,51 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -69802,42 +69806,42 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -69880,73 +69884,73 @@ wYa (65,1,1) = {" wYa rne -wUO -ryx -aYy +xNj eoi eoi -aYy -aYy eoi -aYy -aYy -aYy -aYy -wUO -ybi -qNG -xdu -xdu -qNG -qNG -xdu -qNG -qNG +eoi +eoi +eoi +eoi +eoi +eoi +eoi +eoi +xNj +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu xdu xdu xdu -qNG -qNG -xdu -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -xdu -qNG -qNG -xdu -qNG -qNG -qNG -qNG xdu xdu xdu -qNG xdu xdu -qNG -qNG -qNG -qNG -qNG -qNG xdu -qNG -qNG xdu -qNG -qNG -qNG -qNG wVF wVF wVF @@ -69964,54 +69968,54 @@ wVF wVF wVF wVF -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu wVo -qNG -qNG -qNG xdu -qNG -qNG -qNG -qNG -qNG +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu tjO tjO tjO @@ -70059,44 +70063,44 @@ tjO tjO tjO tjO -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu wVF wVF wVF @@ -70137,138 +70141,138 @@ wYa (66,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv -jhv -jhv +bVN eXA -jhv -jhv eXA -jhv -cbu -pNy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe vwy xdu vwy vwy -nOe -nOe -nOe -nOe -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +aNW +aNW +aNW +oum +oum +oum +oum +oum +oum +oum +oum +oum +aNW +aNW +aNW +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vUj +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -70316,45 +70320,45 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -70394,71 +70398,71 @@ wYa (67,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -eXA -jhv -eXA -jhv +bVN eXA eXA eXA -jhv -cbu -pNy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe -nOe vwy vwy -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe xdu -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy aNW aNW aNW @@ -70475,57 +70479,57 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -70581,7 +70585,7 @@ nCe nCe nCe nCe -mHW +nCe tjO nCe nCe @@ -70600,19 +70604,19 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -70651,70 +70655,70 @@ wYa (68,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv +bVN eXA eXA eXA -jhv eXA eXA -jhv -jhv -cbu -pNy -vwy -vwy -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +bVN vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -qNG -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy aNW aNW aNW @@ -70731,58 +70735,58 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -70862,16 +70866,16 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -70908,138 +70912,138 @@ wYa (69,1,1) = {" wYa qpk -cbu -pPG -jhv -eXA -eXA -jhv +bVN eXA eXA eXA -jhv -jhv -jhv -cbu -pNy -nOe -vwy -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe xdu vwy -nOe -nOe -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -aNW -aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +aNW +aNW +aNW +oum +oum +oum +oum +oum +oum +oum +aNW +aNW +aNW +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -71095,13 +71099,9 @@ nCe nCe nCe nCe -mHW +nCe tjO nCe -mHW -nCe -nCe -mHW nCe nCe nCe @@ -71119,17 +71119,21 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +nCe +nCe +nCe +nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -71165,68 +71169,68 @@ wYa (70,1,1) = {" wYa qpk -cbu -pPG -jhv +bVN eXA eXA -jhv -jhv -jhv eXA -jhv -jhv -jhv -cbu -pNy -vwy -vwy -nOe -nOe -nOe -nOe +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +bVN vwy vwy vwy vwy vwy -nOe -vwy -nOe -vwy -nOe vwy vwy vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe vwy vwy -nOe -qNG -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy aNW aNW aNW @@ -71242,61 +71246,61 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -71353,10 +71357,7 @@ nCe nCe nCe nCe -bGJ -nCe -mHW -mHW +tjO nCe nCe nCe @@ -71376,18 +71377,21 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +nCe +nCe +nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -71422,46 +71426,19 @@ wYa (71,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA eXA -jhv -jhv -jhv -jhv baG -pNy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -nOe -nOe vwy vwy vwy @@ -71469,20 +71446,47 @@ vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe -nOe -qNG -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy aNW aNW aNW @@ -71497,63 +71501,63 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -71613,7 +71617,6 @@ nCe tjO nCe nCe -mHW nCe nCe nCe @@ -71633,19 +71636,20 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -71679,66 +71683,66 @@ wYa (72,1,1) = {" wYa qpk -rZo -uEP -qkr -pPG -jhv -jhv +oYl +gAH +aEE +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA +eXA eXA -jhv -jhv -jhv -jhv -jhv -jhv -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -qNG +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu aNW aNW aNW @@ -71753,64 +71757,64 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -71890,20 +71894,20 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -71938,36 +71942,18 @@ wYa qpk htc qpk -rZo -qkr -pPG +oYl +aEE +eXA +eXA +eXA +eXA eXA eXA -jhv -jhv -jhv fyc fyc fyc fyc -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy vwy @@ -71977,25 +71963,43 @@ vwy vwy vwy vwy -nOe vwy vwy vwy -nOe vwy vwy -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -qNG +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu aNW aNW aNW @@ -72008,66 +72012,66 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -72108,7 +72112,7 @@ nCe nCe nCe nCe -vCL +xBq xpd xpd xpd @@ -72126,7 +72130,7 @@ xpd xpd jRb xpd -dzs +xpd jIh xpd xpd @@ -72148,20 +72152,20 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -72196,12 +72200,12 @@ qpk rwW qpk qpk -cbu -pPG -jhv -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA +eXA fyc fyc fyc @@ -72209,49 +72213,49 @@ fyc fyc fyc fyc -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe vwy vwy -nOe -nOe vwy -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy wVF aNW aNW @@ -72264,67 +72268,67 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -72453,11 +72457,11 @@ qpk rwW qpk qpk -cbu -pPG -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA fyc fyc fyc @@ -72467,26 +72471,6 @@ fyc fyc fyc fyc -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy @@ -72496,19 +72480,39 @@ vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy wVF aNW oum @@ -72520,68 +72524,68 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -72710,36 +72714,21 @@ qpk rwW qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc fyc fyc -jhv -jhv -jhv +eXA +eXA +eXA fyc fyc fyc fyc -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe vwy vwy vwy @@ -72748,23 +72737,38 @@ vwy vwy vwy vwy -nOe -nOe -vwy -vwy -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW wVF oum @@ -72777,68 +72781,68 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -72967,61 +72971,61 @@ qpk rwW qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc fyc fyc -jhv +eXA bHg -pNy -nOe +vwy +vwy fyc fyc fyc fyc -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW cKh oum @@ -73033,69 +73037,69 @@ oum aNW aNW aNW -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -73154,7 +73158,7 @@ nCe nCe tjO nCe -mHW +nCe nCe nCe nCe @@ -73224,60 +73228,60 @@ qpk rwW qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy fyc fyc fyc fyc fyc -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW cKh @@ -73289,70 +73293,70 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -73403,7 +73407,7 @@ nCe nCe nCe nCe -nCe +aqn fHJ szA ulS @@ -73415,14 +73419,14 @@ szA ulS szA fHJ +aqn +aqn nCe nCe nCe nCe nCe nCe -mHW -nCe nCe nCe nCe @@ -73481,60 +73485,60 @@ qpk cDi qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy fyc fyc fyc fyc fyc -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe vwy vwy vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum cKh @@ -73545,71 +73549,71 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vUj -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -73738,40 +73742,25 @@ qpk qpk qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy fyc fyc fyc fyc -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe vwy vwy vwy @@ -73779,18 +73768,33 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -73801,59 +73805,59 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -73940,7 +73944,7 @@ nCe twu nCe nCe -vCL +xBq xpd xpd xpd @@ -73993,38 +73997,28 @@ wYa wYa qpk qpk -ptv -xbw -gxR -pPG -jhv -jhv +aHG +cos +vZt +eXA +eXA +eXA fyc fyc -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy fyc fyc fyc fyc -nOe -nOe -nOe -nOe -vwy -vwy -vwy -nOe -vwy -nOe vwy vwy vwy @@ -74036,18 +74030,28 @@ vwy vwy vwy vwy -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -74057,54 +74061,54 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -74118,7 +74122,7 @@ vUj nCe nCe nCe -mHW +nCe nCe nCe nCe @@ -74149,9 +74153,9 @@ nCe hwh mHN hwh +aqn nCe nCe -mHW nCe nCe nCe @@ -74250,30 +74254,28 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA +eXA fyc fyc -jhv -jhv -jhv -cbu -pNy -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe fyc fyc fyc -nOe -nOe vwy vwy vwy @@ -74286,10 +74288,6 @@ vwy vwy vwy vwy -nOe -nOe -vwy -nOe vwy vwy vwy @@ -74297,14 +74295,20 @@ vwy vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -74313,55 +74317,55 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -74377,7 +74381,7 @@ nCe nCe nCe nCe -mHW +nCe nCe nCe nCe @@ -74406,24 +74410,24 @@ nCe aFB tzn tmQ -nCe -nCe -mHW -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn wzX -eSN -eSN -eSN -eSN -eSN -eSN -eSN +fIk +fIk +fIk +fIk +fIk +fIk +fIk wzX -nCe -nCe -nCe +aqn +aqn +aqn nCe nCe nCe @@ -74507,60 +74511,60 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA fyc fyc fyc -jhv -jhv -ptv -gxR -pNy -nOe +eXA +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe fyc fyc fyc -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -74570,55 +74574,55 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -74667,24 +74671,24 @@ wzX eSN eSN eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk wzX wzX eSN -eSN -eSN -eSN -eSN -eSN +fIk +fIk +fIk +fIk +fIk ulS rul lzq @@ -74764,59 +74768,59 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA eXA fyc fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe fyc fyc fyc -nOe -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -74825,45 +74829,45 @@ oum cKh aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -74920,28 +74924,28 @@ idS haN ewJ hwh -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk szA lzq lzq @@ -75021,59 +75025,59 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA eXA fyc fyc fyc -jhv -jhv -jhv -cbu -pNy -nOe -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe fyc fyc fyc -nOe -nOe -vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe vwy vwy vwy -nOe -vwy -nOe -vwy -vwy -nOe vwy vwy vwy -nOe -nOe -nOe vwy -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -75081,45 +75085,45 @@ oum oum wVF aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -75157,8 +75161,8 @@ nCe nCe nCe nCe -bsv -hin +gTx +nME nCe nCe nCe @@ -75177,28 +75181,28 @@ mrO jlb kHv idS -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk fHJ btA jss @@ -75278,58 +75282,58 @@ wYa wYa qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA eXA fyc fyc fyc -jhv -jhv -jhv -cbu -pNy -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe fyc fyc fyc -nOe vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -75337,46 +75341,46 @@ oum oum aNW wVF -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -75396,8 +75400,8 @@ nCe nCe nCe nCe -bsv -iNE +gTx +iVY twu vUj nCe @@ -75444,18 +75448,18 @@ idr idr idr idr -idr -idr -eSN -eSN +pXz +pXz +fIk +fIk wzX wzX idr idr idr idr -eSN -eSN +fIk +fIk szA hsF uAR @@ -75535,31 +75539,30 @@ wYa wYa qpk qpk -cbu -pPG +bVN +eXA +eXA eXA -jhv fyc fyc fyc -jhv -jhv -jhv -cbu -pNy -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe fyc fyc fyc -nOe vwy vwy vwy @@ -75572,21 +75575,22 @@ vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -75594,46 +75598,46 @@ oum oum aNW wVF -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -75652,7 +75656,7 @@ nCe nCe nCe nCe -bsv +gTx xBq nCe nCe @@ -75697,22 +75701,22 @@ nPy nPy nPy pRP -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn ulS rtv bCI @@ -75792,56 +75796,56 @@ wYa wYa qpk qpk -cbu -pPG +bVN +eXA +eXA eXA -jhv fyc fyc -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe fyc fyc -nOe -nOe -nOe vwy vwy vwy vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -75850,47 +75854,47 @@ oum aNW aNW aNW -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -75954,22 +75958,22 @@ nPy nPy nPy pRP -nCe -ied -jWj -jWj -jWj -jWj -jWj -jWj -jWj -jWj -jWj -jWj -jWj -jWj -kHe -nCe +aqn +dNR +tYs +tYs +tYs +tYs +tYs +tYs +tYs +tYs +tYs +tYs +tYs +tYs +hbo +aqn szA lzq ylw @@ -76049,56 +76053,56 @@ wYa wYa qpk qpk -cbu -pPG +bVN +eXA +eXA eXA -jhv fyc fyc -jhv -jhv -jhv -jhv -cbu -pNy -nOe +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe fyc fyc -nOe -nOe vwy vwy vwy vwy vwy -nOe vwy vwy vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum @@ -76106,26 +76110,26 @@ oum oum aNW aNW -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -76133,21 +76137,21 @@ nCe nCe nCe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -76196,7 +76200,7 @@ nCe nCe nCe nCe -nCe +aqn fdg rav uwX @@ -76211,22 +76215,22 @@ nPy nPy nPy pRP -nCe -izZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -lzL -nCe +aqn +wCG +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +fkd +aqn fHJ lbL xig @@ -76306,55 +76310,55 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc -jhv -jhv -jhv -jhv -cbu -pNy -nOe -vwy -nOe -vwy -nOe +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe fyc fyc -nOe -nOe vwy vwy vwy -nOe -nOe vwy vwy vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -76362,26 +76366,26 @@ oum oum aNW aNW -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -76452,8 +76456,8 @@ nCe nCe nCe nCe -nCe -nCe +aqn +aqn fdg xDE uLx @@ -76468,22 +76472,22 @@ nPy nPy nPy pRP -nCe -izZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -lzL -nCe +aqn +wCG +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +fkd +aqn fHJ fHJ tWf @@ -76563,55 +76567,55 @@ wYa wYa qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe -nOe +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe vwy -nOe -nOe -nOe fyc fyc -nOe -nOe -vwy -nOe vwy vwy vwy vwy -nOe vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum @@ -76619,26 +76623,26 @@ oum aNW aNW aNW -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -76668,7 +76672,7 @@ nCe nCe nCe gTx -vCL +xBq nCe nCe nCe @@ -76710,7 +76714,7 @@ mjQ mjQ mjQ mjQ -nCe +aqn psP sGM vJd @@ -76725,23 +76729,23 @@ nPy nPy nPy pRP -nCe -izZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -lzL -nCe -nCe +aqn +wCG +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +fkd +aqn +aqn bvP fTj fOl @@ -76820,54 +76824,54 @@ wYa wYa qpk qpk -rZo -qkr +oYl +aEE +eXA eXA -jhv fyc fyc -jhv -jhv -jhv -jhv -cbu -pNy -nOe -nOe +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe vwy -nOe vwy -nOe -nOe fyc fyc vwy -nOe -vwy -nOe vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe vwy vwy vwy -nOe -nOe -nOe vwy vwy -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -76875,27 +76879,27 @@ oum oum aNW aNW -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -76982,23 +76986,23 @@ hby heZ pRP pRP -nCe -izZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -lzL -nCe -nCe +aqn +wCG +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +fkd +aqn +aqn tCu bdm jgc @@ -77078,53 +77082,53 @@ wYa qpk qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA fyc fyc -jhv -jhv -jhv -ptv -gxR -pNy -nOe +eXA +eXA +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe fyc fyc -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe vwy vwy vwy -nOe -vwy -nOe -vwy -nOe vwy vwy -nOe -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -77132,17 +77136,17 @@ oum aNW aNW aNW -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -77239,23 +77243,23 @@ kzS koV srR gWp -nCe -izZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -lzL -nCe -nCe +aqn +wCG +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +fkd +aqn +aqn tCu vXK lSf @@ -77333,75 +77337,75 @@ wYa (94,1,1) = {" wYa qpk -ptv -xbw -gxR -pPG -jhv +aHG +cos +vZt +eXA +eXA fyc fyc -jhv -jhv -jhv -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe fyc fyc -nOe -nOe vwy vwy vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum oum aNW aNW -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +nCe nCe nCe -mHW nCe nCe nCe @@ -77496,23 +77500,23 @@ bhP ccZ lPO ord -nCe -izZ -kgZ -kgZ -kgZ -kgZ -kgZ +aqn +wCG +aWW +aWW +aWW +aWW +aWW uxn -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -lzL -nCe -nCe +aWW +aWW +aWW +aWW +aWW +aWW +fkd +aqn +aqn bvP bkk nhb @@ -77590,54 +77594,54 @@ wYa (95,1,1) = {" wYa qpk -cbu -pPG -jhv +bVN +eXA +eXA +eXA eXA -jhv fyc fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe fyc fyc -nOe -nOe -nOe vwy vwy vwy vwy -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -77645,16 +77649,16 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy vwy nCe nCe @@ -77753,22 +77757,22 @@ nnY oso lPO gWp -nCe -izZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -kgZ -lzL -nCe +aqn +wCG +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +aWW +fkd +aqn fHA bvP aTi @@ -77788,8 +77792,8 @@ eBV kVJ qGi vCy -nCe -nCe +aqn +aqn nCe nCe nCe @@ -77847,54 +77851,54 @@ wYa (96,1,1) = {" wYa qpk -cbu -pPG -jhv +bVN +eXA +eXA +eXA eXA -jhv fyc fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe fyc fyc -nOe vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum @@ -77902,17 +77906,17 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -78010,10 +78014,10 @@ jfE uOm nub kMH -nCe -iEL -kjF -kjF +aqn +ate +ehK +ehK ggz gUf pPn @@ -78021,11 +78025,11 @@ soo pPn cQC ggz -kjF -kjF -kjF -lUS -nCe +ehK +ehK +ehK +pEp +aqn fHA lCv acC @@ -78045,8 +78049,8 @@ hDN stJ stJ vCy -nCe -nCe +aqn +aqn nCe nCe nCe @@ -78104,53 +78108,53 @@ wYa (97,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA +eXA fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe fyc fyc -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe -vwy -nOe vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -78158,18 +78162,18 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -78266,11 +78270,11 @@ oiI hSU uMf nub -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn xQN bJT uNr @@ -78278,11 +78282,11 @@ dvT uNr ruB xQN -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn vIg nVH ekK @@ -78302,8 +78306,8 @@ eBV lPp rTT vCy -nCe -nCe +aqn +aqn nCe nCe nCe @@ -78361,52 +78365,52 @@ wYa (98,1,1) = {" wYa qpk -cbu -pPG -jhv +bVN +eXA +eXA +eXA +eXA eXA -jhv -jhv fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe fyc fyc -nOe -nOe -vwy -vwy -nOe -vwy -vwy -nOe -nOe vwy vwy vwy -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -78415,12 +78419,12 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -qNG +vwy +vwy +vwy +vwy +vwy +xdu nCe nCe nCe @@ -78523,9 +78527,9 @@ xyn iVI nxd vAb -nCe -nCe -nCe +aqn +aqn +aqn doc soo doc @@ -78537,9 +78541,9 @@ mGB doc soo doc -nCe -nCe -nCe +aqn +aqn +aqn vIg iJv hYJ @@ -78560,8 +78564,8 @@ stJ stJ vCy vCy -nCe -nCe +aqn +aqn nCe nCe nCe @@ -78618,51 +78622,51 @@ wYa (99,1,1) = {" wYa qpk -cbu -pPG -jhv +bVN +eXA +eXA +eXA +eXA eXA -jhv -jhv fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe -vwy -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe vwy -nOe fyc fyc -nOe -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -78672,11 +78676,11 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -78780,9 +78784,9 @@ ePT nxv xgC vjb -nCe -nCe -nCe +aqn +aqn +aqn ggz hTM hYa @@ -78794,9 +78798,9 @@ ruB gpm cus ggz -nCe -nCe -nCe +aqn +aqn +aqn bMx joW wao @@ -78817,8 +78821,8 @@ oYn cen ieS hfw -nCe -nCe +aqn +aqn nCe nCe nCe @@ -78875,51 +78879,51 @@ wYa (100,1,1) = {" wYa qpk -cbu -pPG +bVN +eXA +eXA +eXA eXA -jhv -jhv fyc fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe fyc fyc -nOe -nOe -vwy -nOe vwy vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -78928,15 +78932,15 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe -mHW +nCe nCe nCe nCe @@ -79037,9 +79041,9 @@ cZO kEP nyl vAb -nCe -nCe -nCe +aqn +aqn +aqn ggz hTM got @@ -79051,9 +79055,9 @@ ruB gRB oTe xQN -nCe -nCe -nCe +aqn +aqn +aqn vIg lhX toQ @@ -79074,9 +79078,9 @@ jod tZJ eAI hfw -nCe -nCe -nCe +aqn +aqn +aqn nCe nCe nCe @@ -79132,50 +79136,50 @@ wYa (101,1,1) = {" wYa qpk -cbu -pPG +bVN +eXA +eXA +eXA eXA -jhv -jhv fyc fyc -jhv -jhv -ptv -gxR -pNy -nOe -nOe -nOe +eXA +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe vwy -nOe fyc fyc fyc -nOe vwy vwy vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -79185,14 +79189,14 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy tjO -mHW +nCe nCe nCe nCe @@ -79308,9 +79312,9 @@ cHN gRB uLU ggz -nCe -nCe -nCe +aqn +aqn +aqn vIg cua wao @@ -79331,31 +79335,31 @@ qrz wXK tZJ mJK -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn hAR dvS -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn xyp bEQ kEr xyp -nCe -nCe +aqn +aqn xyp bEQ kEr xyp -nCe +aqn xyp sTw xyp @@ -79389,49 +79393,49 @@ wYa (102,1,1) = {" wYa qpk -cbu -pPG +bVN +eXA +eXA +eXA eXA -jhv -jhv fyc fyc -jhv -jhv -cbu -pNy -pNy -nOe -vwy -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe -nOe fyc fyc fyc -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -79442,12 +79446,12 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -79508,7 +79512,7 @@ nCe nCe nCe nCe -vCL +xBq xpd xpd xpd @@ -79565,9 +79569,9 @@ ajt mlo egk doc -nCe -nCe -nCe +aqn +aqn +aqn fHA nIt toQ @@ -79588,31 +79592,31 @@ tTd tZJ jOe kxI -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn xyp tXx pky xyp -nCe -nCe +aqn +aqn xyp jwT dZA xyp -nCe +aqn hAR sTw hAR @@ -79646,49 +79650,49 @@ wYa (103,1,1) = {" wYa qpk -cbu -pPG +bVN +eXA +eXA +eXA eXA -jhv -jhv fyc fyc -jhv -jhv -cbu -pNy -pNy -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe fyc fyc -nOe vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW aNW @@ -79699,12 +79703,12 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -79845,19 +79849,19 @@ nKl wXK tZJ mJK -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn hAR hAR owj @@ -79903,49 +79907,49 @@ wYa (104,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe fyc fyc -nOe -vwy -nOe vwy vwy -nOe vwy vwy -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -79955,13 +79959,13 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe vwy -nOe +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -80102,13 +80106,13 @@ uOl tZJ eqC hfw -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn hAR xyp xyp @@ -80160,48 +80164,48 @@ wYa (105,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe -vwy -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe fyc fyc -nOe -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -80212,13 +80216,13 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -80359,12 +80363,12 @@ oye tZJ eSQ hfw -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn iwU hAR aFa @@ -80417,48 +80421,48 @@ wYa (106,1,1) = {" wYa qpk -cbu -pPG -jhv +bVN +eXA +eXA +eXA eXA -jhv fyc fyc -jhv -jhv -gAH -oYE -nOe +eXA +eXA +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe fyc fyc -nOe -vwy -vwy -vwy -nOe -vwy -vwy -nOe -nOe vwy vwy vwy vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum @@ -80469,13 +80473,13 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -80618,10 +80622,10 @@ rIJ ufL ufL kBj -nCe -nCe -twu -twu +aqn +aqn +qkr +pNy qIh niT jyQ @@ -80674,48 +80678,48 @@ wYa (107,1,1) = {" wYa qpk -cbu -pPG -jhv -jhv -jhv +bVN +eXA +eXA +eXA +eXA fyc fyc -jhv -jhv -jhv -cbu -nOe +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe fyc fyc -nOe vwy vwy -nOe vwy vwy -nOe -nOe vwy vwy -nOe vwy -nOe vwy -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum @@ -80725,14 +80729,14 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -80875,10 +80879,10 @@ mjW qai ufL wpQ -nCe -twu -twu -twu +aqn +qkr +pPG +qkr uwm sFa cMV @@ -80931,47 +80935,47 @@ wYa (108,1,1) = {" wYa qpk -rZo -qPb -qkr -pPG -jhv -jhv +oYl +gAH +aEE +eXA +eXA +eXA fyc fyc -jhv -jhv -cbu +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe fyc fyc fyc -nOe -nOe -nOe -vwy -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe vwy -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -80981,15 +80985,15 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -81132,10 +81136,10 @@ mjW gPH lWA iHN -nCe -twu -twu -twu +aqn +pNy +qkr +pPG tnQ xyp rds @@ -81190,45 +81194,45 @@ wYa qpk qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc -jhv -jhv -cbu -nOe -nOe -nOe -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe vwy -nOe -nOe -nOe fyc fyc fyc -nOe -nOe vwy vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -81238,15 +81242,15 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -81389,11 +81393,11 @@ fkm gPH lWA hSM -nCe -twu -twu -nCe -nCe +aqn +qkr +pNy +aqn +aqn hmX xyp xyp @@ -81447,45 +81451,45 @@ wYa qpk qpk qpk -cbu -pPG -jhv -jhv +bVN +eXA +eXA +eXA fyc fyc -jhv -jhv -cbu -nOe -nOe -nOe -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe -nOe -nOe -nOe fyc fyc fyc -nOe -nOe -vwy -nOe -nOe vwy vwy vwy vwy -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -81494,16 +81498,16 @@ oum oum oum aNW -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -81646,14 +81650,14 @@ euc fHS lWA sbw -nCe -twu -twu -nCe -nCe -nCe -nCe -nCe +aqn +pNy +qkr +aqn +aqn +aqn +aqn +aqn mgC wCT juV @@ -81704,45 +81708,45 @@ wYa qpk qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA fyc fyc fyc -jhv -jhv -cbu +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe vwy -nOe -nOe fyc fyc fyc -nOe -nOe -nOe vwy vwy vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum @@ -81751,16 +81755,16 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -81903,14 +81907,14 @@ euc fHS ufL oXS -nCe -twu -twu -nCe -nCe -nCe -nCe -nCe +aqn +qkr +pNy +aqn +aqn +aqn +aqn +aqn mgC vDZ kpz @@ -81919,8 +81923,8 @@ csg tJf qzE cVy -nCe -nCe +aqn +aqn cVy son qVN @@ -81961,45 +81965,45 @@ wYa qpk qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA fyc fyc fyc -jhv -jhv -cbu -nOe -nOe -nOe -nOe -nOe -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe -nOe fyc fyc -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum @@ -82008,16 +82012,16 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -82160,14 +82164,14 @@ cBz epn ufL gTP -nCe -twu -twu -nCe +aqn +pNy +qkr +aqn hAR hvu -nCe -nCe +aqn +aqn mgC mgC yfi @@ -82176,8 +82180,8 @@ csg pqo pro cVy -nCe -nCe +aqn +aqn cVy pqo pro @@ -82218,44 +82222,44 @@ wYa qpk qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA fyc fyc -jhv -jhv -ptv -gxR -nOe -nOe +eXA +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe vwy vwy -nOe -nOe vwy -nOe fyc fyc -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -82265,16 +82269,16 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -82416,11 +82420,11 @@ mjW vSp qsw jkH -nCe -nCe -twu -twu -nCe +aqn +aqn +qkr +pNy +aqn onY cFy axR @@ -82475,44 +82479,44 @@ wYa qpk qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA fyc fyc -jhv -jhv -cbu -pNy +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe fyc fyc -nOe +vwy xPA -nOe -nOe -nOe -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -82521,17 +82525,17 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -82673,11 +82677,11 @@ mjW lYk iJn oEj -nCe -nCe -twu -twu -nCe +aqn +aqn +pNy +qkr +aqn nCe ilk gjW @@ -82732,44 +82736,44 @@ wYa qpk qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA fyc fyc -jhv -jhv -cbu -pNy -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe fyc fyc -nOe -nOe +vwy +vwy xPA -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -82778,17 +82782,17 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -82930,11 +82934,11 @@ mjW mjW fgw jkH -nCe -nCe -twu -twu -nCe +aqn +aqn +qkr +pNy +aqn nCe ilk gjW @@ -82989,43 +82993,43 @@ wYa qpk qpk qpk -cbu -pPG -jhv +bVN +eXA +eXA fyc fyc -jhv -jhv -cbu -pNy -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe fyc fyc fyc -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -83034,18 +83038,18 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -83187,10 +83191,10 @@ mjW ayF ufL ufL -nCe -nCe -twu -twu +aqn +aqn +pNy +qkr nCe nCe ilk @@ -83246,43 +83250,43 @@ wYa xbw xbw xbw -gxR -pPG +vZt +eXA fyc fyc fyc -jhv -jhv -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe fyc fyc fyc fyc -nOe +vwy fyc fyc -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -83291,18 +83295,18 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy wKc nCe nCe @@ -83368,7 +83372,7 @@ nCe nCe nCe twu -nCe +aqn ufW ufW ufW @@ -83443,11 +83447,11 @@ jkH oEj jkH ufL -nCe -nCe -nCe -twu -twu +aqn +aqn +aqn +qkr +pNy nCe nCe ilk @@ -83499,32 +83503,32 @@ qzz wYa "} (118,1,1) = {" -pPG -cwH -pPG -pPG -pPG -pPG -fyc -fyc -fyc jhv -ptv -gxR -pNy -nOe +cwH +jhv +jhv +eXA +eXA +fyc +fyc +fyc +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe fyc fyc fyc @@ -83532,12 +83536,12 @@ fyc fyc fyc fyc -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy eSI vRh vRh @@ -83548,18 +83552,18 @@ vux vux vRh eSI -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -83626,17 +83630,17 @@ nCe nCe twu twu -nCe -nCe +aqn +aqn utD jJc jJc rXI jJc kIH -nCe -nCe -nCe +aqn +aqn +aqn sPX rzU lVz @@ -83697,14 +83701,14 @@ fJg oPb omw bsn -nCe -nCe -nCe -nCe -nCe -twu -twu -twu +aqn +aqn +aqn +aqn +aqn +pPG +pNy +qkr nCe nCe ilk @@ -83765,24 +83769,24 @@ fyc fyc fyc fyc -jhv -cbu -pNy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe vwy vwy -nOe -nOe fyc fyc fyc @@ -83954,14 +83958,14 @@ jvp vKa qaO jNt -twu -twu -twu -twu -twu -twu -twu -twu +qkr +pNy +qkr +pNy +qkr +pNy +pPG +pNy nCe nCe ilk @@ -84021,27 +84025,27 @@ fyc fyc fyc fyc -jhv -jhv -cbu -pNy -nOe +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe fyc fyc fyc @@ -84211,13 +84215,13 @@ ozj vIJ xji apb -twu -twu -twu -twu -twu -twu -twu +pNy +qkr +pNy +qkr +pNy +qkr +pNy nCe nCe nCe @@ -84270,45 +84274,45 @@ qzz wYa "} (121,1,1) = {" -pPG +jhv eSe -pPG +jhv fyc -pPG -pPG jhv -jhv -jhv -jhv -cbu -nOe -nOe +eXA +eXA +eXA +eXA +eXA +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe eSI gNL gNL @@ -84319,18 +84323,18 @@ xkh xkh gNL eSI -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy tjO nCe nCe @@ -84394,20 +84398,20 @@ nCe nCe nCe nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn dFY rzU hME @@ -84468,10 +84472,10 @@ gZO ddi jSx wQp -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn nCe nCe nCe @@ -84527,46 +84531,46 @@ qzz wYa "} (122,1,1) = {" -pPG +jhv eSe -pPG -pPG -pPG -pPG jhv jhv jhv -ptv -gxR -nOe -vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe +eXA +eXA +eXA +eXA +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW oum oum @@ -84575,19 +84579,19 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy jtv nCe nCe @@ -84655,17 +84659,17 @@ bHw bHw bHw bHw -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn rdT rdT rdT @@ -84726,8 +84730,8 @@ kDt ogu ogu ogu -nCe -nCe +aqn +aqn nCe nCe nCe @@ -84785,44 +84789,44 @@ wYa "} (123,1,1) = {" wYa -uEP -uEP -uEP -uEP +qPb +qPb +qPb +qPb mQm -xbw -xbw -xbw -gxR -pNy -nOe +cos +cos +cos +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe vwy vwy vwy -nOe -nOe -nOe -nOe vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe aNW aNW oum @@ -84832,20 +84836,20 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu nCe nCe nCe @@ -84983,8 +84987,8 @@ mSO cOE aHr ogu -nCe -nCe +aqn +aqn nCe nCe nCe @@ -85046,40 +85050,40 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -vwy -nOe -nOe -vwy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe vwy vwy -nOe -nOe aNW oum oum @@ -85088,33 +85092,33 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -85240,8 +85244,8 @@ rNb nXP jOt kDt -nCe -nCe +aqn +aqn nCe nCe nCe @@ -85303,40 +85307,40 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe aNW oum oum @@ -85345,33 +85349,33 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -85497,8 +85501,8 @@ qUk twn kcu dGI -nCe -nCe +aqn +aqn nCe nCe nCe @@ -85560,39 +85564,39 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy aNW oum oum @@ -85602,33 +85606,33 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -85754,7 +85758,7 @@ kDP bUO jOt kDt -nCe +aqn nCe nCe nCe @@ -85817,39 +85821,39 @@ qpk qpk qpk qpk -cbu -pNy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe vwy vwy -nOe -vwy -nOe -nOe vwy vwy -nOe vwy vwy -nOe -nOe aNW oum oum @@ -85858,41 +85862,41 @@ oum oum aNW aNW -nOe -nOe vwy -nOe -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe nCe nCe nCe nCe nCe -mHW twu twu nCe @@ -85918,10 +85922,10 @@ mbR duZ xSr nCe -mHW -wJY -mHW -mHW +nCe +yel +nCe +nCe lJF bXN suW @@ -86011,10 +86015,10 @@ uge hbn snA ogu +aqn nCe nCe nCe -mHW nCe nCe nCe @@ -86044,11 +86048,11 @@ nCe nCe nCe nCe -mHW nCe -mHW -mHW -mHW +nCe +nCe +nCe +nCe pNa pNa pNa @@ -86073,39 +86077,39 @@ wYa qpk qpk qpk -ptv -gxR -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe aNW oum oum @@ -86115,38 +86119,38 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -86184,7 +86188,7 @@ dns red kBa kMw -psC +rIW lVJ ykd suW @@ -86268,7 +86272,7 @@ aDE qrZ ewh ogu -nCe +aqn nCe nCe nCe @@ -86329,40 +86333,40 @@ wYa wYa qpk qpk -ptv -gxR -nOe -nOe -nOe +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe aNW oum oum @@ -86372,38 +86376,38 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -86525,7 +86529,7 @@ nIh nIh ogu ogu -nCe +aqn nCe nCe nCe @@ -86586,40 +86590,40 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe vwy vwy vwy vwy -nOe vwy -nOe -nOe aNW oum oum @@ -86629,38 +86633,38 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -86781,8 +86785,8 @@ csi lZm nSq erl -nCe -nCe +aqn +aqn nCe nCe nCe @@ -86843,17 +86847,25 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -nOe -vwy -vwy -nOe -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -86863,19 +86875,11 @@ vwy vwy vwy vwy -nOe vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe aNW aNW oum @@ -86885,39 +86889,39 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -87038,8 +87042,8 @@ vsu clm erl erl -nCe -nCe +aqn +aqn nCe nCe nCe @@ -87100,27 +87104,31 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -vwy -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -87129,10 +87137,6 @@ vwy vwy vwy vwy -nOe -nOe -nOe -nOe aNW oum oum @@ -87142,39 +87146,39 @@ oum oum oum aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -87294,10 +87298,10 @@ aQb lBh erl erl -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn nCe nCe nCe @@ -87310,8 +87314,8 @@ mNw vfC bZQ mNw -nCe -nCe +aqn +aqn cSV cSV cSV @@ -87357,38 +87361,38 @@ wYa wYa qpk qpk -cbu -pNy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -vwy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe aNW aNW oum @@ -87399,39 +87403,39 @@ aNW aNW oum aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -87550,11 +87554,11 @@ tew vLm foE erl -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn nCe nCe nCe @@ -87567,7 +87571,7 @@ jHl cVX kqh mNw -nCe +aqn cSV cSV cSV @@ -87614,38 +87618,38 @@ wYa wYa qpk qpk -cbu -pNy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe vwy -nOe vwy -nOe -nOe aNW aNW oum @@ -87656,39 +87660,39 @@ aNW oum oum aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -87807,11 +87811,11 @@ sZq ikt vsu erl -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn nCe nCe nCe @@ -87870,39 +87874,39 @@ wYa (135,1,1) = {" wYa qpk -ptv -gxR -nOe -nOe -vwy -vwy -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe aNW aNW oum @@ -87913,39 +87917,39 @@ oum oum oum aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -88064,14 +88068,14 @@ sZq sZq vsu erl -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn nCe nCe wir @@ -88127,39 +88131,39 @@ wYa (136,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -vwy -vwy -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe -vwy -vwy -nOe -nOe vwy vwy vwy -nOe -nOe aNW aNW oum @@ -88170,39 +88174,39 @@ oum oum oum aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -88321,16 +88325,16 @@ qiR sZq vsu erl -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn oub mXY mNw @@ -88384,39 +88388,39 @@ wYa (137,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe aNW oum oum @@ -88427,39 +88431,39 @@ oum oum oum aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -88578,16 +88582,16 @@ wKq sZq nfT aQb -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn wzX -eSN +fIk dbE mXY mXY @@ -88641,39 +88645,39 @@ wYa (138,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -vwy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -vwy -vwy -nOe -nOe -nOe vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe aNW oum oum @@ -88684,39 +88688,39 @@ oum oum oum aNW -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -88754,7 +88758,7 @@ bBP vJx esD dRW -ycR +otX vVA uBt toG @@ -88835,14 +88839,14 @@ eXu sZq ofa eDM -pxh -pxh -pxh -pxh -pxh -pxh -pxh -pxh +idj +idj +idj +idj +idj +idj +idj +idj pxh pxh pyv @@ -88898,39 +88902,39 @@ wYa (139,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -vwy -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe vwy vwy vwy -nOe -nOe vwy vwy vwy -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe aNW oum oum @@ -88942,38 +88946,38 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -89100,8 +89104,8 @@ eSN eSN eSN eSN -eSN -eSN +fIk +fIk dKJ mXY mXY @@ -89155,39 +89159,39 @@ wYa (140,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe -nOe -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe vwy vwy -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -89199,38 +89203,38 @@ oum oum aNW aNW -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -89349,16 +89353,16 @@ fjV sZq nBo aQb -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn wzX -eSN +fIk rYZ kDr qbK @@ -89412,39 +89416,39 @@ wYa (141,1,1) = {" wYa qpk -rZo -qkr -pNy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe vwy -nOe vwy -nOe -nOe aNW aNW oum @@ -89455,39 +89459,39 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -89606,16 +89610,16 @@ sZq sZq cVa erl -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn pto mXY mXY @@ -89670,38 +89674,38 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -89712,39 +89716,39 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -89863,17 +89867,17 @@ sZq tqK vhl erl -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn mXY sVo qkN @@ -89927,37 +89931,37 @@ wYa wYa qpk qpk -cbu -pNy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -89969,39 +89973,39 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -90013,7 +90017,7 @@ nwG kmM twu twu -sbd +nCe nCe nCe nCe @@ -90120,18 +90124,18 @@ dnx dKa cVa erl +aqn +aqn +aqn +aqn +aqn nCe nCe nCe nCe nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn sVo mcL hEX @@ -90184,37 +90188,37 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -vwy -nOe -nOe -nOe -nOe -vwy -nOe -vwy -vwy -vwy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -nOe -nOe aNW aNW aNW @@ -90226,39 +90230,40 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe nCe nCe nCe @@ -90268,9 +90273,8 @@ nCe nCe nCe nCe -sbd twu -sbd +nCe nCe nCe nCe @@ -90297,7 +90301,7 @@ nCe nCe nCe nCe -nCe +aqn kvK iLI iLI @@ -90378,6 +90382,8 @@ tew efj erl erl +aqn +aqn nCe nCe nCe @@ -90386,9 +90392,7 @@ nCe nCe nCe nCe -nCe -nCe -nCe +aqn sVo sPf tOK @@ -90441,37 +90445,37 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -vwy -nOe -nOe -vwy -nOe vwy vwy vwy vwy -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe aNW aNW oum @@ -90483,39 +90487,43 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe +nCe nCe nCe nCe @@ -90525,10 +90533,6 @@ nCe nCe nCe nCe -sbd -sbd -sbd -sbd nCe nCe nCe @@ -90554,9 +90558,9 @@ nCe nCe nCe nCe -nCe -nCe -nCe +aqn +aqn +aqn iLI iLI iLI @@ -90635,7 +90639,7 @@ xtG axx fAm erl -nCe +aqn nCe nCe nCe @@ -90651,7 +90655,7 @@ fLf tOT fKS sVo -nCe +aqn cSV cSV cSV @@ -90698,37 +90702,37 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe vwy vwy vwy -nOe vwy vwy -nOe vwy vwy -nOe -nOe vwy vwy -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -90739,40 +90743,42 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe nCe nCe nCe @@ -90782,10 +90788,8 @@ nCe nCe nCe nCe -sbd -sbd twu -sbd +nCe nCe nCe nCe @@ -90812,14 +90816,14 @@ nCe nCe nCe nCe -nCe -nCe -nCe -nCe -nCe -eSN -eSN +aqn +aqn +aqn +aqn eSN +fIk +fIk +fIk iLI vFq ezk @@ -90892,7 +90896,7 @@ twb luk qaq erl -nCe +aqn nCe nCe nCe @@ -90908,8 +90912,8 @@ sVo lIJ oIb sVo -nCe -nCe +aqn +aqn cSV cSV cSV @@ -90955,36 +90959,36 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe aNW aNW aNW @@ -90996,40 +91000,42 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe nCe nCe nCe @@ -91040,10 +91046,8 @@ nCe nCe nCe nCe -sbd -sbd twu -sbd +nCe nCe nCe nCe @@ -91070,13 +91074,13 @@ nCe nCe nCe nCe -nCe -nCe -nCe +aqn +aqn +aqn wzX -eSN -eSN -eSN +fIk +fIk +fIk iLI nLw tTa @@ -91149,7 +91153,7 @@ gww aug erl erl -nCe +aqn nCe nCe nCe @@ -91165,10 +91169,10 @@ sVo sVo sVo sVo -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn cSV cSV cSV @@ -91212,36 +91216,36 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe aNW aNW aNW @@ -91253,54 +91257,40 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -sbd -sbd -sbd -sbd +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -91316,7 +91306,21 @@ nCe nCe nCe nCe -vCL +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +xBq sne nCe nCe @@ -91328,11 +91332,11 @@ nCe nCe nCe nCe -nCe -nCe -eSN -eSN +aqn +aqn eSN +fIk +fIk iLI iLI gPq @@ -91405,8 +91409,8 @@ erl erl erl erl -nCe -nCe +aqn +aqn nCe nCe nCe @@ -91469,35 +91473,35 @@ wYa wYa qpk qpk -rZo -uEP -qkr -pNy -nOe -vwy -vwy -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe +oYl +gAH +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -91510,40 +91514,42 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe nCe nCe nCe @@ -91555,10 +91561,7 @@ nCe nCe nCe nCe -sbd -sbd twu -sbd nCe nCe nCe @@ -91574,7 +91577,8 @@ nCe nCe nCe nCe -vCL +nCe +xBq xpd jIh xpd @@ -91585,11 +91589,11 @@ nCe nCe nCe nCe -nCe -nCe -eSN -eSN +aqn +aqn eSN +fIk +fIk yiu nfl sEd @@ -91655,14 +91659,14 @@ spo erl erl erl -nCe -tjO -nCe -nCe -nCe -nCe -nCe -nCe +aqn +gmr +aqn +aqn +aqn +aqn +aqn +aqn nCe nCe nCe @@ -91728,33 +91732,33 @@ qpk qpk qpk qpk -cbu -pNy +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -vwy -vwy -vwy -nOe vwy vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -91766,56 +91770,41 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -sbd -sbd -sbd -sbd +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -91835,18 +91824,33 @@ nCe nCe nCe nCe -vCL +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +xBq sne nCe nCe nCe nCe nCe -nCe -nCe -eSN -eSN +aqn +aqn eSN +fIk +fIk yiu dIZ sEd @@ -91910,14 +91914,14 @@ qHv qHv qHv qHv -nCe -nCe -nCe -tjO -nCe -nCe -nCe -nCe +aqn +aqn +aqn +gmr +aqn +aqn +aqn +aqn nCe nCe nCe @@ -91985,33 +91989,33 @@ qpk qpk qpk qpk -cbu -pNy -nOe -vwy -nOe -vwy -nOe -nOe -vwy -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -vwy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -92023,41 +92027,42 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe nCe nCe nCe @@ -92070,9 +92075,8 @@ nCe nCe nCe nCe -sbd twu -sbd +nCe nCe nCe nCe @@ -92100,10 +92104,10 @@ nCe nCe nCe nCe -nCe -eSN -eSN +aqn eSN +fIk +fIk iLI iLI iLI @@ -92148,7 +92152,7 @@ ekV eJU rxO dfk -lsu +aZV dlE sUN drL @@ -92167,7 +92171,7 @@ tMQ tMQ tMQ pMA -nCe +aqn wyB wyB ncx @@ -92242,33 +92246,33 @@ qpk qpk qpk qpk -cbu -pNy -nOe -vwy -nOe -vwy -nOe -vwy -vwy -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -vwy -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -92280,41 +92284,42 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe nCe nCe nCe @@ -92327,11 +92332,10 @@ nCe nCe nCe nCe -sbd twu twu -nCe -nCe +mSM +mSM twu twu nCe @@ -92357,14 +92361,14 @@ nCe nCe nCe nCe -nCe +aqn wzX eSN -eSN -eSN -eSN -eSN -eSN +fIk +fIk +fIk +fIk +fIk uuk gci qhP @@ -92498,33 +92502,33 @@ wYa qpk qpk qpk -ptv -gxR -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -92537,41 +92541,41 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -92585,14 +92589,14 @@ nCe nCe nCe twu -sbd +mSM twu twu twu twu -sbd +mSM twu -sbd +nCe nCe nCe nCe @@ -92614,14 +92618,14 @@ nCe nCe nCe nCe -nCe -nCe -eSN -eSN +aqn +aqn eSN eSN eSN eSN +fIk +fIk uuk bLu fmV @@ -92755,33 +92759,33 @@ wYa qpk qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -vwy -nOe -vwy -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -92794,42 +92798,41 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -92842,6 +92845,7 @@ nCe nCe nCe nCe +mSM twu twu twu @@ -92849,8 +92853,8 @@ twu twu twu twu -sbd -sbd +nCe +nCe nCe nCe nCe @@ -92872,8 +92876,8 @@ nCe nCe nCe nCe -nCe -nCe +aqn +aqn eSN eSN eSN @@ -92938,7 +92942,7 @@ tMQ xpZ tMa jty -nCe +aqn wyB wyB ncx @@ -93012,10 +93016,22 @@ wYa qpk qpk qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -93023,22 +93039,10 @@ vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -93051,41 +93055,41 @@ oum oum aNW aNW -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -93096,19 +93100,19 @@ nCe nCe nCe twu +mSM +twu +twu +twu +twu +twu +twu +mSM +twu +twu +twu +nCe nCe -twu -twu -twu -twu -twu -twu -sbd -twu -twu -twu -sbd -sbd nCe nCe nCe @@ -93130,12 +93134,12 @@ nCe nCe nCe nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn lpV aQi wXB @@ -93196,10 +93200,10 @@ dVd rcp kFs qqL -nCe -nCe -tjO -nCe +aqn +aqn +gmr +aqn nCe nCe nCe @@ -93269,33 +93273,33 @@ wYa qpk qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -93308,42 +93312,41 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -qNG -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -93353,20 +93356,21 @@ nCe nCe nCe nCe +mSM twu twu twu twu twu twu -sbd -sbd +mSM +mSM twu -sbd +mSM twu twu -sbd -sbd +nCe +nCe nCe nCe nCe @@ -93388,11 +93392,11 @@ nCe nCe nCe nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn lpV uPI hSf @@ -93452,7 +93456,7 @@ mIc vKc tMa oTg -nCe +aqn wyB wyB ncx @@ -93526,33 +93530,33 @@ wYa qpk qpk qpk -cbu -pNy -nOe -nOe -vwy -vwy -nOe -vwy -vwy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -93565,41 +93569,41 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -93613,19 +93617,19 @@ twu twu twu twu -sbd +mSM twu twu twu -sbd +mSM twu twu twu twu -sbd +mSM twu -sbd -sbd +nCe +nCe nCe nCe nCe @@ -93647,9 +93651,9 @@ nCe nCe nCe nCe -nCe -nCe -nCe +aqn +aqn +aqn qtl uPI fmV @@ -93783,32 +93787,32 @@ wYa qpk qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -nOe -vwy -nOe -vwy -vwy -nOe -nOe -vwy -vwy -vwy -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe -nOe aNW aNW aNW @@ -93822,41 +93826,41 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -93869,21 +93873,21 @@ twu twu twu twu -sbd +mSM twu twu -sbd +mSM twu twu twu -sbd +mSM twu twu twu -sbd -sbd -sbd -sbd +mSM +nCe +nCe +nCe nCe nCe nCe @@ -93906,7 +93910,7 @@ nCe nCe nCe nCe -nCe +aqn agl sbu fmV @@ -94039,33 +94043,33 @@ wYa wYa qpk qpk -ptv -gxR -pNy -nOe -vwy -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -94079,41 +94083,41 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -94138,10 +94142,10 @@ twu twu twu twu -sbd -sbd -sbd -sbd +nCe +nCe +nCe +nCe nCe nCe nCe @@ -94271,8 +94275,8 @@ nCe nCe nCe nCe -nOe -nOe +vwy +vwy iGM iGM iGM @@ -94296,33 +94300,33 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -vwy -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -94334,43 +94338,43 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -94383,22 +94387,22 @@ twu twu twu twu -sbd -sbd -sbd +mSM +mSM +mSM twu twu twu -sbd +mSM twu twu twu twu twu twu -sbd -sbd -sbd +nCe +nCe +nCe nCe nCe nCe @@ -94481,9 +94485,9 @@ tMQ bJZ qHv nCe -nCe -nCe -tjO +aqn +aqn +gmr nCe nCe nCe @@ -94498,38 +94502,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -94553,33 +94557,33 @@ wYa wYa qpk qpk -cbu -pNy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -94591,57 +94595,57 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe twu twu -sbd +mSM twu twu -sbd -sbd +mSM +mSM twu -sbd -sbd -sbd +mSM +mSM +mSM twu twu twu @@ -94654,8 +94658,8 @@ twu twu twu twu -sbd -sbd +nCe +nCe nCe nCe nCe @@ -94755,38 +94759,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -94810,13 +94814,21 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -vwy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -94824,19 +94836,11 @@ vwy vwy vwy vwy -nOe -vwy -nOe -nOe -nOe vwy vwy vwy vwy vwy -nOe -nOe -nOe aNW aNW aNW @@ -94848,71 +94852,71 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe +mSM +mSM +twu +twu +twu +twu +twu +twu +mSM +mSM +twu +mSM +twu +twu +twu +twu +twu +twu +mSM +twu +twu +twu +twu nCe nCe -twu -twu -twu -twu -twu -twu -sbd -sbd -twu -sbd -twu -twu -twu -twu -twu -twu -sbd -twu -twu -twu -twu -sbd -sbd nCe nCe nCe @@ -95012,38 +95016,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -95067,33 +95071,33 @@ wYa wYa qpk qpk -cbu -pNy -nOe -vwy -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -95104,72 +95108,72 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe +mSM +mSM +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM +twu +twu +twu +twu +mSM +twu +twu +mSM +twu +nCe nCe -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd -twu -twu -twu -twu -sbd -twu -twu -sbd -twu -sbd -sbd nCe nCe nCe @@ -95269,38 +95273,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -95324,33 +95328,33 @@ wYa wYa qpk qpk -cbu -pNy -nOe -vwy -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -vwy -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -95361,73 +95365,73 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe +mSM +mSM +mSM +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM +twu +twu +mSM +twu nCe -sbd -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd -twu -twu -sbd -twu -sbd nCe nCe nCe @@ -95526,38 +95530,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -95581,32 +95585,32 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -95618,73 +95622,73 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe +mSM +mSM +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM nCe -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd -sbd nCe nCe nCe @@ -95768,8 +95772,8 @@ qHv nCe nCe nCe -tjO -nCe +gmr +aqn nCe nCe nCe @@ -95783,38 +95787,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -95838,32 +95842,32 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -95875,52 +95879,52 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe twu -sbd -sbd +mSM +mSM twu twu -sbd +mSM twu twu twu @@ -95940,8 +95944,8 @@ twu twu twu twu -sbd -sbd +mSM +nCe nCe nCe nCe @@ -96040,38 +96044,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -96095,31 +96099,31 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy vwy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe aNW aNW aNW @@ -96132,52 +96136,52 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe -sbd +mSM twu twu twu -sbd +mSM twu twu twu @@ -96187,18 +96191,18 @@ twu twu twu twu -sbd +mSM twu twu twu twu -sbd +mSM twu twu twu twu twu -sbd +nCe nCe nCe nCe @@ -96297,38 +96301,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -96352,15 +96356,22 @@ wYa wYa qpk qpk -cbu -pNy -nOe -vwy -nOe -nOe -vwy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -96368,15 +96379,8 @@ vwy vwy vwy vwy -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -96388,50 +96392,50 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe -sbd -sbd +mSM +mSM twu twu twu @@ -96453,9 +96457,9 @@ twu twu twu twu -sbd +mSM twu -sbd +nCe nCe nCe nCe @@ -96554,38 +96558,38 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -96609,30 +96613,30 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe aNW aNW aNW @@ -96645,50 +96649,50 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe twu -sbd +mSM twu twu twu @@ -96711,7 +96715,7 @@ twu twu twu twu -sbd +mSM twu nCe nCe @@ -96811,37 +96815,37 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -96866,30 +96870,30 @@ wYa wYa qpk qpk -rZo -qkr -pNy -pNy -vwy -vwy -nOe -nOe -nOe -vwy -nOe +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -96901,51 +96905,51 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe -sbd -sbd +nCe +mSM twu twu twu @@ -96961,15 +96965,15 @@ twu twu twu twu -sbd +mSM twu twu -sbd +mSM twu twu twu twu -sbd +mSM twu nCe nCe @@ -97068,37 +97072,37 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -97124,29 +97128,29 @@ wYa qpk qpk qpk -cbu -pNy -pNy -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe vwy -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -97158,56 +97162,56 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe -sbd -sbd +nCe +mSM twu twu twu twu -sbd +mSM twu twu twu @@ -97218,15 +97222,15 @@ twu twu twu twu -sbd +mSM twu twu -sbd +mSM twu twu twu twu -sbd +mSM nCe nCe nCe @@ -97325,37 +97329,37 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -97381,29 +97385,29 @@ wYa qpk qpk qpk -cbu -pNy -pNy -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -97414,53 +97418,53 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe nCe nCe -sbd -sbd twu -sbd +mSM twu twu twu @@ -97475,15 +97479,15 @@ twu twu twu twu -sbd +mSM twu twu twu -sbd +mSM twu twu -sbd -sbd +mSM +mSM nCe nCe nCe @@ -97509,10 +97513,10 @@ nCe eTc mka kZe -nCe -eSN -eSN +aqn eSN +fIk +fIk eCy eCy eCy @@ -97546,8 +97550,8 @@ baX poV ecV oHf -nCe -nCe +aqn +aqn vXq ykD nCe @@ -97582,37 +97586,37 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -97638,28 +97642,28 @@ wYa qpk qpk qpk -cbu -pNy -pNy +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe aNW aNW aNW @@ -97671,78 +97675,78 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe -sbd -sbd -sbd -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd nCe nCe nCe +mSM +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM +mSM +nCe +nCe nCe nCe nCe @@ -97766,21 +97770,21 @@ nCe eTc cVc ugC -nCe +aqn wzX eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN -eSN +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk +fIk rYh fbh oWy @@ -97803,12 +97807,12 @@ oiv woY oOy oHf -nCe +aqn wyB luz rLw wyB -nCe +aqn wyB luz rLw @@ -97839,37 +97843,37 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -97895,28 +97899,28 @@ wYa qpk qpk qpk -cbu -pNy -pNy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -97928,78 +97932,78 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe -sbd -sbd -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd -sbd -sbd nCe nCe nCe +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM +mSM +mSM +mSM +nCe +nCe nCe nCe nCe @@ -98023,11 +98027,11 @@ nCe wyf iMc wyf -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn wzX eSN eSN @@ -98035,9 +98039,9 @@ eSN eSN eSN eSN -eSN -eSN -eSN +fIk +fIk +fIk rYh qqo uTg @@ -98060,12 +98064,12 @@ oSl scN obk oSl -nCe +aqn wyB pjt qVL wyB -nCe +aqn wyB irv wsu @@ -98096,36 +98100,36 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -98152,27 +98156,27 @@ wYa qpk qpk qpk -cbu -pNy -pNy -nOe -vwy -nOe -vwy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -98184,59 +98188,59 @@ oum oum oum aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe -sbd -sbd -sbd -sbd -sbd +nCe +nCe +nCe +nCe +mSM twu twu twu twu -sbd +mSM twu twu twu @@ -98246,14 +98250,14 @@ twu twu twu twu -sbd +mSM twu twu twu twu twu twu -sbd +mSM twu nCe nCe @@ -98284,17 +98288,17 @@ nCe nCe nCe nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn rYh lCL lCL @@ -98305,24 +98309,24 @@ rYh ldA fXF lCL -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn wdE due xrn wdE -nCe +aqn wyB yeX yeX wyB -nCe +aqn wyB kBv kBv @@ -98353,36 +98357,36 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -98409,27 +98413,27 @@ wYa qpk qpk qpk -cbu -pNy -pNy -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -98441,53 +98445,53 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe +nCe nCe -sbd -sbd -sbd -sbd twu twu twu @@ -98505,13 +98509,13 @@ twu twu twu twu -sbd +mSM twu twu -sbd +mSM twu twu -sbd +mSM nCe nCe nCe @@ -98548,13 +98552,13 @@ nCe nCe nCe nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +eSN +eSN +aqn +aqn +aqn +aqn +aqn rYh eYZ aSI @@ -98562,19 +98566,19 @@ rYh pyD jBO lCL -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe +aqn +aqn +aqn +aqn +aqn +aqn +aqn +aqn wdE cfH ero wdE -nCe +aqn wyB kKf jPo @@ -98609,37 +98613,37 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -98666,26 +98670,26 @@ wYa qpk qpk qpk -cbu -pNy -pNy -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -98698,58 +98702,58 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe nCe -sbd -sbd -sbd twu twu -sbd +mSM twu twu -sbd +mSM twu twu twu @@ -98759,8 +98763,8 @@ twu twu twu twu -sbd -sbd +mSM +mSM twu twu twu @@ -98768,7 +98772,7 @@ twu twu twu twu -sbd +mSM nCe nCe nCe @@ -98808,10 +98812,10 @@ nCe nCe nCe nCe -nCe -nCe -nCe -nCe +eSN +eSN +aqn +aqn rYh rYh rYh @@ -98819,9 +98823,9 @@ rYh cVQ yjU rYh -nCe -nCe -nCe +aqn +aqn +aqn nCe nCe nCe @@ -98831,7 +98835,7 @@ oSl rIx pfK oSl -nCe +aqn wyB wyB wyB @@ -98866,37 +98870,37 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -98923,91 +98927,91 @@ wYa qpk qpk qpk -cbu -pNy -pNy +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +aNW +aNW +aNW +oum +oum +oum +oum +oum +oum +oum +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe -sbd +nCe twu -sbd +mSM twu twu twu twu -sbd +mSM tYR -sbd +mSM twu twu twu @@ -99015,17 +99019,17 @@ twu twu twu twu -sbd -sbd -sbd +mSM +mSM +mSM twu twu -sbd +mSM twu twu twu twu -sbd +mSM nCe nCe nCe @@ -99123,36 +99127,36 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -99180,25 +99184,25 @@ wYa qpk qpk qpk -cbu -pNy -pNy -nOe -nOe -nOe -vwy -nOe -nOe -vwy -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -99211,60 +99215,60 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe -sbd -sbd -sbd -sbd +nCe +mSM +mSM +mSM twu twu twu twu -sbd -sbd +mSM +mSM twu twu twu @@ -99272,17 +99276,17 @@ twu twu twu twu -sbd +mSM twu twu twu -sbd +mSM twu twu -sbd +mSM twu twu -sbd +mSM nCe nCe nCe @@ -99380,36 +99384,36 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -99436,25 +99440,25 @@ wYa wYa qpk qpk -ptv -gxR -pNy -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe -nOe -nOe aNW aNW aNW @@ -99468,52 +99472,52 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe -sbd -sbd +nCe +mSM twu twu twu @@ -99530,16 +99534,16 @@ twu twu twu twu -sbd +mSM twu twu -sbd +mSM twu twu twu twu twu -sbd +mSM nCe nCe nCe @@ -99637,36 +99641,36 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -99693,87 +99697,87 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe +bVN vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -oum -aNW -aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -sbd -sbd +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +aNW +aNW +aNW +oum +oum +oum +oum +oum +oum +oum +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe twu -sbd +mSM twu -sbd +mSM twu twu twu @@ -99789,14 +99793,14 @@ twu twu twu twu -sbd +mSM twu twu twu -sbd +mSM twu twu -sbd +mSM twu nCe nCe @@ -99894,36 +99898,36 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -99950,25 +99954,25 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe aNW aNW aNW @@ -99981,81 +99985,81 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -sbd -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd -twu -twu -twu -twu -twu -twu -sbd -twu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM +twu +twu +twu +twu +twu +twu +mSM +twu +mSM +nCe nCe nCe nCe @@ -100145,42 +100149,42 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -100207,24 +100211,24 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe aNW aNW aNW @@ -100237,82 +100241,82 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -sbd -sbd -sbd -twu -twu -twu -sbd -twu -twu -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd -twu -sbd -twu -twu -sbd -twu -twu -twu -twu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe +mSM +twu +twu +twu +mSM +twu +twu +mSM +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM +twu +mSM +twu +twu +mSM +twu +twu +twu +twu +mSM +nCe nCe nCe nCe @@ -100365,7 +100369,7 @@ nCe nCe nCe nCe -mHW +nCe nCe nCe nCe @@ -100400,43 +100404,43 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -100464,25 +100468,25 @@ wYa wYa qpk qpk -cbu -pNy -nOe -vwy -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -100494,60 +100498,60 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -sbd -sbd +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe twu twu twu twu twu -sbd -sbd +mSM +mSM twu twu twu @@ -100560,14 +100564,14 @@ twu twu twu twu -sbd +mSM twu twu twu twu twu -sbd -sbd +mSM +mSM twu nCe nCe @@ -100657,43 +100661,43 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -100721,25 +100725,25 @@ wYa wYa qpk qpk -cbu -pNy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -100751,81 +100755,81 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -sbd -twu -twu -twu -twu -twu -twu -twu -twu -twu -sbd -twu -twu -twu -twu -twu -twu -sbd -twu -twu -sbd -twu -twu -twu -sbd -twu -twu -twu -twu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe +twu +twu +twu +twu +twu +twu +twu +twu +twu +mSM +twu +twu +twu +twu +twu +twu +mSM +twu +twu +mSM +twu +twu +twu +mSM +twu +twu +twu +twu +mSM nCe nCe nCe @@ -100879,7 +100883,7 @@ nCe nCe nCe nCe -mHW +nCe nCe nCe nCe @@ -100914,42 +100918,42 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -100978,24 +100982,24 @@ wYa wYa qpk qpk -cbu -pNy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -101007,83 +101011,83 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -sbd -twu -twu -sbd -twu -twu -twu -twu -twu -twu -sbd -twu -twu -twu -twu -sbd -twu -twu -sbd -twu -twu -sbd -twu -twu -twu -twu -twu -twu -sbd +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe twu +twu +mSM +twu +twu +twu +twu +twu +twu +mSM +twu +twu +twu +twu +mSM +twu +twu +mSM +twu +twu +mSM +twu +twu +twu +twu +twu +twu +mSM +mSM +twu nCe nCe nCe @@ -101171,42 +101175,42 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -101235,24 +101239,24 @@ wYa wYa qpk qpk -cbu -pNy -nOe -vwy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe aNW aNW aNW @@ -101263,62 +101267,62 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy twu -sbd +mSM twu twu twu twu twu twu -sbd +mSM twu twu twu @@ -101328,17 +101332,17 @@ twu twu twu twu -sbd -sbd +twu +mSM twu twu -sbd -sbd +mSM +mSM twu -sbd +mSM twu twu -sbd +nCe nCe nCe nCe @@ -101428,42 +101432,42 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -101491,24 +101495,24 @@ wYa (188,1,1) = {" wYa qpk -ptv -gxR -pNy -nOe +aHG +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -101520,53 +101524,53 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe twu twu @@ -101574,28 +101578,28 @@ twu twu twu twu -sbd +mSM twu twu twu twu -sbd +mSM twu twu twu twu twu -sbd +mSM twu -sbd +mSM twu twu twu twu twu -sbd +mSM twu -sbd +nCe nCe nCe nCe @@ -101684,43 +101688,43 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -101748,24 +101752,24 @@ wYa (189,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -101776,58 +101780,58 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe twu -sbd -sbd +mSM +mSM twu twu twu @@ -101839,20 +101843,20 @@ twu twu twu twu -sbd +mSM twu twu twu -sbd -sbd +mSM +mSM twu twu twu twu twu -sbd -sbd -sbd +mSM +nCe +nCe nCe nCe nCe @@ -101935,49 +101939,49 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -102005,85 +102009,85 @@ wYa (190,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +aNW +aNW +oum +oum +oum +oum +oum +oum +aNW +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe -sbd +nCe twu twu twu @@ -102098,18 +102102,18 @@ twu twu twu twu -sbd -sbd -sbd -sbd -sbd +mSM +mSM +mSM +mSM +mSM twu twu twu -sbd -sbd -sbd -sbd +mSM +mSM +nCe +nCe nCe nCe nCe @@ -102192,49 +102196,49 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -102262,23 +102266,23 @@ wYa (191,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe -nOe -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -102289,81 +102293,81 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe nCe twu twu -sbd +mSM twu twu -sbd +mSM twu twu twu twu twu twu -sbd -sbd -sbd +mSM +mSM +nCe nCe twu -sbd -sbd -sbd -sbd -sbd +nCe +nCe +nCe +nCe +mSM nCe nCe nCe @@ -102449,50 +102453,50 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -102519,23 +102523,23 @@ wYa (192,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe aNW oum oum @@ -102546,55 +102550,55 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -102603,14 +102607,14 @@ nCe nCe nCe twu -sbd -sbd +mSM +mSM twu twu -sbd +mSM twu -nCe -nCe +mSM +mSM nCe nCe nCe @@ -102706,50 +102710,50 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -102776,22 +102780,22 @@ wYa (193,1,1) = {" wYa qpk -cbu -pNy -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe aNW aNW oum @@ -102803,56 +102807,56 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -102862,10 +102866,10 @@ nCe nCe nCe twu -nCe -nCe -nCe -nCe +mSM +mSM +mSM +mSM twu nCe nCe @@ -102963,50 +102967,50 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -103035,19 +103039,19 @@ wYa rne xGw wAU -ybi -qNG -xdu -qNG -qNG xdu xdu -qNG -qNG xdu -qNG -qNG -qNG +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu wVF wVF wVF @@ -103059,85 +103063,85 @@ cKh wVF wVF wVF -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu tjO tjO tjO @@ -103220,50 +103224,50 @@ tjO tjO tjO tjO -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG -qNG +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu +xdu mPQ mPQ mPQ @@ -103291,10 +103295,13 @@ wYa wYa qpk qpk -cbu -pNy -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy @@ -103302,9 +103309,6 @@ vwy vwy vwy vwy -nOe -nOe -nOe aNW aNW oum @@ -103315,86 +103319,86 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -103477,50 +103481,50 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -103548,19 +103552,19 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW aNW @@ -103572,86 +103576,86 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -103734,50 +103738,50 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -103805,19 +103809,19 @@ wYa wYa qpk qpk -cbu -pNy -vwy -nOe -vwy -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe aNW aNW oum @@ -103829,86 +103833,86 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -103991,50 +103995,50 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -104062,110 +104066,110 @@ wYa wYa qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +aNW +aNW +oum +oum +oum +oum +oum +oum +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -104248,50 +104252,50 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -104319,18 +104323,18 @@ wYa wYa qpk qpk -rZo -qkr -vwy -nOe +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy vwy vwy -nOe -nOe -nOe -nOe aNW aNW oum @@ -104341,88 +104345,88 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -104505,50 +104509,50 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -104577,17 +104581,17 @@ wYa qpk qpk qpk -cbu +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe aNW oum oum @@ -104598,88 +104602,88 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -104721,7 +104725,7 @@ nCe nCe nCe nCe -vCL +xBq xpd xpd xpd @@ -104762,51 +104766,51 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -104834,116 +104838,116 @@ wYa qpk qpk qpk -cbu +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +aNW +aNW +oum +oum +oum +oum +oum +oum +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe nCe nCe nCe -vCL +xBq sne nCe nCe @@ -105019,51 +105023,51 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -105091,15 +105095,15 @@ wYa qpk qpk qpk -rZo -qkr +oYl +aEE +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe aNW aNW oum @@ -105110,90 +105114,90 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -105201,7 +105205,7 @@ nCe nCe nCe nCe -vCL +xBq xpd xpd jIh @@ -105276,51 +105280,51 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -105349,108 +105353,108 @@ qpk qpk qpk qpk -cbu +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +aNW +oum +oum +oum +oum +oum +oum +aNW +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -105533,51 +105537,51 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -105606,108 +105610,108 @@ qpk qpk qpk qpk -cbu -nOe -nOe -nOe -nOe -nOe -nOe -aNW -aNW -oum -oum -oum -oum -oum -aNW -aNW -aNW -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +aNW +aNW +oum +oum +oum +oum +oum +aNW +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -105790,52 +105794,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -105863,12 +105867,12 @@ qpk qpk qpk qpk -cbu -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy aNW aNW oum @@ -105879,92 +105883,93 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe nCe nCe nCe @@ -105988,7 +105993,6 @@ nCe nCe nCe nCe -mHW nCe nCe nCe @@ -106047,52 +106051,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -106120,11 +106124,11 @@ qpk qpk qpk qpk -cbu -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy aNW aNW oum @@ -106134,94 +106138,94 @@ oum oum oum aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -106304,52 +106308,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -106377,108 +106381,108 @@ qpk qpk qpk qpk -cbu -nOe -nOe -nOe -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -nOe -nOe -nOe +bVN +vwy +vwy +vwy +aNW +aNW +oum +oum +oum +oum +oum +oum +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -106502,7 +106506,7 @@ nCe nCe nCe nCe -mHW +nCe nCe nCe nCe @@ -106561,52 +106565,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -106634,109 +106638,109 @@ qpk qpk qpk qpk -cbu -nOe -nOe -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +aNW +aNW +aNW +oum +oum +oum +oum +oum +oum +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -106759,7 +106763,7 @@ nCe nCe nCe nCe -mHW +nCe nCe nCe nCe @@ -106818,52 +106822,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -106891,147 +106895,147 @@ qpk qpk qpk qpk -cbu -nOe -aNW -aNW -aNW -oum -oum -oum -oum -oum -oum -aNW -aNW -nOe -nOe +bVN +vwy +aNW +aNW +aNW +oum +oum +oum +oum +oum +oum +aNW +aNW +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -107075,52 +107079,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -107148,7 +107152,7 @@ qpk qpk qpk qpk -cbu +bVN aNW aNW aNW @@ -107160,135 +107164,135 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -107332,52 +107336,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -107404,8 +107408,8 @@ wYa qpk qpk qpk -ptv -gxR +aHG +vZt aNW aNW oum @@ -107416,136 +107420,136 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -107589,53 +107593,53 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -107658,10 +107662,10 @@ wYa "} (212,1,1) = {" wYa -xbw -xbw -xbw -gxR +cos +cos +cos +vZt aNW aNW oum @@ -107672,137 +107676,137 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -107846,53 +107850,53 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -107928,138 +107932,138 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -108103,53 +108107,53 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -108184,139 +108188,139 @@ oum aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -108360,53 +108364,53 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -108439,141 +108443,141 @@ oum oum aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -108617,52 +108621,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -108695,142 +108699,142 @@ gDr aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -108874,52 +108878,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -108951,143 +108955,143 @@ aNW aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -109131,52 +109135,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -109206,145 +109210,145 @@ eQE aNW aNW aNW -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy nCe nCe nCe @@ -109388,52 +109392,52 @@ nCe nCe nCe nCe -nOe -qNG -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -109463,234 +109467,234 @@ aNW aNW aNW nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe -nCe -nCe -nCe -nCe -nCe -cXT -xpd -xpd -xpd -xpd -xpd -xpd -xpd -xpd -xpd -jIh -xpd -xpd -xpd -xpd -xpd -xpd -xpd -xpd -xpd -jIh -xpd -xpd -xpd -xpd -xpd -xpd -xpd -xpd -xpd -cXT -nCe -nCe -nCe -nCe -nCe -nCe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy xdu -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe +nCe +nCe +nCe +cXT +xpd +xpd +xpd +xpd +xpd +xpd +xpd +xpd +xpd +jIh +xpd +xpd +xpd +xpd +xpd +xpd +xpd +xpd +xpd +jIh +xpd +xpd +xpd +xpd +xpd +xpd +xpd +xpd +xpd +cXT +nCe +nCe +nCe +nCe +nCe +nCe +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -109717,238 +109721,238 @@ acu hMj aNW aNW -pNy -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nOe nOe nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nOe -nOe -qNG vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -109970,242 +109974,242 @@ qzz wYa "} (221,1,1) = {" -pPG +jhv mMn -pNy -pNy -pNy -pNy +nOe +nOe +nOe +nOe twc -uEP -uEP -uEP -uEP -uEP -uEP -qkr -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +gAH +gAH +gAH +gAH +gAH +gAH +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +nCe +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nCe -nOe -nOe -qNG -nOe -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -110228,11 +110232,11 @@ wYa "} (222,1,1) = {" wYa -uEP -uEP -uEP -uEP -uEP +qPb +qPb +qPb +qPb +qPb oTS qpk qpk @@ -110240,140 +110244,140 @@ qpk qpk qpk qpk -rZo -uEP -uEP -qkr -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +oYl +gAH +gAH +aEE +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -110415,53 +110419,53 @@ nCe nCe nCe nCe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -110500,137 +110504,137 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -110672,53 +110676,53 @@ nCe nCe nCe nCe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -110757,137 +110761,137 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -110929,53 +110933,53 @@ nCe nCe nCe nCe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -111014,142 +111018,142 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe nCe nCe nCe @@ -111181,58 +111185,58 @@ nCe nCe nCe nCe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -111272,224 +111276,224 @@ qpk qpk qpk cbu -pPG -nOe -nOe -nOe -nOe -nOe -nOe -nOe +rRy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -111527,226 +111531,226 @@ qpk qpk qpk qpk -htc -cos +ptv +gxR rRy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -111788,222 +111792,222 @@ ccv xej rRy rRy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -112045,222 +112049,222 @@ xej xej rRy rRy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy vwy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -112302,223 +112306,223 @@ xej xej rRy rRy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -112559,223 +112563,223 @@ xej xej rRy rRy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -112816,223 +112820,223 @@ ccv xej rRy rRy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -113072,224 +113076,224 @@ qpk cbu rRy rRy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -113327,226 +113331,226 @@ qpk qpk ptv gxR -pPG -nOe -nOe -nOe -nOe -nOe -nOe +rRy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -113582,228 +113586,228 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -113839,228 +113843,228 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -114096,228 +114100,228 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -114353,228 +114357,228 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -114610,228 +114614,228 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -114867,228 +114871,228 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe xdu -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy iGM iGM iGM @@ -115122,230 +115126,230 @@ qpk qpk qpk qpk -ptv -xbw -gxR -pNy -nOe -nOe -nOe -nOe -nOe +aHG +cos +vZt +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -115379,231 +115383,231 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -115636,231 +115640,231 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -115893,231 +115897,231 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe vwy -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -116150,231 +116154,231 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -116407,232 +116411,232 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -vwy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -116664,232 +116668,232 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -116921,232 +116925,232 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -117178,233 +117182,233 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -117435,233 +117439,233 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -117692,233 +117696,233 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -117949,233 +117953,233 @@ qpk qpk qpk qpk -cbu -pNy -nOe -vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM @@ -118206,234 +118210,234 @@ qpk qpk qpk qpk -cbu -pNy -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy vwy -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM dXk @@ -118463,234 +118467,234 @@ qpk qpk qpk qpk -cbu -pNy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe +bVN +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +xdu +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy +vwy vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -qNG -nOe vwy -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe -nOe iGM iGM iGM diff --git a/maps/cynosure/cynosure-3.dmm b/maps/cynosure/cynosure-3.dmm index 5dda79c3e9..d4942804fa 100644 --- a/maps/cynosure/cynosure-3.dmm +++ b/maps/cynosure/cynosure-3.dmm @@ -3694,6 +3694,7 @@ dir = 10 }, /obj/structure/reagent_dispensers/virusfood{ + density = 0; pixel_x = 32; pixel_y = 32 }, @@ -8770,15 +8771,19 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/surface/station/ai_monitored/storage/eva) "fSH" = ( -/obj/machinery/computer/general_air_control/supermatter_core{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, /obj/effect/floor_decal/corner/yellow/border{ dir = 4 }, +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 8; + input_tag = "cooling_in"; + name = "Engine Cooling Control"; + output_tag = "cooling_out"; + sensors = list("engine_sensor" = "Engine Core") + }, /turf/simulated/floor/tiled, /area/surface/station/engineering/reactor_monitoring) "fTe" = ( @@ -15858,6 +15863,9 @@ icon_state = "frame"; pixel_x = 32 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/surface/station/quartermaster/office) "jQk" = ( diff --git a/maps/cynosure/cynosure-4.dmm b/maps/cynosure/cynosure-4.dmm index 0f67278d5c..deece45f47 100644 --- a/maps/cynosure/cynosure-4.dmm +++ b/maps/cynosure/cynosure-4.dmm @@ -1473,7 +1473,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 5 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "pq" = ( /obj/structure/cable/yellow, @@ -1572,7 +1576,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 6 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "qc" = ( /obj/effect/floor_decal/borderfloor{ @@ -1899,7 +1907,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 10 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "ta" = ( /obj/structure/cable{ @@ -2461,13 +2473,21 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "zJ" = ( /obj/effect/floor_decal/techfloor/corner{ dir = 6 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "zO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, @@ -2586,7 +2606,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "BD" = ( /obj/effect/floor_decal/borderfloor{ @@ -2855,7 +2879,11 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "Eq" = ( /obj/structure/cable{ @@ -3024,7 +3052,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "Gq" = ( /obj/structure/bed/chair/shuttle, @@ -3148,7 +3180,11 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "Hk" = ( /obj/effect/floor_decal/techfloor, @@ -4212,7 +4248,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 10 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "QG" = ( /obj/structure/window/reinforced{ @@ -4733,7 +4773,11 @@ /obj/effect/floor_decal/techfloor/corner{ dir = 5 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "UY" = ( /obj/structure/window/reinforced, @@ -5050,7 +5094,11 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, -/turf/simulated/floor/tiled/techfloor, +/turf/simulated/floor/tiled/techfloor{ + nitrogen = 100; + oxygen = 0; + temperature = 73 + }, /area/tcommsat/cynosure/chamber) "Yb" = ( /obj/effect/floor_decal/industrial/warning{ diff --git a/maps/cynosure/cynosure-6.dmm b/maps/cynosure/cynosure-6.dmm index c4373278ff..5fbfaa4e5b 100644 --- a/maps/cynosure/cynosure-6.dmm +++ b/maps/cynosure/cynosure-6.dmm @@ -94,7 +94,7 @@ }, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "ninja_shuttle"; name = "interior access button"; pixel_x = -25; @@ -530,7 +530,7 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "merc_shuttle"; name = "interior access button"; pixel_x = 25; @@ -797,7 +797,7 @@ "aTS" = ( /obj/machinery/access_button{ command = "cycle_exterior"; - frequency = 1331; + frequency = 1380; master_tag = "vox_west_control"; req_one_access = list(150) }, @@ -1052,6 +1052,7 @@ /obj/structure/undies_wardrobe, /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; + dir = 4; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; @@ -1266,7 +1267,7 @@ opacity = 0 }, /obj/machinery/door/airlock/voidcraft{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_outer"; name = "Ship External Access"; req_access = list(150) @@ -1785,16 +1786,10 @@ /area/holodeck/source_courtroom) "ccc" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_sensor"; pixel_y = 28 }, -/obj/effect/shuttle_landmark{ - base_area = /area/ninja_dojo/dojo; - base_turf = /turf/snow; - landmark_tag = "ninja_start"; - name = "Dojo Outpost" - }, /turf/simulated/shuttle/floor/voidcraft/dark, /area/ninja_dojo/start) "ccf" = ( @@ -2060,7 +2055,7 @@ /area/syndicate_station) "ctM" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_southwest_lock"; req_access = list(150) }, @@ -2133,17 +2128,18 @@ }, /area/centcom/command) "cxc" = ( +/obj/machinery/computer/station_alert/all{ + dir = 1 + }, /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; + dir = 4; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1 }, -/obj/machinery/computer/station_alert/all{ - dir = 1 - }, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -2296,7 +2292,7 @@ /area/shuttle/supply) "cKC" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "vox_east_sensor"; pixel_x = -25 }, @@ -2429,7 +2425,7 @@ }, /area/tdome) "cTw" = ( -/obj/effect/landmark/start{ +/obj/effect/landmark{ name = "wizard" }, /turf/unsimulated/floor{ @@ -2793,8 +2789,8 @@ "dqX" = ( /obj/machinery/access_button{ command = "cycle_exterior"; - frequency = 1331; - master_tag = "vox_east_control"; + frequency = 1380; + master_tag = "skipjack_shuttle"; req_access = list(150) }, /turf/simulated/wall/skipjack, @@ -2913,6 +2909,7 @@ /obj/item/weapon/book/manual/engineering_hacking, /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; + dir = 4; frequency = 1213; name = "Subversive Intercom"; pixel_x = 32; @@ -4014,7 +4011,7 @@ /area/ninja_dojo/start) "eOt" = ( /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_outer"; name = "Ship External Hatch"; req_access = list(150) @@ -4330,8 +4327,8 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; - master_tag = "vox_east_control"; + frequency = 1380; + master_tag = "skipjack_shuttle"; pixel_x = 22; req_access = list(150) }, @@ -4347,6 +4344,15 @@ name = "plating" }, /area/skipjack_station) +"fgd" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/shuttle/floor/darkred, +/area/shuttle/syndicate_elite/mothership) "fhd" = ( /obj/structure/table/rack, /obj/item/weapon/gun/projectile/automatic/wt550, @@ -4982,13 +4988,12 @@ /obj/structure/bed/chair{ dir = 4 }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1331; +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; id_tag = "merc_elite_shuttle"; - pixel_x = -24; - pixel_y = -2; - req_access = list(150); - tag_exterior_door = "merc_elite_shuttle_hatch" + pixel_x = -25; + req_one_access = list(150); + tag_door = "merc_elite_shuttle_hatch" }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/syndicate_elite/mothership) @@ -5182,7 +5187,7 @@ desc = "Talk through this. Evilly"; dir = 4; frequency = 1213; - name = "Syndicate Intercom"; + name = "Subversive Intercom"; pixel_x = 32; subspace_transmission = 1; syndie = 1 @@ -5918,6 +5923,7 @@ }, /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; + dir = 8; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; @@ -6124,22 +6130,13 @@ /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; - name = "Syndicate Intercom"; - pixel_x = 32; - subspace_transmission = 1; - syndie = 1 - }, -/obj/item/device/radio/intercom{ - desc = "Talk through this. Evilly"; - frequency = 1213; - name = "Syndicate Intercom"; + name = "Subversive Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1 }, /turf/unsimulated/floor{ - dir = 5; - icon_state = "vault" + icon_state = "dark" }, /area/wizard_station) "hkh" = ( @@ -6942,7 +6939,7 @@ /area/syndicate_station/start) "idR" = ( /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - frequency = 1331; + frequency = 1380; id_tag = "vox_west_control"; pixel_x = 24; req_access = list(150); @@ -6953,7 +6950,7 @@ }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1331; + frequency = 1380; id_tag = "vox_west_vent" }, /obj/machinery/light/small, @@ -8292,7 +8289,7 @@ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; - name = "Syndicate Intercom"; + name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1 @@ -8994,7 +8991,7 @@ "kqh" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_pump" }, /obj/machinery/light/small, @@ -9005,7 +9002,7 @@ /area/skipjack_station/start) "kqS" = ( /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "vox_west_sensor"; pixel_x = 25 }, @@ -10894,7 +10891,7 @@ /area/holodeck/source_picnicarea) "mrF" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_southeast_lock"; req_access = list(150) }, @@ -11593,6 +11590,9 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/shuttle/floor/darkred, /area/shuttle/syndicate_elite/mothership) "ngK" = ( @@ -11772,7 +11772,7 @@ /area/centcom/specops) "nsa" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; + frequency = 1380; id_tag = "vox_west_vent" }, /turf/simulated/shuttle/plating, @@ -12239,7 +12239,7 @@ dir = 4 }, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_inner"; name = "Ship Internal Hatch"; req_access = list(150) @@ -12612,7 +12612,7 @@ /area/syndicate_station/start) "otk" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_northeast_lock"; req_access = list(150) }, @@ -12813,7 +12813,7 @@ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; - name = "Syndicate Intercom"; + name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1 @@ -13662,7 +13662,7 @@ "pFK" = ( /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "merc_shuttle"; name = "interior access button"; pixel_x = -25; @@ -14790,7 +14790,7 @@ /obj/machinery/atmospherics/pipe/simple/visible, /obj/machinery/access_button{ command = "cycle_interior"; - frequency = 1331; + frequency = 1380; master_tag = "vox_west_control"; pixel_x = -22; req_one_access = list(150) @@ -15537,7 +15537,7 @@ "rzx" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_pump" }, /obj/effect/shuttle_landmark{ @@ -15687,7 +15687,7 @@ /area/syndicate_station/start) "rGU" = ( /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_inner"; name = "Ship External Access"; req_access = list(150) @@ -15699,7 +15699,7 @@ /area/syndicate_station/start) "rHT" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1331; + frequency = 1380; id_tag = "vox_east_vent" }, /turf/simulated/shuttle/plating, @@ -15742,7 +15742,7 @@ "rKS" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_pump" }, /turf/simulated/shuttle/floor/voidcraft/dark, @@ -15848,10 +15848,10 @@ /area/centcom/main_hall) "rOP" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 + dir = 4 }, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_inner"; name = "Ship External Access"; req_access = list(150) @@ -16863,7 +16863,7 @@ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; - name = "Syndicate Intercom"; + name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1 @@ -17095,18 +17095,18 @@ "teW" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_pump" }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle"; pixel_x = 24; pixel_y = -2; req_access = list(150) }, /obj/machinery/airlock_sensor{ - frequency = 1331; + frequency = 1380; id_tag = "merc_shuttle_sensor"; pixel_x = 28; pixel_y = 8 @@ -17224,10 +17224,7 @@ }, /area/skipjack_station) "tnL" = ( -/turf/simulated/shuttle/wall/dark{ - hard_corner = 1; - join_group = "shuttle_ert" - }, +/turf/simulated/shuttle/wall/dark/hard_corner, /area/shuttle/response_ship/start) "tos" = ( /obj/machinery/light{ @@ -18499,6 +18496,7 @@ /obj/item/weapon/pen, /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; + dir = 8; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; @@ -19527,6 +19525,15 @@ "vTt" = ( /obj/structure/table/steel_reinforced, /obj/item/clothing/head/philosopher_wig, +/obj/item/device/radio/intercom{ + desc = "Talk through this. Evilly"; + dir = 4; + frequency = 1213; + name = "Subversive Intercom"; + pixel_x = 32; + subspace_transmission = 1; + syndie = 1 + }, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -19667,7 +19674,7 @@ desc = "Talk through this. Evilly"; dir = 8; frequency = 1213; - name = "Syndicate Intercom"; + name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1 @@ -20355,7 +20362,7 @@ /area/syndicate_station/start) "wJs" = ( /obj/machinery/door/airlock/hatch{ - frequency = 1331; + frequency = 1380; id_tag = "vox_northwest_lock"; req_access = list(150) }, @@ -20403,12 +20410,12 @@ "wNk" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1331; + frequency = 1380; id_tag = "vox_east_vent" }, /obj/machinery/light/small, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1331; + frequency = 1380; id_tag = "skipjack_shuttle"; pixel_x = -24; req_access = list(150); @@ -21458,7 +21465,7 @@ /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; frequency = 1213; - name = "Syndicate Intercom"; + name = "Subversive Intercom"; pixel_y = -32; subspace_transmission = 1; syndie = 1 @@ -21551,16 +21558,17 @@ }, /area/skipjack_station) "xWw" = ( +/obj/item/target, +/obj/effect/floor_decal/industrial/outline/yellow, /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; + dir = 8; frequency = 1213; name = "Subversive Intercom"; pixel_x = -32; subspace_transmission = 1; syndie = 1 }, -/obj/item/target, -/obj/effect/floor_decal/industrial/outline/yellow, /turf/unsimulated/floor{ dir = 5; icon_state = "vault" @@ -21809,14 +21817,14 @@ /area/shuttle/escape/centcom) "ymb" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle"; pixel_y = -25; req_access = list(150) }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1331; + frequency = 1380; id_tag = "ninja_shuttle_pump" }, /obj/machinery/button/remote/blast_door{ @@ -21824,6 +21832,12 @@ name = "ship lockdown control"; pixel_x = -25 }, +/obj/effect/shuttle_landmark{ + base_area = /area/ninja_dojo/dojo; + base_turf = /turf/snow; + landmark_tag = "ninja_start"; + name = "Dojo Outpost" + }, /turf/simulated/shuttle/floor/voidcraft/dark, /area/ninja_dojo/start) "ymh" = ( @@ -79809,7 +79823,7 @@ jeX jeX lXr bXF -jeX +hkb xIh jeX bXF @@ -80066,7 +80080,7 @@ wMD sqm xIh rhp -hkb +bXF jeX bXF kRO @@ -85779,7 +85793,7 @@ dFI eUF eUF fSe -fSe +fgd hht iai iSX diff --git a/maps/cynosure/cynosure-7.dmm b/maps/cynosure/cynosure-7.dmm index a24f457529..cc01185cfe 100644 --- a/maps/cynosure/cynosure-7.dmm +++ b/maps/cynosure/cynosure-7.dmm @@ -12,34 +12,27 @@ "ct" = ( /turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/wilderness/normal) -"er" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, -/area/surface/outside/wilderness/normal) -"eL" = ( -/turf/simulated/floor/outdoors/grass/sif, -/area/surface/outside/wilderness/deep) +"cv" = ( +/obj/structure/cliff/automatic{ + dir = 4 + }, +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/wilderness/mountains) "fy" = ( /obj/structure/cliff/automatic, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "gl" = ( /obj/structure/cliff/automatic{ dir = 9 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "hb" = ( /obj/structure/cliff/automatic{ dir = 8 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "id" = ( /turf/simulated/wall/sifwood, @@ -57,15 +50,8 @@ /obj/structure/cliff/automatic{ dir = 10 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) -"jG" = ( -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/wilderness/normal) "kx" = ( /obj/structure/prop/rock/small/alt, /turf/simulated/floor/outdoors/mud/sif/planetuse, @@ -78,17 +64,13 @@ dir = 6 }, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) "mZ" = ( /obj/structure/cliff/automatic/corner{ dir = 9 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "ne" = ( /turf/simulated/floor/outdoors/grass/sif, @@ -104,13 +86,8 @@ /turf/simulated/floor/water/deep, /area/surface/outside/river/gautelfr) "oR" = ( -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/deep) -"pw" = ( -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/path/wilderness) "pM" = ( /turf/simulated/mineral/sif, /area/surface/outside/wilderness/mountains) @@ -118,17 +95,13 @@ /obj/structure/cliff/automatic{ dir = 6 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) "qT" = ( /obj/effect/map_effect/portal/master/side_b/wilderness_to_plains/river{ dir = 1 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/river/gautelfr) "ta" = ( /obj/structure/showcase/sign{ @@ -144,9 +117,7 @@ /obj/structure/cliff/automatic{ dir = 10 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "ub" = ( /obj/effect/map_effect/portal/line/side_b{ @@ -155,8 +126,7 @@ /turf/simulated/floor/outdoors/dirt/sif, /area/surface/outside/path/wilderness) "uP" = ( -/obj/effect/shuttle_landmark/cynosure/wilderness, -/turf/simulated/floor/outdoors/grass/sif{ +/turf/simulated/floor/outdoors/grass/sif/random{ tree_chance = 0 }, /area/surface/outside/wilderness/deep) @@ -164,9 +134,7 @@ /obj/structure/cliff/automatic/corner{ dir = 10 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "vQ" = ( /obj/structure/prop/rock/small/wateralt, @@ -177,17 +145,13 @@ dir = 2 }, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) "wt" = ( /obj/structure/cliff/automatic{ dir = 6 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "wN" = ( /turf/simulated/floor/outdoors/dirt/sif, @@ -196,9 +160,7 @@ /obj/effect/map_effect/portal/line/side_b{ dir = 1 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/wilderness/normal) "zn" = ( /obj/effect/zone_divider, @@ -212,10 +174,10 @@ /area/surface/outside/river/gautelfr) "Aq" = ( /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "Ax" = ( -/turf/simulated/floor/outdoors/grass/sif/forest, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "Ay" = ( /turf/simulated/floor/water, @@ -225,25 +187,19 @@ dir = 8 }, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "BR" = ( /obj/structure/cliff/automatic{ dir = 8 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/wilderness/mountains) "Cb" = ( /obj/structure/cliff/automatic/corner{ dir = 6 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "CR" = ( /turf/simulated/floor/outdoors/dirt/sif, @@ -256,17 +212,14 @@ /obj/structure/cliff/automatic{ dir = 4 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/wilderness/mountains) +"Fg" = ( +/turf/simulated/floor/outdoors/mask, +/area/surface/outside/path/wilderness) "FF" = ( /turf/simulated/shuttle/wall/voidcraft, /area/surface/outside/wilderness/mountains) -"FR" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif/forest, -/area/surface/outside/wilderness/deep) "Gf" = ( /obj/structure/cliff/automatic/corner{ dir = 6 @@ -274,9 +227,7 @@ /obj/structure/cliff/automatic{ dir = 4 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) "GK" = ( /turf/simulated/floor/outdoors/snow/sif/planetuse, @@ -294,6 +245,12 @@ /obj/structure/prop/rock/waterflat, /turf/simulated/floor/water, /area/surface/outside/river/gautelfr) +"JF" = ( +/obj/effect/shuttle_landmark/cynosure/wilderness, +/turf/simulated/floor/outdoors/grass/sif/random{ + tree_chance = 0 + }, +/area/surface/outside/wilderness/deep) "KZ" = ( /turf/simulated/floor/wood/sif, /area/surface/outside/path/wilderness) @@ -301,9 +258,7 @@ /obj/structure/cliff/automatic/corner{ dir = 6 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) "MK" = ( /obj/effect/map_effect/portal/line/side_b{ @@ -315,21 +270,17 @@ /turf/simulated/floor/water/deep, /area/surface/outside/river/gautelfr) "NP" = ( -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/wilderness/mountains) "Pe" = ( /obj/structure/cliff/automatic{ dir = 4 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/normal) "PH" = ( /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/deep) "Qw" = ( /obj/structure/prop/rock/small/water, @@ -339,9 +290,7 @@ /obj/effect/map_effect/portal/master/side_b/wilderness_to_plains{ dir = 1 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/path/wilderness) "Sa" = ( /obj/effect/zone_divider, @@ -364,35 +313,24 @@ /obj/structure/cliff/automatic/corner{ dir = 10 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) "VU" = ( /obj/structure/cliff/automatic{ dir = 2 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) -"Wi" = ( -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/wilderness/deep) "Wz" = ( /obj/structure/cliff/automatic/corner{ dir = 6 }, /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) "XN" = ( /obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/path/wilderness) "Yh" = ( /obj/structure/cliff/automatic/corner{ @@ -401,23 +339,13 @@ /obj/structure/cliff/automatic{ dir = 8 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/mask, /area/surface/outside/wilderness/mountains) -"Yy" = ( -/obj/effect/zone_divider, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, -/area/surface/outside/path/wilderness) "Zo" = ( /obj/effect/map_effect/portal/line/side_b{ dir = 1 }, -/turf/simulated/floor/outdoors/grass/sif{ - tree_chance = 0 - }, +/turf/simulated/floor/outdoors/grass/sif, /area/surface/outside/path/wilderness) "ZB" = ( /obj/structure/railing{ @@ -769,41 +697,41 @@ oR oR oR oR -eL -eL oR -eL -eL -eL -eL -eL -tM -MS -MS -MS -MS -MS -MS -tM -MS -MS -tM -tM -tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL -eL -eL +oR +oR +oR +oR +oR +oR +tM +MS +MS +MS +MS +MS +MS +tM +MS +MS +tM +tM +tM +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -929,13 +857,13 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -1023,18 +951,18 @@ oR oR oR oR -eL oR oR oR -eL oR -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR tM MS MS @@ -1048,21 +976,21 @@ MS tM tM tM -eL -eL -eL -eL oR oR -eL -eL -eL oR -eL -eL -eL oR -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -1090,10 +1018,10 @@ Ax Ax Ax Ax -ct -ct Ax -ct +Ax +Ax +Ax Ax Ax Ax @@ -1184,15 +1112,15 @@ Ax Ax Ax Ax -ct Ax -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -1259,7 +1187,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -1278,20 +1217,9 @@ oR oR oR oR -eL oR -eL oR -eL -eL -eL -eL oR -eL -eL -eL -eL -eL tM MS MS @@ -1305,23 +1233,23 @@ MS tM tM tM -eL -eL -eL -eL -eL -oR -eL oR oR -eL oR -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -1334,13 +1262,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -1353,21 +1274,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -1379,8 +1285,30 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -1395,8 +1323,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -1440,16 +1366,18 @@ Ax Ax Ax Ax -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -1516,7 +1444,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -1539,17 +1476,8 @@ oR oR oR oR -eL -eL oR -eL oR -eL -eL -eL -eL -eL -eL tM MS MS @@ -1562,39 +1490,28 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -oR -eL oR oR -eL oR -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -1624,7 +1541,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -1635,7 +1551,19 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -1654,17 +1582,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -1684,7 +1601,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -1698,15 +1614,27 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -1747,7 +1675,6 @@ oR oR oR oR -eL oR oR oR @@ -1773,7 +1700,17 @@ oR oR oR oR -FR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -1797,16 +1734,7 @@ oR oR oR oR -eL -eL oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -1819,43 +1747,37 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -oR -oR -eL -eL -eL -oR -oR -oR -eL oR oR oR oR oR oR -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax -ct Ax -ct Ax -ct Ax Ax Ax @@ -1871,7 +1793,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -1881,28 +1802,20 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct -ct -ct -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax -ct -er Ax Ax Ax @@ -1912,22 +1825,44 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax Ax -ct -ct +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax @@ -1954,15 +1889,8 @@ Ax Ax Ax Ax -ct Ax -ct -ct Ax -ct -ct -ct -ct Mf qh GK @@ -1988,49 +1916,6 @@ oR oR oR oR -eL -eL -oR -oR -oR -oR -oR -oR -oR -eL -eL -oR -oR -eL -oR -oR -oR -oR -eL -oR -oR -eL -oR -eL -eL -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR oR oR oR @@ -2054,17 +1939,60 @@ oR oR oR oR -eL oR -eL -eL -eL -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM MS MS @@ -2077,42 +2005,63 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -oR -eL -eL -eL oR oR oR -eL -eL -eL -eL oR -eL -eL -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -2126,34 +2075,13 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -2194,14 +2122,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -2210,16 +2130,24 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -2236,58 +2164,6 @@ oR oR oR oR -eL -oR -oR -oR -oR -eL -oR -oR -oR -eL -oR -eL -oR -oR -oR -eL -oR -oR -oR -eL -oR -oR -oR -eL -eL -eL -oR -eL -oR -oR -eL -eL -eL -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR oR oR oR @@ -2310,18 +2186,70 @@ oR oR oR oR -eL -eL -eL -eL oR oR -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM MS @@ -2334,29 +2262,28 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -oR -eL oR oR -eL oR -eL oR -eL -eL oR -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR Ax Ax -ct Ax Ax Ax @@ -2366,7 +2293,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -2376,32 +2302,34 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -Ax -ct -Ax -ct Ax Ax Ax Ax Ax -ct -ct -Ax -ct -Ax -ct Ax Ax -ct -ct Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -2419,39 +2347,6 @@ Ax Aq Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -2467,16 +2362,49 @@ Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -2493,59 +2421,8 @@ oR oR oR oR -eL oR oR -eL -oR -eL -eL -oR -oR -eL -oR -oR -oR -eL -eL -oR -oR -oR -eL -oR -oR -eL -eL -oR -Wi -Wi -Wi -Wi -oR -oR -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR oR oR oR @@ -2571,15 +2448,62 @@ oR oR oR eL -eL oR -eL -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM MS MS @@ -2591,37 +2515,27 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -oR -eL -eL -eL -eL oR oR oR -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR oR Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -2629,49 +2543,59 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -ct -ct -Ax -Ax -Ax -ct -Ax -ct -ct -ct -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -ct -Ax -ct Ax Ax Ax Ax Ax Ax -ct -Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq Ax @@ -2683,16 +2607,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -2707,12 +2621,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -2725,15 +2633,31 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -2751,71 +2675,12 @@ oR oR oR oR -eL -oR -eL -oR -oR -eL -oR -oR -eL -oR oR oR oR eL -oR eL oR -eL -oR -oR -eL -oR -eL -Wi -Wi -Wi -Wi -eL -oR -eL -eL -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR oR oR oR @@ -2826,17 +2691,86 @@ oR oR oR eL +oR eL oR +oR +oR +eL +eL +oR +eL +oR +oR +oR +oR +eL +oR +oR eL oR eL eL eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM MS @@ -2849,26 +2783,47 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -oR -oR -eL -oR -eL -eL oR oR oR oR oR -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -2883,23 +2838,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -2909,7 +2847,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -2917,10 +2854,7 @@ Ax Ax Ax Ax -ct Ax -ct -ct Ax Ax Ax @@ -2935,28 +2869,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -ct -Ax -Ax -ct -Ax -ct -ct Ax Ax Ax @@ -2967,11 +2879,6 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -ct Ax Ax Ax @@ -2981,16 +2888,43 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -3009,68 +2943,26 @@ oR oR oR oR -eL oR -Wi -Wi -Wi -oR -eL -eL oR oR eL -eL -Wi -Wi -Wi -eL -eL -oR -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -eL oR eL oR oR +oR eL oR oR oR +eL oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR +eL +eL +eL oR oR oR @@ -3082,19 +2974,75 @@ oR oR oR eL -oR -eL -eL eL eL oR -eL -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM MS @@ -3106,23 +3054,23 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL -eL oR -eL oR -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR Ax @@ -3134,26 +3082,18 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax -ct -ct Ax Ax Ax -ct Ax Ax -ct Ax -ct Ax Ax -ct Ax Ax Ax @@ -3174,7 +3114,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -3183,40 +3122,57 @@ Ax Ax Ax Ax -ct -ct Ax Ax -er Ax Ax Ax -ct Ax Ax Ax -ct -ct Ax Ax -ct -ct Ax -ct +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax Ax -ct -ct Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax Ax @@ -3225,13 +3181,9 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct -ct Ax Ax Ax @@ -3244,10 +3196,6 @@ Ax Ax Ax Ax -ct -ct -ct -ct VU GK GK @@ -3265,13 +3213,6 @@ oR oR oR oR -eL -eL -eL -Wi -Wi -Wi -oR Wi Wi Wi @@ -3282,42 +3223,6 @@ Wi Wi Wi oR -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -oR -eL -oR -eL -eL -eL -eL -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR oR oR oR @@ -3338,20 +3243,90 @@ oR oR eL eL -eL +oR +oR oR eL oR +oR +eL +eL +oR +Wi +Wi +Wi +Wi +oR +oR +oR eL oR oR oR -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +uP +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM tM @@ -3364,48 +3339,28 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -oR -eL -eL -oR -eL oR oR -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -3422,8 +3377,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -3432,15 +3385,37 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -3449,33 +3424,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -3488,23 +3436,50 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -3525,34 +3500,28 @@ oR oR oR oR -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Hb -Hb -Wi +eL +oR +oR +eL +oR +oR +oR +oR eL oR eL +oR eL +oR +oR eL +oR eL -eL -eL +Wi +Wi +Wi +Wi eL oR eL @@ -3567,12 +3536,52 @@ oR oR oR oR +uP +uP +oR +oR +oR +oR +oR +oR +oR +uP +uP +oR +oR +uP +oR +oR +oR +oR +uP +oR +oR +uP +oR +uP +uP +uP +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR oR oR oR oR oR -FR oR oR oR @@ -3602,13 +3611,6 @@ oR oR oR oR -eL -eL -eL -eL -eL -eL -eL tM tM tM @@ -3621,40 +3623,25 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL oR oR -eL oR -eL oR -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -3679,8 +3666,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -3689,15 +3674,32 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -3710,34 +3712,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -3755,13 +3729,41 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -3776,17 +3778,28 @@ oR oR oR oR -eL -eL oR -eL +oR +oR +oR +oR oR Wi Wi Wi +oR +eL +eL +oR +oR +eL +eL Wi Wi Wi +eL +eL +oR Wi Wi Wi @@ -3807,6 +3820,29 @@ Wi Wi Wi oR +uP +oR +oR +oR +uP +oR +oR +oR +uP +oR +oR +oR +uP +uP +uP +oR +uP +oR +oR +uP +uP +uP +uP oR oR oR @@ -3820,16 +3856,17 @@ oR oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -3853,20 +3890,10 @@ oR oR oR oR -eL oR oR -eL -oR -eL oR oR -eL -eL -eL -eL -eL -eL tM tM tM @@ -3878,41 +3905,25 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -oR -oR -eL oR oR oR oR oR -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR Ax -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -3936,11 +3947,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -3950,8 +3956,29 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -3960,7 +3987,6 @@ Ax Ax Aq Ax -ct Ax Ax Ax @@ -3980,13 +4006,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -3995,29 +4014,37 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -4032,11 +4059,17 @@ oR oR oR oR -eL -eL -eL +oR +oR +oR +oR oR eL +eL +eL +Wi +Wi +Wi oR Wi Wi @@ -4045,24 +4078,22 @@ Wi Wi Wi Wi -Hb -Hb -Hb -Hb Wi Wi -Wi -Wi -Wi -Hb -Hb -Hb +oR Wi Wi Wi Wi Wi Wi +Wi +Wi +Wi +oR +eL +oR +eL eL eL eL @@ -4074,6 +4105,38 @@ oR oR oR oR +uP +oR +oR +uP +oR +uP +uP +oR +oR +uP +oR +oR +oR +uP +uP +oR +oR +oR +uP +oR +oR +uP +uP +oR +uP +uP +uP +uP +oR +oR +oR +uP oR oR oR @@ -4086,7 +4149,17 @@ oR oR oR oR -FR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -4103,7 +4176,6 @@ oR oR oR oR -eL oR oR oR @@ -4116,14 +4188,8 @@ oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL tM tM tM @@ -4135,26 +4201,27 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL oR oR -eL -oR -eL -oR -eL oR oR -eL oR -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax Ax Ax Ax @@ -4169,7 +4236,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -4221,7 +4287,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -4241,7 +4306,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -4257,7 +4321,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -4266,15 +4329,18 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -4290,7 +4356,11 @@ oR oR oR oR -eL +oR +oR +oR +oR +oR oR oR Wi @@ -4300,35 +4370,65 @@ Wi Wi Wi Wi -Hb -Hb -Hb Wi Wi -Hb +Wi +Wi +Wi +Wi +Wi Wi Wi Wi Hb Hb -Hb -Hb -Wi -Wi -Wi -oR -Wi -Wi Wi +eL oR eL eL +eL +eL +eL +eL +eL oR oR oR oR oR oR +uP +oR +oR +uP +oR +oR +uP +oR +oR +oR +oR +uP +oR +uP +oR +uP +oR +oR +uP +oR +uP +uP +uP +uP +uP +uP + +oR +uP +uP +uP oR oR oR @@ -4343,7 +4443,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -4365,10 +4474,6 @@ oR oR oR oR -eL -oR -oR -eL oR oR oR @@ -4377,11 +4482,6 @@ oR oR oR oR -eL -eL -eL -eL -eL tM tM tM @@ -4393,29 +4493,33 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -oR -eL -eL -oR -eL oR oR -eL oR -eL -ct -ct -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -4423,12 +4527,8 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax -ct Ax Ax Ax @@ -4510,28 +4610,28 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -4548,8 +4648,18 @@ oR oR oR oR +eL +eL oR eL +oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi Wi Wi Wi @@ -4557,28 +4667,69 @@ Wi Wi Wi Wi -Hb Wi Wi Wi Hb Hb -Hb -Wi -Wi -Hb -Hb -Hb Wi Wi Wi Wi -eL -eL -eL oR -eL -eL +oR +oR +oR +oR +oR +uP +oR +uP +uP +uP +oR +uP +uP +oR +oR +uP +uP +uP +uP +uP +uP +uP +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +oR +uP +oR +oR +uP +oR +oR +oR + + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH oR oR oR @@ -4600,7 +4751,6 @@ oR oR oR oR -FR oR oR oR @@ -4619,27 +4769,6 @@ oR oR oR oR -oR -oR -eL -oR -oR -eL -eL -oR -oR -eL -eL -eL -oR -eL -oR -oR -eL -eL -eL -eL -eL tM tM MS @@ -4650,28 +4779,28 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL oR oR -eL -oR -eL oR oR -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR Ax Ax Ax Ax -ct +Ax Ax Ax Ax @@ -4742,9 +4871,6 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax @@ -4765,10 +4891,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -4780,15 +4902,22 @@ Ax Ax Ax Ax -ct -ct -ct -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -4804,12 +4933,16 @@ oR oR oR oR +eL +eL +eL oR + +eL + + + oR -oR -Wi -Wi -Wi Wi Wi Wi @@ -4818,6 +4951,11 @@ Wi Wi Wi Hb +Hb +Hb +Hb +Wi +Wi Wi Wi Wi @@ -4825,7 +4963,7 @@ Hb Hb Hb Wi -Hb +Wi Wi Wi Wi @@ -4833,11 +4971,57 @@ Wi eL eL eL + + eL oR oR oR oR + + +oR + +oR +oR +oR +oR +oR +uP +uP +uP +uP +uP +uP +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +oR +uP +oR +uP +uP +uP +uP +oR +uP oR oR oR @@ -4849,15 +5033,12 @@ oR oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -FR +PH +oR +oR +oR +oR +oR oR oR oR @@ -4891,12 +5072,7 @@ oR oR oR oR -eL oR -eL -eL -eL -eL tM tM MS @@ -4907,41 +5083,43 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -oR -eL -eL -eL -eL oR oR oR oR -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -4951,9 +5129,7 @@ Ax Ax Ax Ax -ct Ax -ct Ax Ax Ax @@ -5000,18 +5176,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -5027,7 +5191,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -5038,14 +5201,27 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -5060,10 +5236,16 @@ oR oR oR oR + + + eL + oR oR eL +oR +oR Wi Wi Wi @@ -5072,26 +5254,34 @@ Wi Wi Wi Hb +Hb +Hb Wi Wi Hb Wi -Hb -Hb Wi +Wi +Hb Hb Hb Hb Wi Wi Wi +oR Wi Wi +Wi +oR +eL +eL + + eL eL eL -eL -eL + oR oR oR @@ -5103,6 +5293,42 @@ oR oR oR oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +Hb +Hb +uP +uP +oR +uP +uP +uP +uP +uP +uP +uP +oR +uP +oR + +oR +oR + oR oR oR @@ -5111,10 +5337,23 @@ oR oR oR oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR + oR oR oR FR + + oR oR oR @@ -5144,16 +5383,8 @@ oR oR oR oR -eL oR -eL -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -5164,40 +5395,41 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL -eL oR -eL -eL -eL -eL -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -5210,7 +5442,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -5279,14 +5510,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -5295,14 +5518,22 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -5317,12 +5548,18 @@ oR oR oR oR +oR +oR +oR +oR + eL -oR -eL -oR -oR -oR +Wi +Wi +Wi + + + Wi Wi Wi @@ -5332,20 +5569,67 @@ Wi Wi Wi Hb +Hb +Hb +Wi Wi -Hb -Hb Hb Hb Hb Wi +Wi +Wi +Wi +eL +eL +eL +oR + +eL +eL + +oR +oR +oR +oR + +oR +uP +uP +oR +uP +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP Hb -Wi -Wi -Wi +Hb +uP +uP +uP +uP +uP +uP +oR + oR oR -eL +oR + oR oR oR @@ -5361,17 +5645,12 @@ oR oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR +PH +oR +oR +oR +oR +oR oR oR oR @@ -5405,12 +5684,7 @@ oR oR oR oR -eL -eL oR -eL -eL -eL tM tM MS @@ -5422,40 +5696,43 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL oR oR -eL oR -eL -eL -eL -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -5474,7 +5751,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -5491,10 +5767,8 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -5517,10 +5791,6 @@ Ax Ax Ax Ax -ct -ct -ct -ct Ax Ax Ax @@ -5538,11 +5808,6 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -ct Ax Ax Ax @@ -5557,9 +5822,18 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -5574,100 +5848,141 @@ oR oR oR oR -eL oR -eL -eL -eL oR +oR +oR +oR + Wi Wi Wi Wi Wi +Wi +Wi +Wi +Wi +Wi + +oR +oR +uP +uP +uP +oR +uP +oR +uP +uP +uP +uP +uP +uP +uP Hb Hb Wi Wi -Hb -Hb -Hb -Hb Wi Hb + Hb +uP +uP +uP +uP +uP +Hb +Hb + +Hb +Wi Hb Wi Wi Wi Wi -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -oR -oR -oR -oR -eL -oR + eL eL eL +eL + +oR +oR +oR +oR +oR + +Hb +uP +uP +uP +uP +uP +uP +uP +uP +uP + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM MS @@ -5679,27 +5994,30 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL oR oR -eL -eL -eL -eL -eL -ct -Ax -ct -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -5730,7 +6048,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -5738,8 +6055,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -5758,19 +6073,6 @@ Ax Ax Ax Aq -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -5809,14 +6111,27 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -5830,11 +6145,21 @@ pM oR oR oR + +oR + + eL + +oR +oR + + oR eL -eL oR +oR + eL Wi Wi @@ -5842,29 +6167,73 @@ Wi Wi Wi Wi + +Wi + + +oR +oR +uP +oR +oR +uP +uP +uP +uP +uP +uP +uP + + Hb -Hb +Wi Wi Hb Hb +uP +uP +Hb +uP +uP +uP +Hb + +Wi +Hb + + + Hb Hb Wi Wi Wi +Wi + + + Hb +Hb +Hb +uP +uP +uP +oR +uP +uP +uP +oR +uP +uP + +oR +oR + Wi -Wi -oR -oR -Wi -oR -oR -oR -oR -oR eL -oR +eL +eL +eL eL oR oR @@ -5880,12 +6249,19 @@ oR oR oR oR +PH oR oR oR +oR +oR +oR + oR oR FR + + oR oR oR @@ -5912,19 +6288,13 @@ oR oR oR oR -eL oR oR oR oR oR -eL oR -eL oR -eL -eL -eL tM tM MS @@ -5936,35 +6306,37 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL oR oR -eL -eL -eL oR -eL -eL -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -6006,8 +6378,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -6017,34 +6387,6 @@ Ax Aq Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -6065,15 +6407,43 @@ Ax Ax Ax Ax -ct -ct -Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -6089,40 +6459,100 @@ oR oR oR oR +oR + eL oR -eL -eL oR -Wi +oR Wi Wi Wi Wi Hb -Hb -Hb -Hb -Hb -Hb -Hb -Wi -Hb -Hb Wi Wi Wi +Hb + +Wi + + +oR +oR +oR +oR +oR +uP +uP +uP +uP +uP +uP +uP +uP +Hb +uP +uP +uP + + +Hb +Hb +Hb +uP +uP +Hb +Hb +Hb + + + +Hb Wi Wi + +Wi +Wi +Wi + +uP +uP +uP +uP +uP +uP +uP + oR +uP +uP oR -oR -oR -eL + eL oR + + + oR -eL + + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH oR oR oR @@ -6142,7 +6572,6 @@ oR oR oR oR -FR oR oR oR @@ -6157,31 +6586,12 @@ oR oR oR oR -eL oR oR oR oR oR oR -oR -oR -oR -oR -oR -eL -oR -oR -oR -oR -eL -oR -eL -eL -eL -eL -eL -eL tM tM tM @@ -6193,24 +6603,23 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL oR -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR Ax -ct Ax Ax Ax @@ -6256,13 +6665,14 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -6284,7 +6694,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -6297,22 +6706,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -6325,13 +6718,30 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -6344,16 +6754,19 @@ pM oR oR oR + +oR + + eL + oR eL oR eL eL -Wi -Wi -Wi -Wi +eL +oR Wi Wi Wi @@ -6361,21 +6774,58 @@ Wi Wi Hb Hb -Hb -Hb Wi Wi Hb +Hb + +oR +oR +oR +oR +oR +oR +oR +oR +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP + +Hb +uP +uP +uP +Hb + Wi + +Hb +Hb + Wi -Wi -Wi -oR -oR -eL -eL -eL -eL + + +Hb +Hb +uP + +Hb +uP +uP +uP +uP +uP +uP +uP +uP oR oR oR @@ -6395,11 +6845,14 @@ oR oR oR oR -oR -oR -oR -oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -6431,15 +6884,8 @@ oR oR oR oR -eL oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -6451,35 +6897,35 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR oR -ct -ct -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -6530,38 +6976,6 @@ Ax Ax Aq Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -6580,15 +6994,47 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -6602,102 +7048,150 @@ oR oR oR oR + + + oR + eL + + oR -eL -eL oR + +eL + + +Wi + Wi Wi Wi Wi Wi Wi + +oR +oR +uP +oR +oR +uP +uP +uP +uP +uP +uP +uP +uP +Hb +uP +uP +Hb + Wi +Hb +Hb + +uP + Hb Hb uP Hb Hb + Wi + Hb Hb Wi Wi Wi +Hb +Wi Wi -eL -oR -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR oR oR + +Wi + + +Hb +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP + oR oR + oR oR oR eL oR eL -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM MS MS @@ -6708,27 +7202,22 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -oR -eL -eL -eL oR oR -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR Ax -ct Ax Ax Ax @@ -6740,7 +7229,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -6775,7 +7263,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -6785,7 +7272,25 @@ Ax Ax Ax Ax -er +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -6799,10 +7304,8 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -6812,7 +7315,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -6823,29 +7325,21 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct -ct -ct VU GK GK @@ -6861,20 +7355,53 @@ oR oR oR oR +eL oR + eL eL +oR Wi Wi Wi Wi Wi Hb -Wi -Wi Hb -Wi + Hb +Hb +Hb + +Wi + +oR +uP +oR +uP +oR +oR +oR +uP +uP +uP +uP +Hb +uP +uP +uP +Hb +uP +Hb +Hb +Hb + + +Hb +Hb +uP +Hb + Wi Hb Hb @@ -6883,17 +7410,32 @@ Wi Wi Wi Wi -Wi + + eL + +uP +uP +uP +oR + +oR +uP + oR oR oR -oR -oR + eL -oR -oR eL + + +oR +oR + +eL + + oR oR oR @@ -6910,10 +7452,21 @@ oR oR oR oR +PH oR oR oR + + +oR +oR +oR + +oR + FR + + oR oR oR @@ -6948,13 +7501,7 @@ oR oR oR oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -6965,200 +7512,6 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -oR -eL -oR -eL -oR -ct -ct -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -er -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -ct -ct -ct -ct -VU -GK -GK -bE -"} -(27,1,1) = {" -jq -pM -pM -oR -oR -oR -oR -oR -oR -eL -eL -eL -Wi -Wi -Wi -Wi -Wi -Wi -Hb -Hb -Hb -Wi -Hb -Hb -Wi -Hb -Hb -Wi -Wi -Wi -Wi -oR -eL -oR -eL -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR oR oR oR @@ -7170,78 +7523,12 @@ oR oR oR oR -FR oR oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -eL -eL -oR -oR -eL -eL -eL -eL -eL -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -oR -eL -eL -eL -oR -ct Ax -ct Ax -ct Ax Ax Ax @@ -7252,10 +7539,8 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -7263,14 +7548,12 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -7279,16 +7562,23 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -7303,30 +7593,6 @@ Aq Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -7351,15 +7617,338 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +VU +GK +GK +bE +"} +(27,1,1) = {" +jq +pM +pM +oR +oR +oR +oR +eL +oR + +eL +oR +eL +eL +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Hb +Hb +Hb +Hb +Wi +Wi +Hb +Wi +Wi +Wi +Wi +oR +oR +eL +eL + +eL +eL + + +oR +oR +uP +oR +uP +uP +uP +oR +uP +uP +uP +uP +uP +Hb +Hb +uP +uP +Hb +Hb +Hb +Hb +uP +Hb +Hb +Hb +uP +uP +uP +uP +oR +oR +oR + +oR + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR + +oR +oR +FR + + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +tM +tM +MS +MS +MS +MS +MS +MS +tM +tM +tM +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -7375,7 +7964,9 @@ oR oR oR oR + eL +oR eL eL oR @@ -7383,28 +7974,75 @@ Wi Wi Wi Wi -eL Wi Wi Wi Hb + + +Wi + +oR +uP +oR +uP +uP +oR +uP +uP +uP +uP +uP +uP +uP +Hb +Hb +uP +Hb +Hb + + +Hb +uP +Hb +Hb + Wi Hb -Wi Hb Wi Wi Wi Wi -Wi +eL + + eL eL + +uP +uP +uP +Hb +uP +uP +oR +oR +uP +oR +oR +oR + + +oR +oR + eL + +uP + oR -eL -eL -oR -eL +uP oR oR oR @@ -7420,14 +8058,19 @@ oR oR oR oR +PH oR oR oR oR oR +oR + oR oR FR + + oR oR oR @@ -7463,13 +8106,7 @@ oR oR oR oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -7480,40 +8117,21 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -7526,8 +8144,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -7536,7 +8152,28 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -7596,27 +8233,27 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -7632,15 +8269,25 @@ oR oR oR oR -eL oR oR -Wi -Wi -Wi -Wi -Wi + eL +eL + + + +Wi +Wi +Wi +Wi +Wi +Hb +Wi +Wi +Hb +Wi +Hb Wi Hb Hb @@ -7650,83 +8297,123 @@ Wi Wi Wi Wi -Wi -Wi -Wi -Wi -eL +eL + +oR + eL eL eL eL eL + + oR +uP oR +uP +uP oR +uP +uP +uP +uP +uP +Hb +Hb +Hb +Hb +Hb +Hb +Hb +uP +Hb +Hb +uP +uP +uP +uP +uP oR -eL -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR + eL oR oR eL + + + oR +oR +oR +uP +uP +oR + eL eL -eL -eL -eL + +oR +uP +oR + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM MS @@ -7737,32 +8424,32 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax -ct -ct -ct -ct Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -7857,23 +8544,23 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -7890,7 +8577,13 @@ oR oR oR oR + +eL +eL + + oR + eL Wi Wi @@ -7898,92 +8591,123 @@ Wi Wi Wi Wi +Hb +Hb +Hb +Wi +Hb +Hb +Wi +Hb +Hb Wi Wi Wi Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -eL -eL -eL -eL -eL +oR eL oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -eL -eL eL + +uP +oR +uP +oR + eL + +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +Hb +Hb +Hb +Hb +uP +uP +Hb +uP +uP +uP +uP + +oR +oR +uP +uP +uP +uP + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM tM @@ -7994,41 +8718,43 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL oR -ct -ct -Ax -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -8045,13 +8771,11 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -8081,28 +8805,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -8123,14 +8825,36 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -8147,36 +8871,80 @@ oR oR oR oR + + oR -eL -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -Wi -oR + + eL eL eL oR -oR -oR +Wi +Wi +Wi +Wi +eL +Wi +Wi +Wi +Hb +Wi +Hb +Wi +Hb +Wi +Wi +Wi +Wi +Wi +eL +eL eL oR + +eL +eL + +oR + +oR +uP +oR +uP +uP +oR +uP +uP +uP +uP +uP +uP +uP +Hb +Hb +JF +Hb +Hb +uP +Hb +Hb +uP +uP +uP +uP +uP oR oR +uP +oR +oR +oR +oR +oR + +oR + oR eL oR @@ -8194,27 +8962,28 @@ oR oR oR oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -8236,11 +9005,6 @@ oR oR oR oR -eL -eL -eL -eL -eL tM tM tM @@ -8252,38 +9016,40 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -8308,12 +9074,10 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct Ax Ax Ax @@ -8328,38 +9092,6 @@ Ax Ax Ax Aq -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -8379,16 +9111,48 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -8404,41 +9168,73 @@ oR oR oR oR + eL -eL -Wi -Wi -Wi +oR oR Wi Wi Wi Wi Wi +eL +Wi +Hb +Hb +Wi +Wi +Wi Wi Wi Wi Wi Wi Wi -oR Wi eL eL eL -oR -oR -eL -oR -oR -oR -eL -oR -oR -oR -oR eL eL +eL + +oR +oR +oR +oR +uP +uP +uP +uP +uP +uP +uP +Hb +uP +uP +Hb +uP +Hb +uP +Hb +Hb +uP +uP +uP +uP +uP +uP +uP + +oR +oR +oR +oR +oR +uP +oR +oR +uP oR oR oR @@ -8449,13 +9245,27 @@ oR oR oR oR + + oR oR oR -oR -oR -oR + + FR + +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR + oR oR oR @@ -8489,16 +9299,8 @@ oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -8509,26 +9311,37 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR oR oR -ct -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -8542,7 +9355,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -8553,14 +9365,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -8569,10 +9373,8 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -8593,14 +9395,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -8615,7 +9409,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -8627,7 +9420,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -8637,15 +9429,25 @@ Ax Ax Ax Ax -ct -ct Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -8658,10 +9460,17 @@ oR oR oR oR -eL oR + +oR +oR +oR +oR + + eL eL + eL Wi Wi @@ -8670,8 +9479,12 @@ Wi Wi Wi Wi -oR -oR +Wi +Wi +Wi +Wi +Wi +Wi Wi Wi Wi @@ -8679,13 +9492,45 @@ Wi Wi Wi eL -oR -eL -oR eL eL eL eL +eL + +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +Hb +Hb +Hb +uP +Hb +Hb +uP +Hb +Hb +uP +uP +uP +uP +oR +uP +oR +uP +oR +uP +oR +oR +oR + oR oR oR @@ -8703,16 +9548,23 @@ oR oR oR oR +PH oR oR oR oR oR oR + + + oR oR oR + FR + + oR oR oR @@ -8750,12 +9602,6 @@ oR oR oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -8766,26 +9612,28 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -oR -eL oR oR -eL -ct -Ax -ct -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -8801,7 +9649,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -8812,7 +9659,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -8851,21 +9697,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -8880,29 +9711,44 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct Ax -ct -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -8917,7 +9763,13 @@ oR oR oR oR + +oR +oR + + eL + oR eL Wi @@ -8926,25 +9778,75 @@ Wi Wi Wi Wi -oR -eL -eL -oR +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi +Wi Wi Wi oR -Wi -Wi eL eL eL -eL -oR -eL -eL + oR oR +oR +oR +uP +uP +uP +oR +uP +uP +uP +uP +uP +uP +uP +uP +Hb +uP +Hb +uP +Hb +uP +uP +uP +uP +uP +uP +uP +uP +oR +uP +uP +oR +uP +oR +oR + +oR +oR +oR + eL + + +eL +oR + + + +oR +oR +oR +oR eL oR oR @@ -8955,21 +9857,16 @@ oR oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -9004,16 +9901,7 @@ oR oR oR oR -eL oR -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -9023,41 +9911,42 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL oR -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -9094,7 +9983,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -9112,28 +10000,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -9149,17 +10015,39 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -9171,106 +10059,153 @@ pM pM oR oR +oR +oR +oR +oR +oR + eL -oR -oR -oR -oR eL Wi Wi Wi +oR +Wi +Wi +Wi Wi Wi Wi -oR -eL +Wi +Wi +Wi +Wi +Wi + + eL + oR +oR +uP +oR +oR +uP +uP +uP +uP +uP +uP +uP +Hb +Hb +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP + + oR Wi eL -oR + +eL eL oR -eL + +oR oR eL eL oR + eL + +uP +uP + oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR + oR oR oR eL +oR +oR + oR oR eL eL -eL -eL -eL -eL -eL +oR + + +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM MS @@ -9280,56 +10215,58 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL -eL -eL -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -9350,8 +10287,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -9361,19 +10296,6 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -9389,7 +10311,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -9397,26 +10318,40 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -9430,32 +10365,75 @@ oR oR oR oR + + + oR oR -eL -eL + eL oR eL +eL + +eL +Wi +Wi +Wi +Wi +Wi + + oR + +oR +eL +oR + + Wi Wi oR +oR +Wi +Wi +Wi +Wi +Wi +Wi eL + + oR oR -eL -eL -eL oR -eL oR -eL -oR -eL -eL -eL -eL +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP oR oR oR @@ -9476,14 +10454,23 @@ oR oR oR oR +PH oR oR oR oR oR oR + + oR + +oR +oR + FR + + oR oR oR @@ -9520,14 +10507,7 @@ oR oR oR oR -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -9538,30 +10518,31 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -9584,7 +10565,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -9620,29 +10600,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -9659,20 +10616,43 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax -ct -ct Ax -ct Ax -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -9687,6 +10667,11 @@ oR oR oR oR + +oR +oR + + eL eL eL @@ -9695,28 +10680,82 @@ eL eL eL eL + eL oR eL +Wi +Wi +Wi +Wi +Wi +Wi +oR +eL +eL +oR +Wi +Wi +oR +Wi +Wi +eL +eL +eL +eL + +oR + +eL +eL + +oR + +oR oR eL eL oR oR oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP + +oR +uP +uP +uP +oR + eL oR oR -eL + + oR oR +uP oR -eL -eL oR oR -eL oR +uP oR oR oR @@ -9732,6 +10771,7 @@ oR oR oR oR +PH oR oR oR @@ -9740,7 +10780,6 @@ oR oR oR oR -FR oR oR oR @@ -9777,14 +10816,6 @@ oR oR oR oR -eL -eL -oR -eL -eL -eL -eL -eL tM tM tM @@ -9795,34 +10826,19 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -9841,17 +10857,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -9861,7 +10866,33 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -9896,18 +10927,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -9925,11 +10944,23 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -9943,6 +10974,9 @@ pM oR oR oR + + + oR oR oR @@ -9950,26 +10984,64 @@ eL eL eL eL -eL -oR -eL -eL + eL oR oR oR + +oR + +eL +Wi +Wi +Wi +Wi +Wi +Wi + + +oR +oR +oR +Wi eL oR eL +oR eL oR + +eL +eL + +uP +uP +uP +uP +uP oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP + oR +uP +uP +uP +uP oR + oR -oR -oR -oR + oR eL oR @@ -9978,6 +11050,19 @@ oR oR oR oR + +uP + +oR +oR +oR +uP +oR +oR +oR +oR +uP +uP oR oR oR @@ -9990,14 +11075,19 @@ oR oR oR oR +PH oR oR oR oR oR oR +oR + oR FR + + oR oR oR @@ -10036,13 +11126,6 @@ oR oR oR oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -10052,27 +11135,33 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -ct -ct -Ax -Ax -Ax -Ax -Ax -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -10094,11 +11183,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -10108,7 +11192,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -10167,7 +11250,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -10177,16 +11259,17 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -10203,103 +11286,142 @@ oR oR oR oR + +oR + + eL eL eL eL eL + eL eL eL oR -oR -oR -oR -oR -oR -oR -oR -eL eL oR -oR -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR +Wi +Wi oR eL oR oR eL -oR -oR -oR -oR +eL +eL oR eL oR eL oR + eL +eL +eL +eL + + + +oR +uP +oR +uP +uP +uP +uP +uP +uP +uP +uP +uP +uP +oR +oR +uP +uP +uP +uP +uP +uP +uP +oR +uP +oR +uP +uP +uP +uP +oR +oR +oR +oR +oR +oR + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR -eL -eL -eL -eL -eL tM tM tM @@ -10310,19 +11432,25 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -10340,7 +11468,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -10353,18 +11480,13 @@ Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax Ax Ax Ax -ct Ax -ct Ax Ax Ax @@ -10400,7 +11522,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -10439,11 +11560,12 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -10458,30 +11580,85 @@ oR oR oR oR + + + eL oR + oR eL eL +eL +eL +eL +eL +eL +eL +eL + +oR +eL oR eL eL oR + +oR +oR + + +uP +oR + + +uP +uP +uP +uP +uP +uP +uP +oR +uP +uP + +oR +uP +uP +oR +uP +uP +uP +uP +uP +uP +oR + + +uP +uP + +oR +oR +uP +uP +oR + +eL +eL + eL oR oR -oR -oR -oR +eL + + oR oR oR eL eL -eL -oR -oR -eL oR oR eL @@ -10498,6 +11675,7 @@ oR oR oR oR +PH oR oR oR @@ -10505,13 +11683,13 @@ oR oR oR oR -oR -oR -oR + oR oR oR FR + + oR oR oR @@ -10550,13 +11728,6 @@ oR oR oR oR -eL -eL -eL -eL -eL -eL -eL tM tM tM @@ -10567,23 +11738,30 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -ct -Ax -Ax -Ax -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -10595,12 +11773,6 @@ Ax Ax Ax Ax -ct -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -10612,7 +11784,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -10645,7 +11816,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -10676,8 +11846,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -10697,10 +11865,13 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -10714,99 +11885,9 @@ oR oR oR oR -eL oR oR -eL -oR -eL -eL -oR -oR -oR -eL -oR -oR -oR -oR -eL -eL -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -eL + oR oR eL @@ -10814,6 +11895,139 @@ eL eL eL eL +oR +eL +eL +eL + + +eL +oR +eL +eL + +oR +uP +oR +oR + +oR +oR +uP +uP +uP +uP +uP +uP +uP +oR +uP +uP +oR + + +oR +oR +oR +eL +oR +eL + +eL + + + + +oR +uP +uP +oR +uP +oR +uP +oR +uP +uP +oR +uP +oR +uP +oR +oR +oR + +eL + + +oR +oR + + + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM tM @@ -10824,40 +12038,41 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL oR oR -eL -ct -Ax -ct -ct -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -10866,7 +12081,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -10917,8 +12131,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -10935,10 +12147,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -10947,17 +12155,23 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -10975,103 +12189,145 @@ oR oR oR oR -oR -oR -eL -oR -oR -oR -oR -oR -eL -oR -oR -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -oR + eL eL eL eL eL +eL +eL + + +oR +oR +eL + + +oR +oR +oR +uP +uP +uP +oR +uP +oR +uP +uP +oR + + +eL + +uP + +oR +oR +uP +uP +uP +oR + + + +eL + +uP + +oR +uP + +oR +uP +uP +uP +uP +oR + +oR +oR +oR +eL +eL +oR +oR +oR + +eL + + + + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM MS @@ -11081,34 +12337,36 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -11147,9 +12405,7 @@ Ax Ax Ax Ax -ct Ax -ct Ax Ax Ax @@ -11200,21 +12456,21 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct -ct Ax Ax Ax -ct -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -11229,28 +12485,76 @@ oR oR oR oR + +oR +eL + + +eL +eL + +oR + + +oR +oR +oR + eL eL oR +eL + +uP +uP +uP +uP +uP +uP +uP +uP +uP +oR + + +uP + + +oR +uP +uP oR oR +oR +uP +oR +oR +uP +oR +oR + eL eL +eL + +oR +uP +uP +oR +oR + oR oR oR oR + oR + +uP oR +eL oR -oR -oR -oR -oR -oR -oR -oR -oR + oR eL oR @@ -11270,6 +12574,7 @@ oR oR oR oR +PH oR oR oR @@ -11278,11 +12583,16 @@ oR oR oR oR +oR +oR + oR oR oR oR FR + + oR oR oR @@ -11310,25 +12620,15 @@ oR oR oR oR -eL oR oR oR oR oR -eL -eL oR oR -eL oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -11339,36 +12639,37 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL oR -eL -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -11393,7 +12694,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -11436,7 +12736,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -11458,7 +12757,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -11471,7 +12769,9 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax UA jE GK @@ -11486,106 +12786,136 @@ oR oR oR oR -oR + eL oR + + + +oR + + +oR +oR +oR +oR +oR + + + +oR + eL -eL + +uP +uP +uP +uP +uP oR +uP +uP +uP oR oR oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -eL + eL eL oR eL -eL -eL -eL -eL + +uP +oR +uP +uP + +oR +oR +oR +oR + +oR + +oR +oR +oR +oR + + +oR +oR +oR +oR +uP +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM tM @@ -11596,30 +12926,18 @@ MS MS tM tM -eL -eL -eL -eL -eL oR oR oR -eL +oR +oR +oR +oR +oR +oR oR Ax Ax -ct -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -11639,8 +12957,20 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -11686,7 +13016,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -11710,26 +13039,27 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -ct Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -11749,79 +13079,22 @@ oR oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL + eL + + + +uP +uP +uP +uP +uP +uP +uP +uP + oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR + oR oR oR @@ -11830,20 +13103,89 @@ eL oR oR oR + +eL + +uP +uP + +oR +oR +oR +uP +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -11853,33 +13195,35 @@ MS MS tM tM -eL -eL -eL -eL -eL oR oR -eL -eL oR -ct -Ax -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -11897,7 +13241,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -11908,7 +13251,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -11928,7 +13270,6 @@ Ax Aq Ax Ax -ct Ax Ax Ax @@ -11952,16 +13293,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -11976,17 +13307,28 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -12001,106 +13343,125 @@ oR oR oR oR -oR -oR -oR -oR -oR -eL -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -eL eL eL +oR + oR oR eL + eL + + +uP + +oR +oR +uP +uP +oR +uP +uP + +oR +uP +oR +oR +oR +oR +oR +oR +oR +oR +uP +uP +uP +oR +oR +uP +oR +oR +uP +oR +oR +oR + eL -eL -eL + + +oR +oR + + + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM tM @@ -12110,48 +13471,49 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -ct -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -12175,7 +13537,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12211,7 +13572,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12229,7 +13589,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12237,13 +13596,15 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -12259,105 +13620,125 @@ oR oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR eL oR + +eL +eL + + + +uP + oR oR +uP +oR +uP +uP + +oR + eL -eL -eL -eL -eL -eL + +oR +oR +uP +oR + +oR + +oR +oR +oR + + +oR +oR +oR +uP +uP +oR +uP +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM tM @@ -12367,14 +13748,14 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR oR oR Ax @@ -12382,16 +13763,13 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -12399,7 +13777,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12418,7 +13795,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12439,7 +13815,27 @@ Ax Ax Ax Ax -er +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -12448,7 +13844,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12459,7 +13854,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12470,10 +13864,8 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -12482,25 +13874,14 @@ Ax Ax Ax Ax -ct -ct Ax Ax -ct Ax Ax Ax Ax -ct Ax -ct -ct Ax -ct -ct -ct -ct -ct VU GK bE @@ -12523,6 +13904,17 @@ oR oR oR oR +uP +oR +oR +oR +oR +oR +uP +oR +oR +oR +uP oR oR oR @@ -12540,6 +13932,36 @@ oR oR oR oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +eL +eL +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR + oR oR oR @@ -12570,6 +13992,8 @@ oR FR oR oR + + oR oR oR @@ -12598,24 +14022,14 @@ oR oR oR oR -eL oR oR oR oR -eL -eL oR oR -eL -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -12625,46 +14039,48 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL oR -eL -eL -Ax -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -12684,7 +14100,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12694,36 +14109,8 @@ Ax Ax Ax Ax -ct Ax Aq -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -12743,7 +14130,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12753,11 +14139,39 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -12775,87 +14189,103 @@ oR oR oR oR +uP +uP oR oR oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR + eL + +uP +uP +oR + +oR +oR +oR +oR + +oR + + +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +uP +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -12863,16 +14293,8 @@ oR oR oR oR -eL -eL oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -12883,32 +14305,33 @@ tM tM tM tM -eL -eL -eL -eL -eL -eL -eL oR -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -12935,7 +14358,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -12957,7 +14379,6 @@ Aq Ax Ax Ax -ct Ax Ax Ax @@ -12992,7 +14413,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -13003,17 +14423,19 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -13033,11 +14455,15 @@ oR oR oR oR +uP oR +uP +uP oR oR oR oR +uP oR oR oR @@ -13077,11 +14503,14 @@ oR oR oR oR +PH +oR +oR +oR oR oR oR oR -FR oR oR oR @@ -13117,19 +14546,12 @@ oR oR oR oR -eL oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -13140,30 +14562,15 @@ MS tM tM tM -eL -eL -eL -eL -eL oR -eL +oR +oR +oR +oR +oR +oR oR Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -13206,7 +14613,22 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -13218,7 +14640,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -13234,26 +14655,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -13268,9 +14669,30 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -13314,6 +14736,8 @@ oR oR oR oR +uP +uP oR oR oR @@ -13336,9 +14760,14 @@ oR oR oR oR +PH +oR +oR +oR +oR +oR oR oR -FR oR oR oR @@ -13375,18 +14804,11 @@ oR oR oR oR -eL oR oR oR oR -eL oR -eL -eL -eL -eL -eL tM tM tM @@ -13398,12 +14820,12 @@ tM tM tM tM -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR oR Ax Ax @@ -13413,14 +14835,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct -ct -ct Ax Ax Ax @@ -13438,7 +14852,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -13451,7 +14864,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -13462,9 +14874,19 @@ Ax Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Aq @@ -13481,10 +14903,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -13498,16 +14916,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -13520,14 +14928,28 @@ Ax Ax Ax Ax -ct -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -13552,6 +14974,7 @@ oR oR oR oR +uP oR oR oR @@ -13594,8 +15017,16 @@ oR oR oR oR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR -FR oR oR oR @@ -13634,17 +15065,8 @@ oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -13655,24 +15077,34 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL oR -ct -ct -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -13695,14 +15127,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -13710,8 +15134,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -13736,26 +15158,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -13776,15 +15178,35 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -13852,7 +15274,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -13877,7 +15311,6 @@ oR oR oR oR -eL oR oR oR @@ -13887,21 +15320,10 @@ oR oR oR oR -eL -oR -eL oR oR -eL oR oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -13912,15 +15334,14 @@ MS tM tM tM -eL -eL -eL -eL -eL oR -eL +oR +oR +oR +oR +oR +oR Ax -ct Ax Ax Ax @@ -13937,10 +15358,8 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax @@ -13980,8 +15399,19 @@ Ax Ax Ax Ax -ct -er +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -13992,13 +15422,11 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -14024,7 +15452,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -14034,14 +15461,9 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax -ct -ct -ct VU GK GK @@ -14109,7 +15531,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -14145,20 +15577,10 @@ oR oR oR oR -eL -oR -oR -eL oR oR oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -14169,12 +15591,12 @@ MS tM tM tM -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR oR Ax Ax @@ -14183,16 +15605,12 @@ Ax Ax Ax Ax -ct -ct Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -14238,7 +15656,17 @@ Ax Ax Ax Ax -er +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -14253,7 +15681,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -14291,14 +15718,9 @@ Ax Ax Ax Ax -ct -ct Ax -ct Ax Ax -ct -ct VU GK GK @@ -14366,7 +15788,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -14402,21 +15835,10 @@ oR oR oR oR -eL oR -eL oR -eL oR -eL oR -eL -eL -eL -eL -eL -eL -eL tM MS MS @@ -14426,38 +15848,38 @@ MS MS MS tM -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR oR Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -14506,17 +15928,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -14542,20 +15953,31 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -14623,7 +16045,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -14660,20 +16093,9 @@ oR oR oR oR -eL -oR -eL -eL oR oR -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -14683,38 +16105,15 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR oR Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -14734,8 +16133,31 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -14756,25 +16178,6 @@ Aq Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -14802,16 +16205,35 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -14880,7 +16302,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -14906,7 +16337,6 @@ oR oR oR oR -eL oR oR oR @@ -14918,19 +16348,11 @@ oR oR oR oR -eL oR oR oR oR -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -14940,45 +16362,47 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -eL -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -14992,11 +16416,9 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax Ax @@ -15010,21 +16432,6 @@ Ax Ax Ax Aq -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -15038,7 +16445,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -15049,16 +16455,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -15066,9 +16462,35 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -15137,7 +16559,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -15174,20 +16606,10 @@ oR oR oR oR -eL -oR -eL oR oR oR -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -15198,34 +16620,36 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -15251,8 +16675,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -15278,7 +16700,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -15302,7 +16723,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -15319,13 +16739,15 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -15394,7 +16816,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -15431,20 +16865,8 @@ oR oR oR oR -eL -oR -eL -oR -eL -oR -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -15455,15 +16877,14 @@ MS MS tM tM -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR oR Ax Ax -ct Ax Ax Ax @@ -15510,11 +16931,12 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax Ax Ax Ax @@ -15542,7 +16964,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -15555,7 +16976,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -15566,23 +16986,25 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax Ax Ax -ct -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -15651,7 +17073,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -15689,19 +17119,11 @@ oR oR oR oR -eL -oR -eL oR oR oR oR -eL oR -eL -eL -eL -eL tM tM tM @@ -15712,17 +17134,19 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -Ax -ct -ct -Ax -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -15760,13 +17184,11 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -15808,19 +17230,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -15829,17 +17238,30 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -15908,7 +17330,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -15946,20 +17378,10 @@ oR oR oR oR -eL oR oR -eL -eL oR -eL -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -15969,20 +17391,15 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR Ax -ct Ax -ct -ct Ax -ct -ct Ax Ax Ax @@ -15993,9 +17410,7 @@ Ax Ax Ax Ax -ct Ax -ct Ax Ax Ax @@ -16007,7 +17422,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -16015,7 +17429,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -16025,19 +17438,39 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -er +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -16057,15 +17490,11 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct Ax -ct Ax Ax Ax @@ -16079,24 +17508,17 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct Ax Ax -ct -ct -ct VU GK GK @@ -16165,7 +17587,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -16192,7 +17625,6 @@ oR oR oR oR -eL oR oR oR @@ -16203,20 +17635,10 @@ oR oR oR oR -eL -eL oR oR -eL -eL oR -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -16226,27 +17648,21 @@ MS MS MS tM -eL -eL -eL -eL -eL oR -ct +oR +oR +oR +oR +oR Ax -ct Ax Ax Ax -ct Ax -ct -ct Ax Ax Ax Ax -ct Ax Ax Ax @@ -16266,8 +17682,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -16278,10 +17692,6 @@ Ax Ax Ax Ax -ct -ct -ct -ct Ax Ax Ax @@ -16294,11 +17704,9 @@ Ax Ax Ax Ax -er Ax Ax Ax -ct Ax Ax Ax @@ -16306,7 +17714,28 @@ Ax Ax Ax Ax -ct +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -16319,10 +17748,7 @@ Ax Ax Ax Ax -ct -ct Ax -ct Ax Ax Ax @@ -16331,9 +17757,7 @@ Ax Ax Ax Ax -ct Ax -ct Ax Ax Ax @@ -16348,12 +17772,10 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct VU GK GK @@ -16422,7 +17844,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -16450,7 +17883,6 @@ oR oR oR oR -eL oR oR oR @@ -16462,18 +17894,8 @@ oR oR oR oR -eL -eL -oR -eL -oR -eL oR oR -eL -eL -eL -eL tM tM MS @@ -16483,36 +17905,40 @@ MS MS tM tM -eL -eL -eL -eL -eL oR -ct -ct -ct -ct -Ax -Ax -ct -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -ct -Ax -ct -ct +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -16529,12 +17955,8 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax -ct Ax Ax Ax @@ -16564,7 +17986,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -16575,12 +17996,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -16590,9 +18005,6 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax @@ -16602,15 +18014,25 @@ Ax Ax Ax Ax -ct -ct -Ax -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -16679,7 +18101,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -16722,15 +18151,8 @@ oR oR oR oR -eL -eL -oR -eL oR oR -eL -eL -eL tM tM MS @@ -16740,31 +18162,36 @@ MS MS tM tM -eL -eL -eL -eL -eL -eL -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -ct -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -16779,7 +18206,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -16794,9 +18220,6 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax @@ -16807,7 +18230,6 @@ Ax Ax Ax Ax -ct Aq Ax Ax @@ -16865,9 +18287,9 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax UA jE GK @@ -16877,113 +18299,113 @@ bE (65,1,1) = {" jq Dn -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR PH -FR -FR -FR PH -FR -FR +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH PH PH PH @@ -17003,25 +18425,15 @@ PH PH PH PH -er -er -er -er -er Aq -er Aq Aq -er Aq Aq Aq Aq -er Aq Aq -er -er Aq Aq Aq @@ -17035,7 +18447,6 @@ Aq Aq Aq Aq -er Aq Aq Aq @@ -17045,17 +18456,14 @@ Aq Aq Aq Aq -er Aq Aq Aq Aq Aq -er Aq Aq Aq -er Aq Aq Aq @@ -17094,7 +18502,6 @@ Aq Aq Aq Aq -er Aq Aq Aq @@ -17118,14 +18525,29 @@ Aq Aq Aq Aq -er Aq Aq Aq Aq -er -er -er +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq vX SZ SZ @@ -17193,7 +18615,12 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR oR oR oR @@ -17237,14 +18664,9 @@ oR oR oR oR -eL -eL oR oR oR -eL -eL -eL tM tM MS @@ -17254,25 +18676,40 @@ MS MS MS tM -eL -eL -eL -eL -eL -eL -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -17294,20 +18731,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -17315,7 +18738,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -17349,8 +18771,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -17372,17 +18792,19 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -17450,7 +18872,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -17493,15 +18922,8 @@ oR oR oR oR -eL -eL oR -eL -eL oR -eL -eL -eL tM tM MS @@ -17511,30 +18933,40 @@ MS MS MS tM -eL -eL -eL -eL -eL -eL -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -17548,14 +18980,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -17563,14 +18987,12 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -17592,15 +19014,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct -ct Ax Ax Ax @@ -17611,19 +19024,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -17631,15 +19031,37 @@ Ax Ax Ax Ax -ct Ax -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -17707,7 +19129,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -17746,19 +19177,10 @@ oR oR oR oR -eL -eL oR -eL oR -eL oR -eL -eL oR -eL -eL -eL tM tM MS @@ -17768,24 +19190,26 @@ MS MS MS tM -eL -eL -eL -eL -eL -eL -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -17825,7 +19249,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -17833,23 +19256,11 @@ Ax Ax Ax Ax -ct Ax Ax Aq Ax Ax -ct -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -17871,19 +19282,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -ct Ax Ax Ax @@ -17891,12 +19289,36 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -17964,7 +19386,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -17984,7 +19416,6 @@ oR oR oR oR -eL oR oR oR @@ -18002,20 +19433,11 @@ oR oR oR oR -eL oR oR oR oR -eL -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -18025,48 +19447,49 @@ MS MS MS tM -eL -eL -eL -eL -eL -eL -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -18079,7 +19502,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -18112,7 +19534,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -18134,10 +19555,6 @@ Ax Ax Ax Ax -ct -ct -ct -ct Ax Ax Ax @@ -18145,15 +19562,20 @@ Ax Ax Ax Ax -ct -ct -ct Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -18221,7 +19643,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -18264,15 +19693,8 @@ oR oR oR oR -eL -eL -eL oR oR -eL -eL -eL -eL tM tM tM @@ -18283,37 +19705,38 @@ MS MS tM tM -eL -eL -eL -eL -eL -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -18321,7 +19744,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -18390,10 +19812,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -18401,16 +19819,20 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -18478,7 +19900,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -18517,19 +19946,12 @@ oR oR oR oR -eL oR oR oR -eL -eL -eL oR oR oR -eL -eL -eL tM tM tM @@ -18540,49 +19962,50 @@ MS MS tM tM -eL -eL -eL -eL -eL -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -18596,7 +20019,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -18627,9 +20049,6 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax @@ -18658,17 +20077,20 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -18735,7 +20157,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -18766,7 +20197,6 @@ oR oR oR oR -eL oR oR oR @@ -18778,16 +20208,8 @@ oR oR oR oR -eL -eL oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -18797,51 +20219,52 @@ MS MS tM tM -eL -eL -eL -eL -eL -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -18860,33 +20283,12 @@ Ax Ax Ax Ax -ct Ax Ax Ax Aq Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -18916,16 +20318,36 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -18992,7 +20414,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -19033,18 +20463,10 @@ oR oR oR oR -eL oR oR -eL oR -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -19054,34 +20476,37 @@ MS MS tM tM -eL -eL -eL -eL -eL -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -19112,12 +20537,9 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct Ax Ax Ax @@ -19149,7 +20571,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -19175,14 +20596,15 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -19249,7 +20671,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -19293,15 +20722,8 @@ oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -19311,33 +20733,35 @@ MS MS tM tM -eL -eL -eL -eL -eL -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -19363,8 +20787,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -19408,18 +20830,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -19435,11 +20845,23 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -19506,7 +20928,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -19531,7 +20962,6 @@ oR oR oR oR -eL oR oR oR @@ -19549,16 +20979,8 @@ oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -19568,37 +20990,38 @@ MS MS tM tM -eL -eL -eL -eL -eL -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -ct +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -19609,7 +21032,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -19645,7 +21067,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -19662,21 +21083,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -19687,16 +21093,32 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -19763,7 +21185,13 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR oR oR oR @@ -19804,18 +21232,12 @@ oR oR oR oR -eL oR oR oR oR oR -eL oR -eL -eL -eL -eL tM tM MS @@ -19826,49 +21248,50 @@ MS tM tM tM -eL -eL -eL -eL -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -19888,7 +21311,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -19898,7 +21320,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -19913,7 +21334,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -19927,7 +21347,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -19937,7 +21356,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -19946,13 +21364,17 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -20020,7 +21442,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -20060,19 +21493,8 @@ oR oR oR oR -eL -oR -eL -eL -oR -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -20083,39 +21505,40 @@ MS tM tM tM -eL -eL -eL -eL -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -20142,7 +21565,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -20158,20 +21580,6 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -20184,7 +21592,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -20192,24 +21599,39 @@ Ax Ax Ax Ax -ct -Ax -ct -ct Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -20277,7 +21699,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -20319,17 +21748,10 @@ oR oR oR oR -eL oR oR oR -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -20340,39 +21762,41 @@ MS tM tM tM -eL -eL -eL -eL -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -20393,13 +21817,11 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -20422,7 +21844,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -20444,7 +21865,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -20453,20 +21873,22 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -20534,7 +21956,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -20576,17 +22006,9 @@ oR oR oR oR -eL oR -eL oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -20598,35 +22020,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -20645,7 +22038,36 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -20672,24 +22094,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -20716,14 +22120,32 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -20791,7 +22213,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -20832,19 +22263,10 @@ oR oR oR oR -eL oR oR -eL -eL oR oR -eL -eL -eL -eL -eL -eL tM MS MS @@ -20855,19 +22277,7 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax Ax Ax @@ -20878,7 +22288,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -20920,8 +22329,6 @@ Ax Ax Ax Ax -er -ct Ax Ax Ax @@ -20930,7 +22337,32 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -20938,11 +22370,9 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax Ax @@ -20970,17 +22400,9 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct VU GK GK @@ -21048,7 +22470,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -21091,17 +22522,8 @@ oR oR oR oR -eL -eL -oR -eL oR oR -eL -eL -eL -eL -eL tM MS MS @@ -21112,28 +22534,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -21165,7 +22565,29 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -21202,17 +22624,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -21230,14 +22641,25 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -21305,7 +22727,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -21346,19 +22778,9 @@ oR oR oR oR -eL oR oR -eL -eL -eL oR -eL -eL -eL -eL -eL -eL tM MS MS @@ -21369,26 +22791,6 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -21426,7 +22828,27 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -21478,24 +22900,24 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -21562,7 +22984,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -21593,8 +23025,6 @@ oR oR oR oR -eL -eL oR oR oR @@ -21605,17 +23035,9 @@ oR oR oR oR -eL oR -eL oR -eL oR -eL -eL -eL -eL -eL tM MS MS @@ -21626,32 +23048,6 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -21687,7 +23083,33 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -21706,28 +23128,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -21748,11 +23148,33 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -21819,7 +23241,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -21859,20 +23290,11 @@ oR oR oR oR -eL -eL oR oR oR -eL -eL -eL oR oR -eL -eL -eL -eL tM MS MS @@ -21884,45 +23306,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -21936,7 +23319,46 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -21949,28 +23371,6 @@ Ax Ax Ax Aq -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -21993,7 +23393,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -22004,12 +23403,35 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -22076,7 +23498,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -22119,17 +23550,8 @@ oR oR oR oR -eL -eL -eL -oR -eL oR oR -eL -eL -eL -eL tM MS MS @@ -22141,21 +23563,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -22186,11 +23593,26 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -22206,15 +23628,6 @@ Ax Ax Ax Aq -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -22257,16 +23670,25 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -22333,7 +23755,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -22365,28 +23799,16 @@ oR oR oR oR -eL oR oR oR oR oR oR -eL -eL -oR -eL oR oR -eL -eL oR oR -eL -eL -eL -eL -eL tM MS MS @@ -22398,17 +23820,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct Ax Ax Ax @@ -22455,7 +23866,18 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -22464,12 +23886,6 @@ Ax Ax Aq Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -22491,7 +23907,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -22506,7 +23921,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -22519,11 +23933,19 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -22590,7 +24012,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -22631,19 +24063,9 @@ oR oR oR oR -eL -oR -eL oR oR oR -eL -eL -eL -eL -eL -eL -eL tM MS MS @@ -22655,23 +24077,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -Ax -ct -ct Ax Ax Ax @@ -22710,8 +24115,25 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -22734,21 +24156,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -22764,7 +24171,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -22777,10 +24183,26 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -22847,7 +24269,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -22888,19 +24318,11 @@ oR oR oR oR -eL -oR -eL -eL oR oR oR oR oR -eL -eL -eL -eL tM MS MS @@ -22912,22 +24334,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -22949,7 +24355,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -22969,11 +24374,28 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Aq @@ -22986,9 +24408,6 @@ Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax @@ -23006,37 +24425,40 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -23104,7 +24526,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -23137,7 +24567,6 @@ oR oR oR oR -eL oR oR oR @@ -23148,16 +24577,9 @@ oR oR oR oR -eL oR oR oR -eL -eL -eL -eL -eL -eL tM MS MS @@ -23169,31 +24591,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -23223,7 +24620,32 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -23239,10 +24661,6 @@ Ax Ax Ax Ax -ct -ct -Ax -ct Ax Ax Ax @@ -23276,24 +24694,28 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -23361,7 +24783,11 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR oR oR oR @@ -23411,10 +24837,6 @@ oR oR oR oR -eL -eL -eL -eL tM tM MS @@ -23426,21 +24848,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -23469,7 +24876,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -23483,7 +24889,23 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -23495,16 +24917,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -23528,7 +24940,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -23538,19 +24949,30 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -23618,7 +25040,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -23659,19 +25091,9 @@ oR oR oR oR -eL -oR -oR -eL -eL oR oR oR -eL -eL -eL -eL -eL tM tM MS @@ -23682,20 +25104,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -23716,20 +25124,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -23738,12 +25132,40 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -23753,11 +25175,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -23799,15 +25216,20 @@ Ax Ax Ax Ax -ct Ax -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -23875,7 +25297,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -23921,14 +25350,7 @@ oR oR oR oR -eL -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -23939,49 +25361,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -23997,7 +25376,50 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -24033,17 +25455,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -24057,14 +25468,25 @@ Ax Ax Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -24132,7 +25554,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -24173,19 +25603,11 @@ oR oR oR oR -eL -oR -oR -eL oR oR oR oR oR -eL -eL -eL -eL tM tM MS @@ -24197,20 +25619,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct Ax Ax Ax @@ -24239,7 +25647,21 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -24282,7 +25704,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -24296,14 +25717,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -24311,16 +25724,25 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -24389,7 +25811,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -24430,19 +25861,10 @@ oR oR oR oR -eL -eL -eL oR oR oR -eL -eL oR -eL -eL -eL -eL tM tM tM @@ -24454,24 +25876,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -24502,20 +25906,38 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Aq @@ -24536,7 +25958,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -24559,8 +25980,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -24572,12 +25991,15 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -24646,7 +26068,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -24686,21 +26119,10 @@ oR oR oR oR -eL -eL oR oR -eL -eL -eL oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -24711,17 +26133,7 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax Ax Ax @@ -24738,7 +26150,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -24775,7 +26186,26 @@ Ax Ax Ax Ax -er +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -24820,21 +26250,13 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct -ct Ax -ct Ax -ct -ct -ct -ct VU GK GK @@ -24903,7 +26325,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -24939,7 +26371,6 @@ oR oR oR oR -eL oR oR oR @@ -24947,17 +26378,8 @@ oR oR oR oR -eL -eL -eL oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -24968,24 +26390,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -25013,7 +26417,25 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -25056,16 +26478,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -25075,10 +26487,6 @@ Ax Ax Ax Ax -ct -Ax -ct -ct Ax Ax Ax @@ -25088,10 +26496,24 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -25160,7 +26582,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -25202,19 +26635,8 @@ oR oR oR oR -eL -oR -eL -eL -oR -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -25225,40 +26647,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -25281,10 +26669,44 @@ Ax Ax Ax Ax -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -25313,7 +26735,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -25337,18 +26758,19 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -25417,7 +26839,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -25457,21 +26888,12 @@ oR oR oR oR -eL oR oR oR -eL oR -eL oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -25483,14 +26905,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -25505,7 +26919,15 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -25580,15 +27002,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -25598,14 +27011,23 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -25674,7 +27096,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -25718,17 +27148,9 @@ oR oR oR oR -eL oR -eL oR -eL oR -eL -eL -eL -eL -eL tM tM tM @@ -25740,15 +27162,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -25782,7 +27195,16 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -25809,17 +27231,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -25841,29 +27252,40 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -ct Ax Ax Ax Ax Ax Ax -ct Ax -ct Ax -ct Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -25931,7 +27353,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -25960,7 +27392,6 @@ oR oR oR oR -eL oR oR oR @@ -25974,18 +27405,9 @@ oR oR oR oR -eL oR oR -eL oR -eL -eL -eL -eL -eL -eL -eL tM tM tM @@ -25997,15 +27419,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -26020,13 +27433,22 @@ Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -26064,18 +27486,6 @@ Aq Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -26110,17 +27520,29 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -26188,7 +27610,20 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -26229,21 +27664,8 @@ oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -26254,19 +27676,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -26286,7 +27695,20 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -26321,9 +27743,6 @@ Aq Ax Ax Ax -ct -Ax -ct Ax Ax Ax @@ -26357,12 +27776,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -26371,13 +27784,22 @@ Ax Ax Ax Ax -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -26445,7 +27867,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -26487,20 +27921,8 @@ oR oR oR oR -eL -eL -eL -eL -oR -eL oR oR -eL -eL -eL -eL -eL -eL tM tM tM @@ -26511,16 +27933,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -26538,28 +27950,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -26570,7 +27960,39 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -26579,7 +28001,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -26619,22 +28040,23 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -26702,7 +28124,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -26743,21 +28175,11 @@ oR oR oR oR -eL oR oR -eL oR -eL -eL oR -eL oR -eL -eL -eL -eL -eL tM tM tM @@ -26768,16 +28190,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -26818,7 +28230,17 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -26841,10 +28263,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -26885,13 +28303,17 @@ Ax Ax Ax Ax -ct -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -26959,7 +28381,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -27004,18 +28435,9 @@ oR oR oR oR -eL -eL -eL oR oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -27025,36 +28447,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -27070,11 +28462,41 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -27091,14 +28513,6 @@ Ax Aq Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -27144,11 +28558,19 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -27216,7 +28638,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -27258,21 +28692,9 @@ oR oR oR oR -eL -oR -eL oR oR oR -eL -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -27282,17 +28704,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -27306,7 +28717,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -27322,17 +28732,13 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct Ax Ax Ax -ct Ax Ax Ax @@ -27345,7 +28751,28 @@ Ax Ax Ax Ax -er +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -27401,11 +28828,6 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct VU GK GK @@ -27473,7 +28895,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -27509,27 +28943,15 @@ oR oR oR oR -eL oR oR oR oR oR oR -eL -eL -eL oR oR oR -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -27540,15 +28962,7 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax Ax Ax @@ -27562,9 +28976,7 @@ Ax Ax Ax Ax -ct Ax -ct Ax Ax Ax @@ -27577,13 +28989,11 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -27592,24 +29002,17 @@ Ax Ax Ax Ax -ct Ax -ct -ct Ax Ax Ax Ax Ax Ax -er Ax -ct -ct Ax Ax Ax -ct Ax Ax Ax @@ -27620,7 +29023,34 @@ Ax Ax Ax Ax -ct +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -27652,17 +29082,9 @@ Ax Ax Ax Ax -ct Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct VU GK GK @@ -27730,7 +29152,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -27772,21 +29205,10 @@ oR oR oR oR -eL -oR -eL -oR -eL oR oR -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -27797,21 +29219,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -27827,37 +29234,52 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq Ax @@ -27866,14 +29288,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -27896,12 +29310,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -27914,11 +29322,25 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -27987,7 +29409,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -28022,28 +29456,16 @@ oR oR oR oR -eL oR oR oR oR -eL oR oR -eL oR oR -eL -eL oR oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -28054,26 +29476,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -28091,7 +29493,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -28104,15 +29505,36 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -28124,7 +29546,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -28137,12 +29558,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -28151,31 +29566,38 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -28244,7 +29666,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -28270,8 +29703,6 @@ oR oR oR oR -eL -eL oR oR oR @@ -28289,18 +29720,9 @@ oR oR oR oR -eL -eL oR oR oR -eL -eL -eL -eL -eL -eL -eL tM tM tM @@ -28311,15 +29733,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -28330,30 +29743,6 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -28363,44 +29752,55 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -28415,24 +29815,46 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -28501,7 +29923,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -28545,19 +29977,9 @@ oR oR oR oR -eL -eL oR oR -eL -eL -eL oR -eL -eL -eL -eL -eL tM tM tM @@ -28568,16 +29990,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct Ax Ax Ax @@ -28593,7 +30005,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -28607,71 +30018,41 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax Ax -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -ct -ct -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -28684,12 +30065,53 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -28758,7 +30180,21 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -28799,22 +30235,8 @@ oR oR oR oR -eL -oR -eL -eL -eL -eL -eL oR oR -eL -eL -eL -eL -eL -eL -eL tM tM tM @@ -28825,49 +30247,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -ct -ct -Ax -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -ct -ct Ax Ax Ax @@ -28875,16 +30254,59 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax -ct Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Aq @@ -28894,59 +30316,59 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax Ax -ct -Ax -ct -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -ct -ct -ct -Ax -ct Ax Ax Ax Ax -ct -Ax -ct -Ax -Ax -ct -ct -Ax -Ax -ct -Ax -ct Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -29015,7 +30437,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -29055,24 +30489,12 @@ oR oR oR oR -eL oR oR oR -eL -eL -eL -oR -eL oR oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -29082,49 +30504,27 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct Ax Ax -ct Ax Ax Ax -ct Ax Ax Ax @@ -29133,18 +30533,13 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax -ct -ct Ax Ax -er Ax Ax Ax @@ -29163,19 +30558,58 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct Ax Ax Ax -ct +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax -ct Ax Ax Ax @@ -29186,24 +30620,12 @@ Ax Ax Ax Ax -ct -ct Ax -ct Ax Ax Ax -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct VU GK GK @@ -29272,7 +30694,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -29309,27 +30743,15 @@ oR oR oR oR -eL oR oR oR oR -eL oR oR -eL -oR -eL -eL oR oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -29340,52 +30762,6 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -29396,71 +30772,117 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -ct -er -ct Ax Ax Ax Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -29529,7 +30951,21 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -29568,25 +31004,11 @@ oR oR oR oR -eL -oR -oR -eL oR oR oR -eL -eL -eL -oR -eL -eL oR oR -eL -eL -eL -eL tM tM MS @@ -29598,44 +31020,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -29654,71 +31038,109 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -er -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -ct -Ax -ct -ct -ct Ax Ax -ct -ct Ax Ax -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -29786,7 +31208,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -29828,22 +31261,11 @@ oR oR oR oR -eL oR oR oR -eL -eL -eL -eL oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -29855,127 +31277,127 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -Ax -ct -Ax -Ax -ct -ct -Ax -Ax -Ax -ct -ct -ct -ct -Ax -ct -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -ct -Ax -ct -Ax -ct -ct -Ax -ct -Ax -er -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax -ct -ct -ct Ax -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -30043,7 +31465,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -30085,22 +31518,11 @@ oR oR oR oR -eL -oR -oR -eL -eL -eL oR oR oR -eL oR -eL oR -eL -eL -eL tM tM MS @@ -30113,126 +31535,126 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -Ax -Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct Ax Ax -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -er -ct -ct -ct -ct -ct -ct Ax Ax -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -30300,7 +31722,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -30341,23 +31775,11 @@ oR oR oR oR -eL oR oR oR -eL -eL oR oR -eL -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -30370,126 +31792,126 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -ct -Ax -ct -ct -Ax -ct -ct -Ax -ct -Ax -Ax -ct -ct -ct -ct -ct Ax Ax Ax -ct Ax Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct Ax Ax -ct -er -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax ta -jG -jG +Ax +Ax UA BR BR @@ -30557,7 +31979,21 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -30600,22 +32036,8 @@ oR oR oR oR -eL -eL -eL -eL -eL -eL oR -eL -eL -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -30627,115 +32049,115 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -ct Ax Ax -ct Ax Ax -ct -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN wN wN @@ -30745,10 +32167,10 @@ wN wN wN wN -pw -pw -pw -pw +Fg +Fg +Fg +ne Qx NP "} @@ -30814,7 +32236,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -30857,22 +32290,11 @@ oR oR oR oR -eL -eL -oR -eL oR oR oR oR -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -30884,113 +32306,113 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN wN -pw +Fg wN wN -pw -pw -pw -pw -pw -pw -pw -pw -pw +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN wN wN @@ -31071,7 +32493,20 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -31113,23 +32548,10 @@ oR oR oR oR -eL -oR -eL -eL -eL -eL -eL oR oR oR -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -31141,122 +32563,122 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg XN -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN wN wN -pw -pw -pw -pw -pw -pw -pw +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN wN -ne +Fg wN wN wN wN wN -ne -ne -ne -ne -ne -ne -ne +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN wN wN @@ -31328,7 +32750,21 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -31370,23 +32806,9 @@ oR oR oR oR -eL -eL -eL -eL -oR -eL -eL oR oR -eL -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -31399,127 +32821,127 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -ne -ne -ne -ne -pw -pw -pw -pw -pw -pw -pw +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN wN -Yy -pw -pw -pw -pw -pw -pw -pw -pw -pw +XN +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN -ne -ne -ne +Fg +Fg +Fg wN -pw +Fg wN -pw +Fg wN -pw +Fg wN wN -pw +Fg wN wN -pw -pw -pw +Fg +Fg +Fg wN wN wN -pw -pw +Fg +Fg wN -pw -pw -pw -pw -pw -pw +Fg +Fg +Fg +Fg +Fg +Fg wN wN -pw -pw -pw -pw -pw +Fg +Fg +Fg +Fg +Fg wN +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -pw -pw Zo NP "} @@ -31585,7 +33007,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -31628,23 +33061,12 @@ oR oR oR oR -eL -eL -eL -eL -eL oR oR oR oR oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -31656,127 +33078,127 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -ne -ne -ne -pw -pw -pw +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN -pw -pw -pw -pw -pw -pw -ne -ne -ne -ne -ne -ne -ne -ne +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg XN -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -pw +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN -pw -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN wN -pw +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -pw -pw Zo NP "} @@ -31842,7 +33264,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -31888,20 +33320,10 @@ oR oR oR oR -eL -oR -eL oR oR -eL oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -31913,125 +33335,125 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -ne -ne -ne -ne -ne -pw -pw -pw -pw -pw -pw -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne -ne +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg XN -ne -ne -ne -ne -ne -ne -ne -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Mf Eo Eo @@ -32099,7 +33521,12 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR oR oR oR @@ -32145,7 +33572,6 @@ oR oR oR oR -eL oR oR oR @@ -32155,10 +33581,6 @@ oR oR oR oR -eL -eL -eL -eL tM tM MS @@ -32171,124 +33593,124 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -ne -ne -ne +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg +Fg +Fg +Fg +Fg wN wN -pw -pw -pw -pw -pw -ne -ne -ne -ne -ne -ne -ne -ne -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct VU GK GK @@ -32356,7 +33778,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -32401,21 +33835,9 @@ oR oR oR oR -eL -eL -eL -oR -eL oR oR oR -eL -eL -eL -eL -eL -eL -eL tM tM tM @@ -32428,124 +33850,124 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -ne -ne -ne -ne +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg +Fg +Fg +Fg +Fg +Fg wN -pw -pw -pw -ne -ne -ne -ne -ne -ne -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct Ax Ax -ct -ct Ax Ax -ct Ax -ct Ax -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct VU GK GK @@ -32613,7 +34035,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -32657,23 +34091,11 @@ oR oR oR oR -eL -oR -eL -eL -eL oR oR oR -eL oR -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -32685,124 +34107,124 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -ne -ne -ne -pw -pw -pw -pw -pw -ne -ne -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -Ax -Ax -er -ct -ct -ct -Ax -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -32870,7 +34292,20 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -32913,24 +34348,11 @@ oR oR oR oR -eL -eL oR -eL oR -eL -eL oR -eL -eL oR -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -32942,123 +34364,123 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ne -ne -ne -pw -pw -pw -pw -ne -ne -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -er -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -Ax -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct Ax -ct -ct Ax -ct -ct Ax -ct -ct -ct -ct -ct Ax -ct -ct -ct +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -33127,7 +34549,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -33170,24 +34603,13 @@ oR oR oR oR -eL oR oR oR -eL oR oR -eL oR -eL -eL -eL oR -eL -eL -eL -eL -eL id ZB ZB @@ -33200,122 +34622,122 @@ zS ZB ZB id -ne -ne -ne +Fg +Fg +Fg wN -ne -ne -ne +Fg +Fg +Fg wN wN -pw -pw -pw -ne -ne -ne -ne -ne -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -ct -er -ct -Ax -Ax -Ax -ct -ct -Ax -ct -Ax -ct -Ax -ct +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -ct -ct -Ax -ct -ct -Ax -Ax -ct -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct Ax Ax -ct -ct VU GK GK @@ -33384,7 +34806,12 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR oR oR oR @@ -33427,22 +34854,17 @@ oR oR oR oR -eL -eL oR -eL oR -eL -eL Hb -eL oR -eL -eL oR -eL -eL -eL +oR +oR +oR +oR +oR +oR wN wN KZ @@ -33459,104 +34881,65 @@ KZ KZ wN wN -pw -pw -pw -pw -pw -ne -ne -ne -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax Ax -ct Aq Ax Ax Ax Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -ct -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -33565,14 +34948,53 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -33641,7 +35063,13 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR oR oR oR @@ -33677,30 +35105,24 @@ oR oR oR oR -eL oR oR oR oR -eL -eL -eL -eL -eL Hb -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL oR -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR wN bA KZ @@ -33715,55 +35137,55 @@ KZ KZ KZ wN -ne -ne -ne +Fg +Fg +Fg wN -ne -ne -ne -ne -ne -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Fg +Fg +Fg +Fg +Fg +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax -ct -ct Ax -ct -ct Ax -ct -ct -ct -ct -ct Ax -ct -ct -ct Ax -ct Ax Ax Ax @@ -33775,61 +35197,61 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax Ax Ax -ct -ct -Ax -ct Ax Ax Ax -ct -ct -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -33898,7 +35320,11 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR oR oR oR @@ -33935,30 +35361,26 @@ oR oR oR oR -eL -eL -eL -eL Hb -eL -eL -eL -eL oR oR oR oR -eL -eL oR -eL -eL -eL -eL oR -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR id TP TP @@ -33971,62 +35393,62 @@ oG TP TP id -ne -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Fg +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax Ax -ct Ax Ax -ct -ct Aq Ax Ax @@ -34035,57 +35457,57 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -Ax -Ax -ct -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -ct -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -Ax -Ax -ct -ct -Ax -ct -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -34155,7 +35577,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -34186,37 +35609,36 @@ oR oR oR oR -eL oR oR oR Hb -eL -eL -oR -eL -eL -eL -oR -eL oR oR oR oR -eL -eL -eL oR oR -eL -eL -eL -eL -eL -eL -eL -eL -eL +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR tM tM MS @@ -34228,98 +35650,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -Ax -Ax -ct -ct -Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -er -Ax -ct -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -ct -Ax -Ax -ct -Ax -Ax -ct -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -34331,18 +35661,110 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct Ax -ct -ct Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -34412,7 +35834,32 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -34437,22 +35884,6 @@ oR oR oR oR -eL -oR -oR -eL -eL -eL -eL -eL -eL -oR -eL -eL -eL -eL -oR -eL oR oR oR @@ -34461,19 +35892,10 @@ oR oR oR oR -eL oR oR oR -eL -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -34484,43 +35906,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -34528,15 +35913,52 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -34559,7 +35981,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -34582,7 +36003,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -34592,14 +36012,16 @@ Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -34669,7 +36091,28 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -34692,18 +36135,6 @@ oR oR oR oR -eL -oR -oR -oR -eL -eL -eL -oR -eL -oR -eL -eL oR oR oR @@ -34719,18 +36150,9 @@ oR oR oR oR -eL -eL oR oR -eL -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -34741,59 +36163,59 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct Ax Ax Ax Ax -ct Ax -ct Ax -ct -ct Ax -ct -ct -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -34810,16 +36232,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -34833,11 +36245,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -34848,15 +36255,30 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -34926,38 +36348,43 @@ oR oR oR oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -oR -oR -oR -eL -eL -oR -eL -eL -oR -oR -eL +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -34978,16 +36405,11 @@ oR oR oR oR -eL oR oR oR oR -eL oR -eL -eL -eL tM tM MS @@ -34998,57 +36420,57 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct Ax Ax -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -ct Ax Ax -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct Ax -ct -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -35068,7 +36490,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -35105,15 +36526,16 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -ct -ct Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -35183,31 +36605,35 @@ oR oR oR oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -oR -eL -oR -eL -oR -eL +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -35235,16 +36661,12 @@ oR oR oR oR -eL oR oR oR oR oR oR -eL -eL -eL tM tM MS @@ -35256,56 +36678,56 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct Ax Ax -ct Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -35353,7 +36775,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -35363,14 +36784,15 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -35440,29 +36862,34 @@ oR oR oR oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -eL -eL -eL -eL -eL -oR -eL -eL +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -35496,12 +36923,7 @@ oR oR oR oR -eL oR -eL -eL -eL -eL tM tM MS @@ -35513,49 +36935,21 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct Ax Ax Ax -ct Ax -ct Ax Ax -ct Ax Ax Ax -ct Ax -ct -ct Ax -ct -ct Ax -ct -ct Ax Ax Ax @@ -35568,9 +36962,6 @@ Ax Ax Ax Ax -ct -er -ct Ax Ax Ax @@ -35580,17 +36971,14 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -35599,19 +36987,57 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -35622,13 +37048,9 @@ Ax Ax Ax Ax -ct Ax -ct Ax Ax -ct -ct VU GK GK @@ -35697,28 +37119,35 @@ oR oR oR oR -FR -oR -oR -oR -oR -oR -oR -oR -oR -oR -oR -eL -oR -eL -oR -eL -oR -eL -eL -oR -oR -eL +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -35751,15 +37180,8 @@ oR oR oR oR -eL -eL -eL oR oR -eL -eL -eL -eL tM tM MS @@ -35771,48 +37193,23 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax -ct Ax -ct Ax Ax -ct Ax -ct Ax -ct Ax -ct Ax Ax Ax -ct -ct Ax -ct Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct -ct Ax Ax Ax @@ -35826,7 +37223,6 @@ Ax Ax Ax Ax -er Ax Ax Ax @@ -35837,7 +37233,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -35850,14 +37245,47 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax @@ -35869,7 +37297,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -35879,13 +37306,8 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct UA jE GK @@ -35954,26 +37376,33 @@ oR oR oR oR -FR -oR -oR -oR -oR -oR -eL -oR -oR -eL -oR -oR -eL -eL -eL -oR -oR -eL -oR -eL +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -36008,15 +37437,8 @@ oR oR oR oR -eL -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -36028,69 +37450,64 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -ct -ct -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -ct -ct -Ax -ct -Ax -ct -Ax -Ax -Ax -ct -ct -ct Ax Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq Ax Ax -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -36101,35 +37518,6 @@ Ax Ax Ax Ax -ct -Ax -ct -ct -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -36137,13 +37525,47 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -36211,21 +37633,26 @@ oR oR oR oR -FR -oR -eL -oR -oR -eL -oR -eL -eL -oR -eL -eL -eL -oR -eL +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -36267,13 +37694,8 @@ oR oR oR oR -eL -eL oR -eL oR -eL -eL tM tM MS @@ -36286,42 +37708,42 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax Ax Ax Ax -ct -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -36343,26 +37765,6 @@ Ax Aq Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -36385,22 +37787,42 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -Ax -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -36463,22 +37885,31 @@ oR oR oR oR -eL oR oR oR oR -FR -eL -eL -eL oR -oR -eL -oR -oR -oR -eL +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -36505,7 +37936,6 @@ oR oR oR oR -eL oR oR oR @@ -36520,18 +37950,10 @@ oR oR oR oR -eL oR -eL oR -eL oR -eL oR -eL -eL -eL -eL tM tM MS @@ -36543,18 +37965,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -36596,37 +38006,21 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -36645,19 +38039,47 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -36714,19 +38136,28 @@ oR oR oR oR -eL oR oR oR oR oR -eL -oR -eL oR oR -FR -eL +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -36762,9 +38193,6 @@ oR oR oR oR -eL -oR -eL oR oR oR @@ -36780,15 +38208,9 @@ oR oR oR oR -eL oR oR oR -eL -eL -eL -eL -eL tM tM tM @@ -36800,24 +38222,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -36841,16 +38245,34 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -36864,38 +38286,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -36908,14 +38298,46 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -36968,21 +38390,32 @@ oR oR oR oR -eL -oR -oR -oR -eL -eL -oR -eL oR oR oR oR oR oR -FR +oR +oR +oR +oR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -37034,19 +38467,8 @@ oR oR oR oR -eL -eL -eL -eL -eL oR oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -37057,28 +38479,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -37094,12 +38494,34 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -37121,7 +38543,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -37156,11 +38577,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -37168,11 +38584,17 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -37227,7 +38649,6 @@ oR oR oR oR -eL oR oR oR @@ -37239,7 +38660,17 @@ oR oR oR oR -FR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -37293,17 +38724,8 @@ oR oR oR oR -eL -eL oR -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -37314,42 +38736,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -37363,11 +38749,47 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax Ax @@ -37411,10 +38833,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -37422,14 +38840,18 @@ Ax Ax Ax Ax -ct -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -37472,13 +38894,10 @@ oR oR oR oR -eL oR oR oR oR -eL -eL oR oR oR @@ -37496,7 +38915,17 @@ oR oR oR oR -FR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -37550,17 +38979,10 @@ oR oR oR oR -eL oR oR -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -37572,23 +38994,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -37602,14 +39007,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -37618,15 +39015,39 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq -ct Ax Ax Ax @@ -37666,7 +39087,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -37677,15 +39097,17 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -37730,9 +39152,7 @@ oR oR oR oR -eL oR -eL oR oR oR @@ -37753,7 +39173,15 @@ oR oR oR oR -FR +oR +oR +PH +oR +oR +oR +oR +oR +oR oR oR oR @@ -37809,15 +39237,9 @@ oR oR oR oR -eL oR oR oR -eL -eL -eL -eL -eL tM tM tM @@ -37829,29 +39251,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -37875,10 +39274,33 @@ Ax Ax Ax Ax -ct Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -37923,26 +39345,26 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax -ct -ct Ax Ax -ct Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -37981,7 +39403,6 @@ oR oR oR oR -eL oR oR oR @@ -38010,7 +39431,18 @@ oR oR oR oR -FR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -38050,7 +39482,6 @@ oR oR oR oR -eL oR oR oR @@ -38063,19 +39494,10 @@ oR oR oR oR -eL oR oR -eL oR -eL -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -38086,47 +39508,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -38135,7 +39516,48 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -38174,7 +39596,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -38184,7 +39605,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -38193,13 +39613,15 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -38229,12 +39651,9 @@ oR oR oR oR -eL oR oR oR -eL -eL oR oR oR @@ -38267,7 +39686,19 @@ oR oR oR oR -FR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -38322,17 +39753,8 @@ oR oR oR oR -eL -eL -eL -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -38343,36 +39765,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -38383,13 +39775,43 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -38403,7 +39825,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -38446,7 +39867,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -38454,9 +39874,11 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -38479,17 +39901,13 @@ oR oR oR oR -eL oR oR oR oR oR -eL oR oR -eL -eL oR oR oR @@ -38524,7 +39942,21 @@ oR oR oR oR -FR +oR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -38579,17 +40011,7 @@ oR oR oR oR -eL -eL -eL -eL -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -38600,17 +40022,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -38624,18 +40035,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -38647,7 +40046,30 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -38672,7 +40094,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -38703,17 +40124,18 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -38734,7 +40156,6 @@ oR oR oR oR -eL oR oR oR @@ -38781,7 +40202,17 @@ oR oR oR oR -FR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -38821,7 +40252,6 @@ oR oR oR oR -eL oR oR oR @@ -38834,19 +40264,11 @@ oR oR oR oR -eL oR oR -eL oR oR -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -38857,39 +40279,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -38905,8 +40294,41 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -38916,13 +40338,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -38954,23 +40369,30 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax Ax Ax -ct Ax -ct -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -38987,7 +40409,6 @@ oR oR oR oR -eL oR oR oR @@ -39038,7 +40459,15 @@ oR oR oR oR -FR +oR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -39091,19 +40520,12 @@ oR oR oR oR -eL oR -eL -eL oR oR oR oR oR -eL -eL -eL -eL tM tM MS @@ -39113,18 +40535,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -39150,7 +40560,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -39166,7 +40575,20 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax Ax @@ -39181,7 +40603,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -39192,7 +40613,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -39203,31 +40623,33 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -39242,11 +40664,8 @@ oR oR oR oR -eL oR -eL oR -eL oR oR oR @@ -39295,7 +40714,21 @@ oR oR oR oR -FR +oR +oR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -39348,19 +40781,8 @@ oR oR oR oR -eL oR oR -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -39370,32 +40792,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -39409,7 +40805,33 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -39446,7 +40868,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -39458,19 +40879,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -ct Ax Ax Ax @@ -39478,13 +40886,27 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -39552,7 +40974,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -39606,18 +41036,10 @@ oR oR oR oR -eL -eL -eL -eL oR oR -eL oR oR -eL -eL -eL tM tM MS @@ -39627,19 +41049,6 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -39660,7 +41069,20 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -39695,22 +41117,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -39737,12 +41143,28 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -39755,7 +41177,6 @@ oR oR oR oR -eL oR oR oR @@ -39809,7 +41230,17 @@ oR oR oR oR -FR +oR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -39867,15 +41298,6 @@ oR oR oR oR -eL -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -39884,20 +41306,7 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax Ax Ax @@ -39905,7 +41314,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -39919,7 +41327,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -39931,14 +41338,34 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax Ax -er +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -39994,12 +41421,7 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct VU GK bE @@ -40066,7 +41488,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -40118,21 +41551,10 @@ oR oR oR oR -eL oR oR oR -eL -eL -eL -eL -eL -eL oR -eL -eL -eL -eL tM tM MS @@ -40141,20 +41563,6 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct Ax Ax Ax @@ -40182,17 +41590,31 @@ Ax Ax Ax Ax -ct -ct -Ax -ct Ax Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Aq @@ -40225,15 +41647,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -40247,16 +41660,25 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -40323,7 +41745,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -40380,16 +41810,8 @@ oR oR oR oR -eL -eL oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -40399,36 +41821,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -40441,7 +41833,37 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -40460,13 +41882,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -40491,13 +41906,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -40510,10 +41918,24 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -40580,7 +42002,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -40636,17 +42068,7 @@ oR oR oR oR -eL -eL -eL oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -40656,21 +42078,21 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -40763,14 +42185,14 @@ Ax Ax Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -40837,7 +42259,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -40894,16 +42326,6 @@ oR oR oR oR -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -40913,18 +42335,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -40939,11 +42349,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -40953,7 +42358,24 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -40974,18 +42396,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -41005,7 +42415,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -41014,19 +42423,32 @@ Ax Ax Ax Ax -ct -ct -Ax -ct Ax Ax Ax -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -41094,7 +42516,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -41148,19 +42579,10 @@ oR oR oR oR -eL oR oR oR -eL oR -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -41170,28 +42592,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -41215,7 +42615,29 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -41226,23 +42648,6 @@ Ax Aq Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -41270,7 +42675,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -41279,11 +42683,29 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -41351,7 +42773,21 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -41394,7 +42830,6 @@ oR oR oR oR -eL oR oR oR @@ -41403,21 +42838,8 @@ oR oR oR oR -eL -oR -eL -oR -eL oR oR -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -41427,36 +42849,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -41473,7 +42865,37 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -41492,35 +42914,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -41538,9 +42931,38 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -41608,7 +43030,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -41651,7 +43084,6 @@ oR oR oR oR -eL oR oR oR @@ -41660,21 +43092,11 @@ oR oR oR oR -eL -oR -oR -oR -eL oR oR oR oR oR -eL -eL -eL -eL -eL tM tM MS @@ -41685,31 +43107,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -41735,7 +43132,32 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq Ax @@ -41758,22 +43180,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -41791,13 +43197,29 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -41865,7 +43287,13 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR oR oR oR @@ -41922,16 +43350,10 @@ oR oR oR oR -eL oR oR oR -eL oR -eL -eL -eL -eL tM tM MS @@ -41942,20 +43364,20 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -42006,15 +43428,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -42051,10 +43464,19 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -42122,7 +43544,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -42177,18 +43607,10 @@ oR oR oR oR -eL -oR -eL oR oR oR oR -eL -eL -eL -eL -eL tM tM MS @@ -42199,20 +43621,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -42237,11 +43645,25 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -42306,12 +43728,12 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -42379,7 +43801,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -42419,7 +43850,6 @@ oR oR oR oR -eL oR oR oR @@ -42431,21 +43861,13 @@ oR oR oR oR -eL oR oR oR oR -eL oR -eL oR -eL oR -eL -eL -eL -eL tM tM MS @@ -42456,15 +43878,7 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax Ax Ax @@ -42477,7 +43891,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -42488,7 +43901,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -42501,20 +43913,35 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -er -ct -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -42563,12 +43990,7 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct UA jE GK @@ -42636,7 +44058,20 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -42687,23 +44122,10 @@ oR oR oR oR -eL oR oR -eL oR -eL -eL -eL oR -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -42713,20 +44135,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -42749,9 +44157,23 @@ Ax Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -42779,7 +44201,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -42823,10 +44244,11 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -42893,7 +44315,17 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -42948,19 +44380,9 @@ oR oR oR oR -eL -eL oR -eL oR -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -42971,17 +44393,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -43012,10 +44423,21 @@ Ax Ax Ax Ax -ct Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -43024,7 +44446,6 @@ Ax Ax Aq Ax -ct Ax Ax Ax @@ -43041,33 +44462,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -43080,10 +44474,38 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -43150,7 +44572,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -43204,20 +44637,9 @@ oR oR oR oR -eL -oR -eL -eL -eL oR oR -eL oR -eL -eL -eL -eL -eL tM tM MS @@ -43228,35 +44650,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -ct -ct Ax Ax Ax @@ -43277,7 +44670,36 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq Ax @@ -43292,7 +44714,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -43317,7 +44738,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -43329,18 +44749,20 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -43407,7 +44829,19 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -43459,22 +44893,10 @@ oR oR oR oR -eL oR oR oR -eL oR -eL -eL -eL -eL -eL -eL -eL -eL -eL -eL tM tM MS @@ -43485,15 +44907,6 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -Ax -ct Ax Ax Ax @@ -43510,7 +44923,16 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -43547,7 +44969,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -43566,10 +44987,6 @@ Ax Ax Ax Ax -ct -Ax -ct -ct Ax Ax Ax @@ -43583,21 +45000,26 @@ Ax Ax Ax Ax -ct -Ax -ct -ct Ax Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -43664,7 +45086,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -43704,7 +45137,6 @@ oR oR oR oR -eL oR oR oR @@ -43720,18 +45152,8 @@ oR oR oR oR -eL -eL -oR -eL -eL oR oR -eL -eL -eL -eL -eL tM tM MS @@ -43743,29 +45165,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -43777,8 +45176,31 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -43801,8 +45223,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -43827,10 +45247,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax @@ -43839,7 +45255,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -43847,14 +45262,21 @@ Ax Ax Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -43921,7 +45343,18 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -43976,19 +45409,8 @@ oR oR oR oR -eL oR -eL -eL -eL -eL oR -eL -eL -eL -eL -eL -eL tM tM MS @@ -44000,22 +45422,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -ct -ct -Ax -ct Ax Ax Ax @@ -44023,19 +45429,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -44043,7 +45436,36 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -44079,7 +45501,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -44105,12 +45526,13 @@ Ax Ax Ax Ax -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -44178,7 +45600,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -44223,7 +45653,6 @@ oR oR oR oR -eL oR oR oR @@ -44235,17 +45664,10 @@ oR oR oR oR -eL oR oR oR -eL oR -eL -eL -eL -eL -eL tM tM tM @@ -44258,25 +45680,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -44287,18 +45690,37 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -ct -ct Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -44365,9 +45787,9 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax VU GK GK @@ -44435,7 +45857,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -44476,7 +45907,6 @@ oR oR oR oR -eL oR oR oR @@ -44491,19 +45921,11 @@ oR oR oR oR -eL -eL oR oR oR oR oR -eL -eL -eL -eL -eL -eL tM tM tM @@ -44515,13 +45937,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -44532,12 +45947,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -44545,7 +45954,20 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -44606,7 +46028,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -44622,9 +46043,10 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax VU GK GK @@ -44692,7 +46114,16 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -44743,24 +46174,15 @@ oR oR oR oR -eL oR oR oR oR oR oR -eL -eL oR oR oR -eL -eL -eL -eL -eL -eL tM tM tM @@ -44773,38 +46195,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -ct -Ax -ct -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -44812,8 +46202,40 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -44823,26 +46245,6 @@ Ax Ax Aq Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -44876,12 +46278,32 @@ Ax Ax Ax Ax -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -44949,7 +46371,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -45006,19 +46428,19 @@ oR oR oR oR -eL -eL oR oR -eL oR oR -eL -eL -eL -eL -eL -ct +oR +oR +oR +oR +oR +oR +oR +oR +Ax tM tM tM @@ -45030,28 +46452,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -ct -Ax -ct -ct -Ax -Ax -ct Ax Ax Ax @@ -45062,11 +46462,33 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -45133,12 +46555,12 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -45206,7 +46628,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -45260,23 +46682,23 @@ oR oR oR oR -eL -eL -eL oR oR -eL -eL -eL oR -eL -eL -eL -eL -eL -eL -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax tM tM tM @@ -45288,34 +46710,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -45333,7 +46727,35 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq Ax @@ -45341,7 +46763,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -45360,7 +46781,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -45379,7 +46799,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -45392,10 +46811,13 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -45463,7 +46885,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -45506,7 +46928,6 @@ oR oR oR oR -eL oR oR oR @@ -45519,22 +46940,23 @@ oR oR oR oR -eL -eL -eL oR oR oR oR -eL -eL -eL -eL -eL -eL -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax tM tM MS @@ -45544,33 +46966,33 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -45596,19 +47018,6 @@ Aq Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -45621,7 +47030,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -45634,25 +47042,39 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -45720,7 +47142,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -45775,23 +47197,23 @@ oR oR oR oR -eL -eL oR -eL oR -eL oR -eL -eL -eL oR -eL -eL -eL -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax tM tM tM @@ -45802,27 +47224,27 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct Ax Ax -ct -ct Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -45850,13 +47272,6 @@ Ax Ax Ax Aq -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -45906,11 +47321,18 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -45977,7 +47399,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -46029,27 +47451,27 @@ oR oR oR oR -eL -eL oR oR -eL -eL -eL oR -eL oR -eL -eL -eL oR -eL -eL -eL -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax tM tM MS @@ -46060,22 +47482,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -46102,9 +47508,25 @@ Ax Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq Ax @@ -46118,15 +47540,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -46144,8 +47557,6 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax @@ -46159,15 +47570,26 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -46234,7 +47656,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -46286,27 +47708,27 @@ oR oR oR oR -eL -eL -oR -eL -eL -eL oR oR oR -eL oR oR -eL -eL -eL -eL -eL -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax tM tM MS @@ -46317,43 +47739,43 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -ct -ct -Ax -ct Ax Ax Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -46364,13 +47786,6 @@ Ax Ax Ax Aq -ct -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -46383,7 +47798,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -46395,22 +47809,6 @@ Ax Ax Ax Ax -ct -Ax -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -46419,12 +47817,36 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK bE @@ -46491,7 +47913,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -46532,7 +47954,6 @@ oR oR oR oR -eL oR oR oR @@ -46544,27 +47965,28 @@ oR oR oR oR -eL -oR -oR -eL -eL -eL oR oR oR oR oR -eL oR -eL -eL -eL -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -46575,27 +47997,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -46605,10 +48006,31 @@ Ax Ax Ax Ax -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -46650,19 +48072,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -46675,12 +48084,25 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -46748,7 +48170,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -46806,22 +48228,22 @@ oR oR oR oR -eL -oR -eL oR oR -eL oR -eL oR -eL -eL -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -46832,40 +48254,40 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -46926,18 +48348,18 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -47005,7 +48427,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -47065,20 +48487,20 @@ oR oR oR oR -eL -eL -eL -eL -eL -eL -eL -eL -eL -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -47090,34 +48512,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -47125,7 +48519,35 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -47170,7 +48592,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -47191,10 +48612,11 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -47262,7 +48684,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -47319,24 +48741,24 @@ oR oR oR oR -eL -eL oR oR -eL -eL -eL oR -eL -eL -eL -eL -ct -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -47347,25 +48769,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -ct Ax Ax Ax @@ -47378,7 +48781,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -47387,7 +48789,27 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -47404,12 +48826,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -47428,14 +48844,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -47446,12 +48854,26 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -47519,7 +48941,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -47573,28 +48995,28 @@ oR oR oR oR -eL -oR -oR -eL -oR -oR -eL oR oR oR oR oR oR -eL -eL -ct -ct -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -47605,18 +49027,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct Ax Ax Ax @@ -47632,7 +49042,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -47644,7 +49053,20 @@ Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -47659,14 +49081,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -47683,7 +49097,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -47692,7 +49105,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -47701,14 +49113,24 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -47776,7 +49198,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -47832,27 +49254,27 @@ oR oR oR oR -eL oR oR -eL -eL oR -eL oR -eL oR -eL -eL -eL -ct -ct -ct -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -47862,26 +49284,6 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -47890,19 +49292,39 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Aq @@ -47916,20 +49338,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -47958,14 +49366,28 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -48033,7 +49455,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -48092,24 +49514,24 @@ oR oR oR oR -eL -eL oR -eL -eL oR -eL -eL oR -eL -ct -ct -ct -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -48120,25 +49542,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -48151,32 +49554,39 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -48198,14 +49608,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -48217,11 +49619,31 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -48290,7 +49712,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -48346,27 +49768,27 @@ oR oR oR oR -eL -eL oR -eL -eL oR -eL -eL oR -eL oR -eL -eL -ct -ct -ct -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -48377,24 +49799,24 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -48427,24 +49849,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -48461,7 +49865,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -48474,11 +49877,30 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -48547,7 +49969,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -48603,28 +50025,28 @@ oR oR oR oR -eL -eL -eL oR oR -eL oR -eL oR -eL oR -eL -eL -ct -ct -ct -ct -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -48634,23 +50056,23 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -48682,7 +50104,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -48715,14 +50136,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -48731,11 +50144,20 @@ Ax Ax Ax Ax -ct -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -48804,7 +50226,23 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -48844,14 +50282,6 @@ oR oR oR oR -eL -oR -oR -oR -oR -oR -oR -eL oR oR oR @@ -48859,55 +50289,47 @@ oR oR oR oR -eL oR oR oR -eL -eL -eL -oR -oR -eL oR oR oR -eL -ct -ct -ct -ct -ct -ct -ct -ct -ct -tM -tM -MS -MS -MS -MS -MS -MS -tM -tM -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax -ct -ct -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +tM +tM +MS +MS +MS +MS +MS +MS +tM +tM +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -48942,9 +50364,6 @@ Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax @@ -48990,9 +50409,12 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -49061,7 +50483,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -49121,25 +50550,18 @@ oR oR oR oR -eL -eL -eL -eL -eL -oR -eL oR oR -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM MS MS @@ -49149,26 +50571,26 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -49195,31 +50617,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -49233,7 +50630,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -49246,10 +50642,36 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -49318,7 +50740,14 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -49358,7 +50787,6 @@ oR oR oR oR -eL oR oR oR @@ -49373,7 +50801,6 @@ oR oR oR oR -eL oR oR oR @@ -49381,22 +50808,17 @@ oR oR oR oR -eL -eL -eL oR -eL -eL -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -49407,26 +50829,26 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -Ax -ct Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -49462,13 +50884,6 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -Ax -ct -ct Ax Ax Ax @@ -49501,13 +50916,20 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -49575,7 +50997,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -49633,27 +51055,27 @@ oR oR oR oR -eL -oR -oR -eL oR oR oR -eL oR -eL oR -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +oR +oR +oR +oR +oR +oR +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -49664,35 +51086,6 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct -ct -Ax -ct -ct -ct Ax Ax Ax @@ -49701,9 +51094,38 @@ Ax Ax Ax Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax Ax @@ -49723,7 +51145,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -49758,13 +51179,14 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -49832,7 +51254,15 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR +oR +oR oR oR oR @@ -49883,7 +51313,6 @@ oR oR oR oR -eL oR oR oR @@ -49893,24 +51322,17 @@ oR oR oR oR -eL -eL oR -eL -eL -eL -eL -eL Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -49922,35 +51344,35 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -Ax -ct Ax Ax -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -49975,11 +51397,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct Ax Ax Ax @@ -50010,18 +51427,23 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -50031,144 +51453,144 @@ bE jq Dn Dn -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -FR -PH -FR -FR -PH -FR -PH -FR PH PH -er +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +PH +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq Aq Aq -er -er Aq -er -er -er -er -er Sa zn zn @@ -50179,37 +51601,20 @@ zn zn Sa Sa -er -er -er -er -er -er -er -er -er -er Aq -er Aq Aq Aq Aq Aq -er -er Aq Aq Aq -er Aq Aq -er Aq -er Aq Aq -er Aq Aq Aq @@ -50243,7 +51648,6 @@ Aq Aq Aq Aq -er Aq Aq Aq @@ -50258,13 +51662,10 @@ Aq Aq Aq Aq -er -er Aq Aq Aq Aq -er Aq Aq Aq @@ -50276,8 +51677,29 @@ Aq Aq Aq Aq -er -er +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq +Aq Wz mA SZ @@ -50346,7 +51768,11 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR oR oR oR @@ -50407,25 +51833,21 @@ oR oR oR oR -eL oR oR oR oR -eL -eL -eL Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -50437,42 +51859,42 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -ct -ct -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -ct Ax Ax Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Aq @@ -50482,25 +51904,6 @@ Ax Ax Ax Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -50521,7 +51924,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -50533,8 +51935,28 @@ Ax Ax Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -50603,7 +52025,10 @@ oR oR oR oR -FR +PH +oR +oR +oR oR oR oR @@ -50665,25 +52090,22 @@ oR oR oR oR -eL oR oR oR oR -eL -eL -ct -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -50694,44 +52116,44 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct Ax Ax Ax -ct -Ax -ct -ct -Ax -ct -ct Ax Ax -ct -ct -ct -Ax -ct Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax Ax @@ -50743,9 +52165,6 @@ Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax @@ -50787,11 +52206,14 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -50860,7 +52282,13 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR +oR oR oR oR @@ -50906,7 +52334,6 @@ oR oR oR oR -eL oR oR oR @@ -50921,26 +52348,21 @@ oR oR oR oR -eL -eL -eL oR oR -eL -eL oR -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -50952,43 +52374,43 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct Ax Ax Ax Ax -ct -ct -ct Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax Ax @@ -50997,13 +52419,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -ct Ax Ax Ax @@ -51042,13 +52457,20 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -51117,7 +52539,12 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR oR oR oR @@ -51170,7 +52597,6 @@ oR oR oR oR -eL oR oR oR @@ -51179,26 +52605,22 @@ oR oR oR oR -eL -oR -eL oR oR oR -eL -ct -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -51209,32 +52631,32 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct Ax -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Ax @@ -51250,30 +52672,6 @@ Aq Ax Ax Ax -ct -ct -ct -ct -Ax -Ax -ct -Ax -ct -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -51300,11 +52698,35 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -51374,7 +52796,9 @@ oR oR oR oR -FR +PH +oR +oR oR oR oR @@ -51436,27 +52860,25 @@ oR oR oR oR -eL oR oR -eL oR oR oR Ax Ax -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -51467,69 +52889,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -Ax -Ax -ct -Ax -ct -ct -Ax -ct -ct -ct -er -ct -ct -Ax -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -51559,9 +52918,72 @@ Ax Ax Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -51631,7 +53053,12 @@ oR oR oR oR -FR +PH +oR +oR +oR +oR +oR oR oR oR @@ -51680,7 +53107,6 @@ oR oR oR oR -eL oR oR oR @@ -51694,26 +53120,22 @@ oR oR oR oR -eL -eL -eL -eL oR oR Ax Ax -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -51725,84 +53147,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -er -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -Ax -Ax -ct -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -51815,10 +53159,88 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -51888,7 +53310,10 @@ oR oR oR oR -FR +PH +oR +oR +oR oR oR oR @@ -51937,7 +53362,6 @@ oR oR oR oR -eL oR oR oR @@ -51950,28 +53374,26 @@ oR oR oR oR -eL oR oR oR oR -eL oR Ax Ax -ct -Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -51982,76 +53404,6 @@ MS tM tM tM -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -ct -er -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -Ax -ct -ct -ct -ct Ax Ax Ax @@ -52062,20 +53414,90 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax -ct -ct Ax -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -52145,7 +53567,9 @@ oR oR oR oR -FR +PH +oR +oR oR oR oR @@ -52207,28 +53631,26 @@ oR oR oR oR -eL oR oR -eL oR oR oR Ax -ct Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -52240,99 +53662,99 @@ MS tM tM tM -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -ct -ct -ct Ax Ax Ax Ax Ax -ct -Ax -ct Ax Ax -ct -ct Ax -ct -ct Ax -ct Ax -ct -ct Ax -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -52402,7 +53824,9 @@ oR oR oR oR -FR +PH +oR +oR oR oR oR @@ -52458,7 +53882,6 @@ oR oR oR oR -eL oR oR oR @@ -52467,7 +53890,6 @@ oR oR oR oR -eL oR oR oR @@ -52475,18 +53897,18 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -52497,69 +53919,6 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct Ax Ax Ax @@ -52567,30 +53926,93 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax -ct -ct -ct -ct Ax -ct Ax -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -52659,7 +54081,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -52733,17 +54155,17 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -52755,99 +54177,99 @@ tM tM tM tM -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax -ct -ct -ct -Ax -ct -ct Ax Ax -ct Ax Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -52916,7 +54338,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -52981,26 +54404,25 @@ oR oR oR oR -eL oR oR oR Ax -ct -ct Ax Ax -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -53012,17 +54434,17 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax hb hb hb @@ -53032,79 +54454,79 @@ hb hb hb tV -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -53173,7 +54595,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -53240,7 +54663,6 @@ oR oR oR oR -eL oR Ax Ax @@ -53248,16 +54670,16 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -53269,99 +54691,99 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax vu tV -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -53430,7 +54852,9 @@ oR oR oR oR -FR +PH +oR +oR oR oR oR @@ -53497,25 +54921,23 @@ oR oR oR oR -eL -eL Ax Ax Ax -ct -Ax -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -53526,26 +54948,26 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax vu hb hb @@ -53557,68 +54979,68 @@ hb hb hb tV -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -53687,7 +55109,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -53745,7 +55168,6 @@ oR oR oR oR -eL oR oR oR @@ -53760,20 +55182,20 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -53783,100 +55205,100 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax vu tV -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -53944,7 +55366,10 @@ oR oR oR oR -FR +PH +oR +oR +oR oR oR oR @@ -54001,36 +55426,33 @@ oR oR oR oR -eL oR oR oR oR -eL oR oR oR -eL oR oR -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -54041,36 +55463,36 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax vu hb Be @@ -54080,60 +55502,60 @@ hb hb hb tV -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -54201,7 +55623,10 @@ oR oR oR oR -FR +PH +oR +oR +oR oR oR oR @@ -54246,7 +55671,6 @@ oR oR oR oR -eL oR oR oR @@ -54265,30 +55689,28 @@ oR oR oR oR -eL oR oR oR -eL -Ax -ct -ct Ax Ax -ct Ax Ax -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM MS MS @@ -54297,52 +55719,52 @@ MS MS MS tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax vu tV -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax gl hb hb @@ -54353,21 +55775,21 @@ hb hb hb tV -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax gl hb hb @@ -54375,22 +55797,22 @@ hb hb hb tV -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -54458,7 +55880,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -54527,8 +55949,6 @@ oR oR oR oR -ct -ct Ax Ax Ax @@ -54536,16 +55956,18 @@ Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -54555,45 +55977,45 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct Ax Ax -ct -Ax -ct -Ax -ct -ct -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax vu hb hb @@ -54601,14 +56023,14 @@ hb hb hb mZ -jG -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax vu hb hb @@ -54619,35 +56041,35 @@ hb hb hb tV -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax fy -jG -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax vu hb hb hb hb tV -ct -ct -ct +Ax +Ax +Ax gl hb hb hb tV -ct -ct -ct +Ax +Ax +Ax VU GK GK @@ -54715,7 +56137,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -54788,22 +56210,22 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -54813,68 +56235,68 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct Ax Ax Ax -ct -Ax -ct -ct -ct Ax Ax -ct -ct Ax -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax vu hb hb @@ -54883,16 +56305,16 @@ hb hb hb mZ -jG -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax vu hb hb @@ -54972,7 +56394,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -55021,7 +56444,6 @@ oR oR oR oR -eL oR oR oR @@ -55048,19 +56470,19 @@ Ax Ax Ax Ax -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -55071,99 +56493,99 @@ MS MS tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct Ax -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Sl Sl Sl Sl -jG -jG -jG -jG +Ax +Ax +Ax +ct qT Ay "} @@ -55229,7 +56651,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -55287,7 +56710,6 @@ oR oR oR oR -eL oR oR oR @@ -55301,24 +56723,24 @@ oR Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -55329,91 +56751,91 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Sl nu Sl @@ -55486,7 +56908,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -55565,17 +56987,17 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -55587,41 +57009,41 @@ MS tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -55641,28 +57063,28 @@ tM tM jh tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM tM tM tM -ct +Ax tM tM tM @@ -55743,7 +57165,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -55802,7 +57225,6 @@ oR oR oR oR -eL oR oR oR @@ -55816,23 +57238,23 @@ Ax Ax Ax Ax -ct -Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -55845,36 +57267,36 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax tM tM tM @@ -56000,7 +57422,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -56072,25 +57494,25 @@ oR Ax Ax Ax -ct -Ax -Ax -ct Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -56103,31 +57525,31 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM Sa tM @@ -56257,7 +57679,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -56332,22 +57754,22 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -56363,27 +57785,27 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM Sa @@ -56514,7 +57936,9 @@ oR oR oR oR -FR +PH +oR +oR oR oR oR @@ -56570,13 +57994,11 @@ oR oR oR oR -eL oR oR oR oR oR -eL oR oR oR @@ -56587,25 +58009,25 @@ Ax Ax Ax Ax -ct Ax Ax -ct -Ax -ct -ct -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -56624,17 +58046,17 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -56771,7 +58193,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -56848,22 +58270,22 @@ Ax Ax Ax Ax -ct Ax -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -57028,7 +58450,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -57091,7 +58514,6 @@ oR oR oR oR -eL oR oR oR @@ -57103,25 +58525,25 @@ Ax Ax Ax Ax -ct -ct -ct -ct Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -57180,7 +58602,7 @@ tM tM tM tM -ct +Ax tM tM tM @@ -57209,17 +58631,17 @@ tM tM tM tM +Ax +Ax +Ax +tM +tM +tM +tM +tM +Ax +Ax ct -ct -ct -tM -tM -tM -tM -tM -jG -jG -jG zk NP "} @@ -57285,7 +58707,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -57365,20 +58787,20 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -57426,31 +58848,31 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM -ct -ct -ct -ct +Ax +Ax +Ax +Ax tM tM tM tM tM -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -57464,17 +58886,17 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf Eo Eo @@ -57542,7 +58964,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -57619,24 +59041,24 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -57680,58 +59102,58 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -57799,7 +59221,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -57859,7 +59282,6 @@ oR oR oR oR -eL oR oR oR @@ -57876,26 +59298,26 @@ Ax Ax Ax Ax -ct Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM MS @@ -57936,59 +59358,59 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -58056,7 +59478,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -58122,7 +59545,6 @@ oR oR oR oR -eL oR oR Ax @@ -58136,23 +59558,23 @@ Ax Ax Ax Ax -ct Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -58192,52 +59614,52 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Cb Pe Pe @@ -58245,7 +59667,7 @@ Pe Pe Pe Gf -Eo +cv qh GK GK @@ -58313,7 +59735,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -58374,7 +59797,6 @@ oR oR oR oR -eL oR oR oR @@ -58394,22 +59816,22 @@ Ax Ax Ax Ax -ct -Ax -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -58447,48 +59869,48 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Cb Pe Pe @@ -58496,11 +59918,11 @@ Pe Pe Pe wt -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -58570,7 +59992,8 @@ oR oR oR oR -FR +PH +oR oR oR oR @@ -58635,7 +60058,6 @@ oR oR oR oR -eL oR oR oR @@ -58649,25 +60071,25 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -58702,62 +60124,62 @@ tM Sa tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Pe Pe Pe Pe Pe wt -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -58827,7 +60249,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -58906,27 +60328,27 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -58956,65 +60378,65 @@ tM tM tM tM -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax -ct -ct -Ax -ct -ct -ct Ax Ax -ct -ct -ct -ct -ct UA jE GK @@ -59084,7 +60506,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -59167,25 +60589,25 @@ Ax Ax Ax Ax -ct -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -59209,70 +60631,70 @@ tM tM tM tM -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct -ct +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -59341,7 +60763,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -59411,40 +60833,40 @@ oR oR oR Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct -Ax -ct Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -59463,73 +60885,73 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct Ax -ct Ax -ct Ax -ct Ax -ct -ct -ct -ct -ct UA jE GK @@ -59598,7 +61020,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -59679,33 +61101,33 @@ Ax Ax Ax Ax -ct Ax Ax -ct Ax -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -59719,75 +61141,75 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct Ax Ax Ax -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -59855,7 +61277,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -59937,34 +61359,34 @@ Ax Ax Ax Ax -ct Ax -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax tM tM tM @@ -59974,77 +61396,77 @@ tM tM tM tM -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -ct -Ax -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -ct -ct -ct -Ax -Ax -ct -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -60112,7 +61534,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -60182,7 +61604,6 @@ oR oR oR Ax -ct Ax Ax Ax @@ -60193,115 +61614,116 @@ Ax Ax Ax Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -Ax -ct -Ax -Ax -ct -Ax -ct -ct -ct -ct Ax Ax Ax Ax -ct -ct -ct Ax -ct Ax -ct Ax -ct -ct Ax -ct -ct Ax -ct -ct Ax -ct Ax -ct -ct -ct -ct Ax -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -60369,7 +61791,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -60449,116 +61871,116 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -Ax -ct -ct -Ax -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct -Ax -ct -ct Ax Ax -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -60626,7 +62048,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -60705,116 +62127,116 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -Ax -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct Ax Ax Ax Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -60883,7 +62305,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -60964,113 +62386,113 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -Ax -ct Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax -ct -ct -Ax -ct -ct Ax Ax -ct Ax Ax -ct Ax Ax -ct -Ax -ct -ct Ax Ax -ct -ct -Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct Ax Ax -ct -ct Ax -ct -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -61140,7 +62562,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -61209,7 +62631,6 @@ oR oR oR oR -ct Ax Ax Ax @@ -61222,112 +62643,113 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -ct -ct Ax Ax Ax Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Ax Aq Ax -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct Ax Ax -ct Ax Ax -ct -ct -ct -Ax -ct -Ax -ct -ct -Ax -ct -Ax -ct -ct -ct Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -61397,7 +62819,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -61466,7 +62888,6 @@ oR oR oR oR -ct Ax Ax Ax @@ -61476,115 +62897,116 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -ct -Ax -ct -Ax -ct Ax Ax Ax Ax -ct -Ax -ct -ct -ct Ax Ax Ax Ax -ct Ax -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq Ax -ct -ct -Ax -ct -ct -Ax -Ax -ct -ct -Ax -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct Ax Ax Ax -ct Ax -ct -ct Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax UA jE GK @@ -61654,7 +63076,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -61736,113 +63158,113 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct Ax Ax Ax Ax -ct Ax -ct Ax -ct Ax -ct -ct -ct Ax -ct Ax -ct Ax -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct Ax -ct -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Ax Aq -ct -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -ct Ax Ax Ax Ax Ax -ct -ct Ax -ct -ct Ax -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -61911,7 +63333,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -61993,113 +63415,113 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -ct -Ax -Ax -ct -ct -Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -Ax -ct -ct -Ax -ct -Ax -ct -Ax -Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -Ax -er -ct -ct Ax Ax Ax -ct -ct -ct -ct -Ax -ct Ax Ax -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -Ax -ct Ax Ax -ct -ct -Ax -ct -Ax -ct -ct -ct -ct Ax Ax -ct -ct Ax Ax -ct -ct -ct -ct Ax -ct -ct -ct Ax -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -62168,7 +63590,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -62247,7 +63669,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -62255,108 +63676,109 @@ Ax Ax Ax Ax -ct -Ax -ct -ct -Ax -Ax -ct -Ax -ct -ct -ct -ct -Ax -Ax -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -Ax -er -ct -Ax -ct Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct Ax -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -62425,7 +63847,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -62510,12 +63932,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -ct -ct Ax Ax Ax @@ -62523,96 +63939,102 @@ Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -Ax -ct -ct -ct -ct Ax Ax Ax Ax Ax -ct -Ax -ct -ct -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq -ct -ct -Ax -Ax -ct -ct -ct -ct -Ax -ct -Ax -ct Ax Ax Ax -ct -ct -Ax -Ax -ct -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -62682,7 +64104,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -62761,104 +64183,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -er -ct -ct -Ax -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -Ax -Ax -Ax -Ax -ct -ct -ct -Ax -Ax -ct -ct -ct -ct -Ax -Ax -ct -ct -Ax -ct -Ax -Ax -ct -ct -Ax -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct Ax Ax Ax @@ -62866,10 +64190,108 @@ Ax Ax Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -62939,7 +64361,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -63013,120 +64435,120 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax Ax -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct -Ax -Ax -ct Ax Ax Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -Ax -ct -ct -ct -Ax -Ax -ct -ct -ct -Ax -ct -ct -ct -ct Ax Ax Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -Ax -ct -ct -Ax -Ax -ct -ct -Ax -ct -ct -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -63196,7 +64618,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -63282,108 +64704,108 @@ Ax Ax Ax Ax -ct -Ax -ct -ct -ct -ct Ax Ax Ax Ax Ax Ax -ct -ct -ct -Ax -Ax -Ax -Ax -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -ct -ct -ct -Ax -Ax -ct -Ax -ct -ct -ct -er -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -Ax -Ax -Ax -ct -Ax -ct -Ax -Ax -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -Ax -ct -ct -Ax -ct -ct -Ax -ct Ax Ax Ax Ax Ax Ax -ct Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -63453,7 +64875,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -63538,109 +64960,109 @@ Ax Ax Ax Ax -ct -ct -ct -Ax -ct -Ax -ct Ax Ax Ax Ax Ax -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -Ax -Ax -Ax -ct -ct -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct Ax -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -63710,7 +65132,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -63787,117 +65209,117 @@ Ax Ax Ax Ax -ct Ax Ax Ax Ax Ax -ct -Ax -Ax -ct -Ax -Ax -Ax -ct -ct -Ax -ct -ct -Ax -Ax -ct -Ax -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -ct -Ax -Ax -ct -ct -ct Ax Ax Ax -ct -Ax -ct -Ax -ct -er -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -ct -Ax -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -Ax -ct -Ax -ct -Ax -ct Ax Ax -ct Ax Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -63967,7 +65389,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -64050,16 +65472,6 @@ Ax Ax Ax Ax -ct -ct -Ax -Ax -Ax -Ax -Ax -Ax -ct -ct Ax Ax Ax @@ -64068,39 +65480,45 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -ct -ct -Ax -Ax -ct Ax Ax Ax -ct Ax Ax -ct -Ax -ct -Ax -ct -ct -ct -Ax -ct Ax Ax -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq -ct -ct -ct -ct Ax Ax Ax @@ -64108,52 +65526,56 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -Ax -ct -Ax -Ax -ct -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -ct -ct -ct Ax Ax Ax -ct -ct -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -64224,7 +65646,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -64304,19 +65726,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -Ax -ct -ct Ax Ax Ax @@ -64324,93 +65733,106 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -Ax -Ax -ct -ct -ct -ct -er -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct Ax Ax Ax Ax Ax -ct -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -ct -Ax -ct -ct -Ax -Ax -ct -Ax -ct Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -64481,7 +65903,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -64566,7 +65988,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -64574,100 +65995,101 @@ Ax Ax Ax Ax -ct -ct -ct -Ax -Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct Ax Ax -ct Ax Ax -ct -Ax -ct Ax Ax -ct Ax Ax -ct -ct Ax -ct Ax -ct -ct Ax -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Aq -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -Ax -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct Ax Ax Ax -ct Ax Ax -ct Ax Ax -ct -ct -Ax -ct -Ax -ct -ct Ax Ax -ct -ct Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -64738,7 +66160,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -64816,90 +66238,6 @@ Ax Ax Ax Ax -ct -Ax -Ax -Ax -Ax -ct -Ax -Ax -Ax -ct -ct -Ax -Ax -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -Ax -Ax -Ax -Ax -Ax -ct -ct -ct -ct -ct -ct -Ax -Ax -ct -er -ct -Ax -Ax -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -ct -Ax -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -Ax -Ax -ct -ct -ct Ax Ax Ax @@ -64909,22 +66247,106 @@ Ax Ax Ax Ax -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct Ax Ax -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -64995,7 +66417,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -65073,115 +66495,115 @@ Ax Ax Ax Ax -ct -Ax -Ax -ct -ct -Ax -Ax -Ax -ct -ct Ax Ax Ax Ax -ct -ct -Ax -ct Ax Ax Ax -ct -ct -Ax -ct -Ax -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -er -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -Ax -ct Ax Ax Ax -ct Ax -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK @@ -65252,7 +66674,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -65331,113 +66753,113 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -ct -Ax -ct -Ax -Ax -ct -ct -ct -ct -Ax -Ax -Ax -ct -Ax -Ax -ct -Ax -Ax -ct Ax Ax Ax Ax Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -Ax -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -Ax -ct Ax Ax Ax -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax Mf qh GK @@ -65509,7 +66931,7 @@ oR oR oR oR -FR +PH oR oR oR @@ -65588,7 +67010,6 @@ Ax Ax Ax Ax -ct Ax Ax Ax @@ -65600,101 +67021,102 @@ Ax Ax Ax Ax -ct -ct -Ax -ct -ct -ct -Ax -Ax -ct Ax Ax Ax Ax -ct -ct Ax -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -er -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct -ct +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Aq +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax +Ax VU GK GK diff --git a/maps/cynosure/cynosure.dm b/maps/cynosure/cynosure.dm index 8bb31d0723..641e96d4bc 100644 --- a/maps/cynosure/cynosure.dm +++ b/maps/cynosure/cynosure.dm @@ -14,6 +14,7 @@ #include "loadout/loadout_uniform.dm" #include "datums/supplypacks/munitions.dm" + #include "datums/random_map.dm" #include "items/encryptionkey_cyno.dm" #include "items/headset_cyno.dm" #include "items/clothing/cyno_suit.dm" diff --git a/maps/cynosure/cynosure_defines.dm b/maps/cynosure/cynosure_defines.dm new file mode 100644 index 0000000000..9d0f950191 --- /dev/null +++ b/maps/cynosure/cynosure_defines.dm @@ -0,0 +1,333 @@ +// To be filled out when more progress on the new map occurs. + +#define Z_LEVEL_STATION_ONE 1 +#define Z_LEVEL_STATION_TWO 2 +#define Z_LEVEL_STATION_THREE 3 +#define Z_LEVEL_EMPTY_SPACE 4 +#define Z_LEVEL_TCOMM 5 +#define Z_LEVEL_CENTCOM 6 +#define Z_LEVEL_SURFACE_WILD 7 + +/datum/map/cynosure + name = "Cynosure" + full_name = "Cynosure Station" + path = "cynosure" + + lobby_icon = 'icons/misc/title.dmi' + lobby_screens = list("mockingjay00") // New lobby screen if possible. + + holomap_smoosh = list(list( + Z_LEVEL_STATION_ONE, + Z_LEVEL_STATION_TWO, + Z_LEVEL_STATION_THREE)) + + zlevel_datum_type = /datum/map_z_level/cynosure + + station_name = "Cynosure Station" + station_short = "Cynosure" + dock_name = "NCS Northern Star" // Still the centcom! + boss_name = "Central Command" + boss_short = "Centcom" + company_name = "NanoTrasen" + company_short = "NT" + starsys_name = "Vir" + use_overmap = TRUE + + shuttle_docked_message = "The scheduled shuttle to the %dock_name% has landed at Cynosure departures pad. It will depart in approximately %ETD%." + shuttle_leaving_dock = "The Crew Transfer Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%." + shuttle_called_message = "A crew transfer to %dock_name% has been scheduled. The shuttle has been called. Those leaving should proceed to Cynosure Departures Pad in approximately %ETA%." + shuttle_recall_message = "The scheduled crew transfer has been cancelled." + emergency_shuttle_docked_message = "The Emergency Shuttle has landed at Cynosure departures pad. You have approximately %ETD% to board the Emergency Shuttle." + emergency_shuttle_leaving_dock = "The Emergency Shuttle has left the station. Estimate %ETA% until the shuttle docks at %dock_name%." + emergency_shuttle_called_message = "An emergency evacuation shuttle has been called. It will arrive at Cynosure departures pad in approximately %ETA%." + emergency_shuttle_recall_message = "The emergency shuttle has been recalled." + + // Networks that will show up as options in the camera monitor program + station_networks = list( + NETWORK_CARGO, + NETWORK_CIRCUITS, + NETWORK_CIVILIAN, + NETWORK_COMMAND, + NETWORK_ENGINE, + NETWORK_ENGINEERING, + NETWORK_BASEMENT_FLOOR, + NETWORK_GROUND_FLOOR, + NETWORK_SECOND_FLOOR, + NETWORK_MEDICAL, + NETWORK_MINE, + NETWORK_RESEARCH, + NETWORK_RESEARCH_OUTPOST, + NETWORK_ROBOTS, + NETWORK_PRISON, + NETWORK_SECURITY, + NETWORK_TELECOM + ) + // Camera networks that exist, but don't show on regular camera monitors. + secondary_networks = list( + NETWORK_ERT, + NETWORK_MERCENARY, + NETWORK_THUNDER, + NETWORK_COMMUNICATORS, + NETWORK_ALARM_ATMOS, + NETWORK_ALARM_POWER, + NETWORK_ALARM_FIRE, + NETWORK_SUPPLY + ) + usable_email_tlds = list("freemail.nt") + allowed_spawns = list("Arrivals Shuttle", "Cryogenic Storage", "Cyborg Storage") + + + use_overmap = TRUE + overmap_size = 20 + overmap_event_areas = 6 + default_skybox = /datum/skybox_settings/cynosure + + unit_test_exempt_areas = list( + /area/ninja_dojo, + /area/ninja_dojo/firstdeck, + /area/ninja_dojo/arrivals_dock, + /area/surface/cave, + /area/surface/station/construction, + /area/surface/station/rnd/test_area + ) + unit_test_exempt_from_atmos = list( + /area/tcommsat/chamber, + /area/surface/station/maintenance + ) + + planet_datums_to_make = list(/datum/planet/sif) + + map_levels = list( + Z_LEVEL_STATION_ONE, + Z_LEVEL_STATION_TWO, + Z_LEVEL_STATION_THREE, + Z_LEVEL_SURFACE_WILD + ) + +/datum/map/cynosure/perform_map_generation() + // First, place a bunch of submaps. This comes before tunnel/forest generation as to not interfere with the submap. + + // Cave submaps are first. + SSmapping.seed_area_submaps( + list(Z_LEVEL_STATION_ONE), + 75, + /area/surface/cave/unexplored/normal, + /datum/map_template/surface/mountains/normal + ) + SSmapping.seed_area_submaps( + list(Z_LEVEL_STATION_ONE), + 75, + /area/surface/cave/unexplored/deep, + /datum/map_template/surface/mountains/deep + ) + + // Plains to make them less plain. + SSmapping.seed_area_submaps( + list(Z_LEVEL_STATION_TWO), + 100, + /area/surface/outside/plains/normal, + /datum/map_template/surface/plains + ) // Center area is WIP until map editing settles down. + + // Wilderness is next. + SSmapping.seed_area_submaps( + list(Z_LEVEL_SURFACE_WILD), + 75, + /area/surface/outside/wilderness/normal, + /datum/map_template/surface/wilderness/normal + ) + + SSmapping.seed_area_submaps( + list(Z_LEVEL_SURFACE_WILD), + 75, + /area/surface/outside/wilderness/deep, + /datum/map_template/surface/wilderness/deep + ) + // If Space submaps are made, add a line to make them here as well. + + // Now for the tunnels. + var/time_started = REALTIMEOFDAY + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_STATION_ONE, world.maxx, world.maxy) // Create the mining Z-level. + to_world_log("Generated caves in [(REALTIMEOFDAY - time_started) / 10] second\s.") + time_started = REALTIMEOFDAY + new /datum/random_map/noise/sif/underground(null, 1, 1, Z_LEVEL_STATION_ONE, world.maxx, world.maxy) + new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_STATION_ONE, 64, 64) // Create the mining ore distribution map. + to_world_log("Generated ores in [(REALTIMEOFDAY - time_started) / 10] second\s.") + + // Forest/wilderness generation. + new /datum/random_map/noise/sif( null, 1, 1, Z_LEVEL_STATION_TWO, world.maxx, world.maxy) + new /datum/random_map/noise/sif/forest(null, 1, 1, Z_LEVEL_SURFACE_WILD, world.maxx, world.maxy) + + return 1 + +// Skybox Settings +/datum/skybox_settings/cynosure + icon_state = "dyable" + random_color = TRUE + +// For making the 6-in-1 holomap, we calculate some offsets +#define SOUTHERN_CROSS_MAP_SIZE 160 // Width and height of compiled in Southern Cross z levels. +#define SOUTHERN_CROSS_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns +#define SOUTHERN_CROSS_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*SOUTHERN_CROSS_MAP_SIZE) - SOUTHERN_CROSS_HOLOMAP_CENTER_GUTTER) / 2) // 100 +#define SOUTHERN_CROSS_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (3*SOUTHERN_CROSS_MAP_SIZE)) / 2) // 60 + +/datum/map_z_level/cynosure/station + flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES + holomap_legend_x = 220 + holomap_legend_y = 160 + +/datum/map_z_level/cynosure/station/station_one + z = Z_LEVEL_STATION_ONE + name = "Underground" + flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED + base_turf = /turf/simulated/floor/outdoors/rocks/caves + holomap_offset_x = SOUTHERN_CROSS_HOLOMAP_MARGIN_X - 40 + holomap_offset_y = SOUTHERN_CROSS_HOLOMAP_MARGIN_Y + SOUTHERN_CROSS_MAP_SIZE*0 + +/datum/map_z_level/cynosure/station/station_two + z = Z_LEVEL_STATION_TWO + name = "Surface" + flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED + base_turf = /turf/simulated/open + holomap_offset_x = SOUTHERN_CROSS_HOLOMAP_MARGIN_X - 40 + holomap_offset_y = SOUTHERN_CROSS_HOLOMAP_MARGIN_Y + SOUTHERN_CROSS_MAP_SIZE*1 + +/datum/map_z_level/cynosure/station/station_three + z = Z_LEVEL_STATION_THREE + name = "Deck 2" + flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_SEALED + base_turf = /turf/simulated/open + holomap_offset_x = HOLOMAP_ICON_SIZE - SOUTHERN_CROSS_HOLOMAP_MARGIN_X - SOUTHERN_CROSS_MAP_SIZE - 40 + holomap_offset_y = SOUTHERN_CROSS_HOLOMAP_MARGIN_Y + SOUTHERN_CROSS_MAP_SIZE*1 + +/datum/map_z_level/cynosure/empty_space + z = Z_LEVEL_EMPTY_SPACE + name = "Empty" + flags = MAP_LEVEL_PLAYER + transit_chance = 76 + +/datum/map_z_level/cynosure/tcomm + z = Z_LEVEL_TCOMM + name = "Telecommunications Satellite" + flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT + transit_chance = 24 + +/datum/map_z_level/cynosure/centcom + z = Z_LEVEL_CENTCOM + name = "Centcom" + flags = MAP_LEVEL_ADMIN|MAP_LEVEL_CONTACT | MAP_LEVEL_SEALED + +/datum/map_z_level/cynosure/surface_wild + z = Z_LEVEL_SURFACE_WILD + name = "Wilderness" + flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES + base_turf = /turf/simulated/floor/outdoors/rocks/sif/planetuse + +//Teleport to Mine + +/obj/effect/step_trigger/teleporter/mine/to_mining/New() + ..() + teleport_x = src.x + teleport_y = 2 + teleport_z = Z_LEVEL_STATION_ONE + +/obj/effect/step_trigger/teleporter/mine/from_mining/New() + ..() + teleport_x = src.x + teleport_y = world.maxy - 1 + teleport_z = Z_LEVEL_STATION_TWO + +//Teleport to Wild + +/obj/effect/step_trigger/teleporter/wild/to_wild/New() + ..() + teleport_x = src.x + teleport_y = 2 + teleport_z = Z_LEVEL_SURFACE_WILD + +/obj/effect/step_trigger/teleporter/wild/from_wild/New() + ..() + teleport_x = src.x + teleport_y = world.maxy - 1 + teleport_z = Z_LEVEL_STATION_TWO + +/datum/planet/sif + expected_z_levels = list( + Z_LEVEL_STATION_ONE, + Z_LEVEL_STATION_TWO, + Z_LEVEL_STATION_THREE, + Z_LEVEL_SURFACE_WILD + ) + +/obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize() + teleport_x = src.x - 4 + teleport_y = src.y + teleport_z = src.z + return ..() + +/obj/effect/step_trigger/teleporter/bridge/east_to_west/small/Initialize() + teleport_x = src.x - 3 + teleport_y = src.y + teleport_z = src.z + return ..() + +/obj/effect/step_trigger/teleporter/bridge/west_to_east/Initialize() + teleport_x = src.x + 4 + teleport_y = src.y + teleport_z = src.z + return ..() + +/obj/effect/step_trigger/teleporter/bridge/west_to_east/small/Initialize() + teleport_x = src.x + 3 + teleport_y = src.y + teleport_z = src.z + return ..() + +/obj/effect/step_trigger/teleporter/bridge/north_to_south/Initialize() + teleport_x = src.x + teleport_y = src.y - 4 + teleport_z = src.z + return ..() + +/obj/effect/step_trigger/teleporter/bridge/south_to_north/Initialize() + teleport_x = src.x + teleport_y = src.y + 4 + teleport_z = src.z + return ..() + +//Planetside Transitions + +/obj/effect/map_effect/portal/master/side_a/plains_to_caves + portal_id = "plains_caves-normal" + +/obj/effect/map_effect/portal/master/side_b/caves_to_plains + portal_id = "plains_caves-normal" + +/obj/effect/map_effect/portal/master/side_a/plains_to_wilderness + portal_id = "caves_wilderness-normal" + +/obj/effect/map_effect/portal/master/side_b/wilderness_to_plains + portal_id = "caves_wilderness-normal" + +/obj/effect/map_effect/portal/master/side_a/plains_to_wilderness/river + portal_id = "caves_wilderness-river" + +/obj/effect/map_effect/portal/master/side_b/wilderness_to_plains/river + portal_id = "caves_wilderness-river" + +//Suit Storage Units + +/obj/machinery/suit_cycler/exploration + name = "Explorer suit cycler" + model_text = "Exploration" + req_one_access = list(access_explorer) + +/obj/machinery/suit_cycler/pilot + name = "Pilot suit cycler" + model_text = "Pilot" + req_access = null + req_one_access = list(access_explorer) + +// Putting this here in order to not disrupt existing maps/downstreams. +/turf/simulated/open + dynamic_lighting = TRUE \ No newline at end of file diff --git a/maps/cynosure/cynosure_shuttles.dm b/maps/cynosure/cynosure_shuttles.dm index 6614402000..8fd4e9b0a5 100644 --- a/maps/cynosure/cynosure_shuttles.dm +++ b/maps/cynosure/cynosure_shuttles.dm @@ -261,7 +261,7 @@ landmark_station = "escape_station" landmark_transition = "escape_transit"; docking_controller_tag = "escape_shuttle" - ceiling_type = /turf/simulated/floor/reinforced/ + ceiling_type = /turf/simulated/floor/reinforced move_time = SHUTTLE_TRANSIT_DURATION_RETURN /obj/effect/shuttle_landmark/cynosure/escape/offsite diff --git a/maps/cynosure/datums/random_map.dm b/maps/cynosure/datums/random_map.dm new file mode 100644 index 0000000000..9ae314f624 --- /dev/null +++ b/maps/cynosure/datums/random_map.dm @@ -0,0 +1,144 @@ +/turf/simulated/floor/outdoors/mask // Used solely as a placeholder to avoid changeturf. + +/datum/random_map/noise/sif + descriptor = "Sif plains (roundstart)" + smoothing_iterations = 3 + target_turf_type = /turf/simulated/floor/outdoors/mask + smooth_single_tiles = TRUE + var/refresh_icons_post_apply = TRUE + +/datum/random_map/noise/sif/cleanup() + ..() + // Round down to 1-9. + for(var/x = 1, x <= limit_x, x++) + for(var/y = 1, y <= limit_y, y++) + var/current_cell = get_map_cell(x,y) + var/current_val = map[current_cell] + map[current_cell] = min(9,max(0,round((current_val/cell_range)*10))) + +/datum/random_map/noise/sif/apply_to_map() + ..() + if(refresh_icons_post_apply) + for(var/x = 1, x <= limit_x, x++) + for(var/y = 1, y <= limit_y, y++) + var/turf/simulated/floor/outdoors/T = locate((origin_x-1)+x,(origin_y-1)+y,origin_z) + if(istype(T)) + T.update_icon() + +/datum/random_map/noise/sif/get_appropriate_path(var/value) + switch(value) + if(0) + return /turf/simulated/floor/outdoors/mud/sif/planetuse + if(1 to 2) + return /turf/simulated/floor/outdoors/dirt/sif/planetuse + if(3 to 5) + return /turf/simulated/floor/outdoors/grass/sif/planetuse + if(6 to 8) + return /turf/simulated/floor/outdoors/grass/sif/forest/planetuse + if(9) + return /turf/simulated/floor/outdoors/snow/sif/planetuse + +/datum/random_map/noise/sif/get_additional_spawns(var/value, var/turf/T) + if(prob(45) || T.check_density()) + return + switch(value) + if(1 to 2) + if(prob(1)) + new /obj/structure/flora/sif/eyes(T) + else if(prob(1)) + new /obj/structure/flora/mushroom(T) + if(3 to 4) + if(prob(1)) + new /obj/structure/flora/sif/eyes(T) + else if(prob(1)) + new /obj/structure/flora/sif/tendrils(T) + else if(prob(1)) + new /obj/structure/flora/mushroom(T) + if(5 to 6) + if(prob(1)) + new /obj/structure/flora/tree/sif(T) + else if(prob(1)) + new /obj/structure/flora/sif/tendrils(T) + else if(prob(1)) + new /obj/structure/flora/sif/frostbelle(T) + else if (prob(1)) + new /obj/structure/flora/sif/eyes(T) + if(7 to 8) + if(prob(5)) + new /obj/structure/flora/tree/sif(T) + else if(prob(1)) + new /obj/structure/flora/sif/frostbelle(T) + else if(prob(1)) + new /obj/structure/flora/sif/eyes(T) + else if(prob(1)) + new /obj/structure/flora/sif/tendrils(T) + +/datum/random_map/noise/sif/forest + descriptor = "Sif forest (roundstart)" + +/datum/random_map/noise/sif/forest/get_appropriate_path(var/value) + switch(value) + if(0 to 3) + return /turf/simulated/floor/outdoors/grass/sif/planetuse + if(4 to 6) + return /turf/simulated/floor/outdoors/grass/sif/forest/planetuse + if(7 to 9) + return /turf/simulated/floor/outdoors/snow/sif/planetuse + +/datum/random_map/noise/sif/forest/get_additional_spawns(var/value, var/turf/T) + if(prob(25) || T.check_density()) + return + switch(value) + if(0 to 5) + if(value >= 3 && prob(5)) + new /obj/structure/flora/tree/sif(T) + return + if(prob(1)) + new /obj/structure/flora/sif/eyes(T) + else if(prob(1)) + new /obj/structure/flora/sif/tendrils(T) + else if(prob(1)) + new /obj/structure/flora/mushroom(T) + if(6 to 9) + if(prob((value <= 7) ? 15 : 35)) + new /obj/structure/flora/tree/sif(T) + return + if(prob(1)) + new /obj/structure/flora/sif/frostbelle(T) + else if(prob(1)) + new /obj/structure/flora/sif/eyes(T) + else if(prob(1)) + new /obj/structure/flora/sif/tendrils(T) + +/datum/random_map/noise/sif/underground + descriptor = "Sif underground (roundstart)" + target_turf_type = /turf/simulated/mineral/sif + skip_dense = TRUE + keep_outside = TRUE + refresh_icons_post_apply = FALSE + +/datum/random_map/noise/sif/underground/get_appropriate_path(var/value) + switch(value) + if(0 to 2) + return /turf/simulated/floor/outdoors/mud/sif/planetuse + if(3 to 4) + return /turf/simulated/floor/outdoors/dirt/sif/planetuse + +/datum/random_map/noise/sif/underground/get_additional_spawns(var/value, var/turf/T) + if(value <= 1 && prob(30)) // Mud is very fun-gy. + new /obj/structure/flora/mushroom(T) + else if(!prob(30)) + var/mushroom_prob = 0 + switch(value) + if(2) + mushroom_prob = 8 + if(3) + mushroom_prob = 4 + if(4 to 6) + mushroom_prob = 2 + if(7) + mushroom_prob = 1 + if(mushroom_prob && prob(mushroom_prob)) + new /obj/structure/flora/mushroom(T) + else if(prob(0.1)) + new /obj/structure/flora/sif/subterranean(T) diff --git a/maps/cynosure/overmap/sectors.dm b/maps/cynosure/overmap/sectors.dm new file mode 100644 index 0000000000..968a30544c --- /dev/null +++ b/maps/cynosure/overmap/sectors.dm @@ -0,0 +1,50 @@ +// Overmap object for Sif, hanging in the void of space +/obj/effect/overmap/visitable/planet/Sif + name = "Sif" + desc = "A cold, Earth-like planet. Cynosure Station is located here." + map_z = list( + Z_LEVEL_STATION_ONE, + Z_LEVEL_STATION_TWO, + Z_LEVEL_STATION_THREE, + Z_LEVEL_SURFACE_WILD + ) + base = 1 + in_space = 0 + start_x = 10 + start_y = 10 + skybox_offset_x = 128 + skybox_offset_y = 128 + surface_color = "#2D545B" + mountain_color = "#735555" + ice_color = "FFFFFF" + icecaps = "icecaps" + initial_generic_waypoints = list( + "nav_pad3_cynosure", //Northwest Pad 3, + "nav_pad4_cynosure" //Northwest Pad 4 + ) + + +/obj/effect/overmap/visitable/planet/Sif/Initialize() + atmosphere = new(CELL_VOLUME) + atmosphere.adjust_gas_temp("oxygen", MOLES_O2STANDARD, 273) + atmosphere.adjust_gas_temp("nitrogen", MOLES_N2STANDARD, 273) + + . = ..() + + docking_codes = null + +/obj/effect/overmap/visitable/planet/Sif/get_skybox_representation() + var/image/tmp = ..() + tmp.pixel_x = skybox_offset_x + tmp.pixel_y = skybox_offset_y + return tmp +/obj/effect/overmap/visitable/telecomm_sat + name = "Telecommunications Satellite" + icon_state = "object" + initial_generic_waypoints = list( + "nav_telecomm_dockarm" //Tcomm sat docking + ) + in_space = 1 + start_x = 10 + start_y = 10 + map_z = list(Z_LEVEL_TCOMM, Z_LEVEL_EMPTY_SPACE) diff --git a/maps/cynosure/submaps/16x11/OldDorms.dmm b/maps/cynosure/submaps/16x11/OldDorms.dmm new file mode 100644 index 0000000000..42598f0135 --- /dev/null +++ b/maps/cynosure/submaps/16x11/OldDorms.dmm @@ -0,0 +1,101 @@ +"aF" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/tiled/dark,/area/template_noop) +"aK" = (/turf/simulated/floor/tiled/freezer,/area/template_noop) +"bo" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/item/stack/tile/floor,/turf/simulated/floor/plating,/area/template_noop) +"bt" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/obj/machinery/light{dir = 4},/turf/simulated/floor/plating,/area/template_noop) +"bx" = (/obj/structure/bed/chair/sofa/beige/right{dir = 4},/turf/simulated/floor/wood/broken,/area/template_noop) +"bI" = (/obj/machinery/vending/snack{dir = 4},/turf/simulated/floor/tiled/dark,/area/template_noop) +"cy" = (/obj/structure/closet/wardrobe/pjs,/turf/simulated/floor/tiled/dark,/area/template_noop) +"cD" = (/obj/item/weapon/camera_assembly,/turf/simulated/floor/tiled,/area/template_noop) +"cL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 10},/obj/effect/floor_decal/steeldecal/steel_decals4,/turf/simulated/floor/tiled,/area/template_noop) +"df" = (/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/curtain/open/shower,/obj/structure/windoor_assembly,/turf/simulated/floor/tiled/freezer,/area/template_noop) +"dm" = (/obj/random/obstruction,/turf/simulated/floor/tiled/dark,/area/template_noop) +"dr" = (/obj/machinery/shower{pixel_y = 3},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/southright{name = "Shower"},/obj/structure/curtain/open/shower,/turf/simulated/floor/tiled/freezer,/area/template_noop) +"el" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/item/stack/tile/floor,/obj/item/device/radio/intercom{dir = 1; pixel_y = 21},/turf/simulated/floor/plating,/area/template_noop) +"eH" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/item/frame/mirror,/turf/simulated/floor/tiled/freezer,/area/template_noop) +"eO" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/wood,/area/template_noop) +"eQ" = (/turf/simulated/floor/tiled,/area/template_noop) +"fe" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/plating,/area/template_noop) +"fI" = (/obj/structure/closet/crate/engineering,/obj/random/contraband,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/structure/sign/poster{dir = 4; pixel_x = 32; poster_decl = /decl/poster/bay_29},/obj/item/frame/apc,/obj/item/frame/light,/turf/simulated/floor/tiled,/area/template_noop) +"if" = (/turf/simulated/floor/plating,/area/template_noop) +"iM" = (/obj/machinery/alarm{dir = 4; pixel_x = -22},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/template_noop) +"jy" = (/obj/machinery/computer/guestpass{pixel_y = 30},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/template_noop) +"jV" = (/obj/structure/closet/cabinet,/obj/random/contraband,/obj/random/drinkbottle,/obj/item/weapon/melee/umbrella/random,/turf/simulated/floor/wood,/area/template_noop) +"ku" = (/obj/structure/table/standard,/obj/random/tool,/turf/simulated/floor/plating,/area/template_noop) +"lo" = (/obj/structure/firedoor_assembly,/turf/simulated/floor/tiled/steel_grid,/area/template_noop) +"lB" = (/obj/structure/table/standard,/obj/machinery/light_construct{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/obj/item/device/flashlight/lamp/green,/turf/simulated/floor/wood,/area/template_noop) +"mk" = (/obj/structure/table/standard,/obj/machinery/microwave,/turf/simulated/floor/wood,/area/template_noop) +"mP" = (/obj/structure/door_assembly,/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood/broken,/area/template_noop) +"mQ" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1},/obj/item/stack/cable_coil,/turf/simulated/floor/plating,/area/template_noop) +"nY" = (/obj/machinery/newscaster{pixel_y = -28},/turf/simulated/floor/plating,/area/template_noop) +"oR" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber,/obj/item/poster/custom,/turf/simulated/floor/wood,/area/template_noop) +"pj" = (/obj/item/tape/engineering,/obj/structure/disposalpipe/broken,/obj/structure/cable{d2 = 2; icon_state = "0-2"},/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers,/obj/machinery/atmospherics/pipe/cap/hidden/supply,/turf/simulated/floor/plating,/area/template_noop) +"qb" = (/obj/structure/closet/wardrobe/suit,/turf/simulated/floor/tiled/dark,/area/template_noop) +"qG" = (/obj/machinery/vending/fitness{dir = 4},/turf/simulated/floor/tiled/dark,/area/template_noop) +"su" = (/obj/structure/closet/wardrobe/mixed,/turf/simulated/floor/tiled/dark,/area/template_noop) +"sx" = (/obj/structure/toilet,/turf/simulated/floor/tiled/freezer,/area/template_noop) +"up" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4},/turf/simulated/floor/tiled,/area/template_noop) +"vL" = (/turf/simulated/floor/wood/broken,/area/template_noop) +"wm" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/wood,/area/template_noop) +"xc" = (/obj/structure/closet/wardrobe/xenos,/turf/simulated/floor/tiled/dark,/area/template_noop) +"xv" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/wood,/area/template_noop) +"xI" = (/obj/structure/bed/double,/obj/item/device/radio/intercom{dir = 1; pixel_y = 21},/turf/simulated/floor/wood/broken,/area/template_noop) +"zm" = (/obj/item/weapon/stool,/turf/simulated/floor/plating,/area/template_noop) +"zr" = (/obj/effect/graffitispawner{color = "#00B7EF"; color_secondary = "#0082A8"; graffiti_type = "amyjon"},/turf/simulated/floor/tiled/freezer,/area/template_noop) +"zO" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 8},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled,/area/template_noop) +"zX" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/item/taperoll/engineering,/turf/simulated/floor/tiled,/area/template_noop) +"zZ" = (/obj/machinery/light{dir = 1},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/plating,/area/template_noop) +"Ag" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood,/area/template_noop) +"Bj" = (/obj/machinery/newscaster{pixel_y = -28},/turf/simulated/floor/wood,/area/template_noop) +"BS" = (/obj/structure/cable{d2 = 4; icon_state = "0-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/machinery/light_switch{pixel_x = 12; pixel_y = 24},/obj/machinery/power/apc{dir = 1; name = "north bump"; operating = 0; pixel_y = 24},/turf/simulated/floor/plating,/area/template_noop) +"Cb" = (/obj/structure/table/standard,/obj/random/toolbox,/turf/simulated/floor/plating,/area/template_noop) +"CK" = (/obj/machinery/door/airlock{name = "Restroom"},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled/steel_grid,/area/template_noop) +"CQ" = (/obj/structure/table/standard,/obj/random/soap,/obj/item/weapon/towel/random,/turf/simulated/floor/tiled/freezer,/area/template_noop) +"Di" = (/obj/item/stack/tile/floor,/turf/simulated/floor/plating,/area/template_noop) +"DA" = (/obj/machinery/vending/coffee{dir = 4},/turf/simulated/floor/tiled/dark,/area/template_noop) +"DV" = (/turf/template_noop,/area/template_noop) +"Eo" = (/turf/simulated/floor/wood,/area/template_noop) +"Fn" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/turf/simulated/floor/tiled,/area/template_noop) +"FE" = (/obj/structure/sink{dir = 8; pixel_x = -12; pixel_y = 2},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/freezer,/area/template_noop) +"FP" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled/dark,/area/template_noop) +"GY" = (/obj/effect/floor_decal/spline/plain{dir = 4},/obj/effect/floor_decal/steeldecal/steel_decals_central4{dir = 4},/obj/item/weapon/stool{dir = 1},/turf/simulated/floor/tiled,/area/template_noop) +"It" = (/obj/machinery/newscaster{pixel_y = 26},/turf/simulated/floor/wood,/area/template_noop) +"IJ" = (/obj/structure/disposalpipe/segment,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/turf/simulated/floor/plating,/area/template_noop) +"Jm" = (/obj/structure/closet/cabinet,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/item/clothing/under/dress/maid/sexy,/obj/item/clothing/head/kitty,/obj/random/maintenance/clean,/turf/simulated/floor/wood,/area/template_noop) +"Lz" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/tiled,/area/template_noop) +"LZ" = (/obj/structure/table/standard,/obj/item/frame,/turf/simulated/floor/wood,/area/template_noop) +"MG" = (/obj/machinery/vending/cola{dir = 4},/turf/simulated/floor/tiled/dark,/area/template_noop) +"MI" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/donkpockets{pixel_x = 3; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1},/turf/simulated/floor/wood,/area/template_noop) +"NW" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 1},/turf/simulated/floor/plating,/area/template_noop) +"Od" = (/obj/structure/bed/chair/sofa/beige/right{dir = 4},/obj/item/frame/apc,/turf/simulated/floor/wood,/area/template_noop) +"QN" = (/turf/simulated/wall,/area/template_noop) +"QT" = (/obj/structure/table/standard,/obj/machinery/light_construct{dir = 4},/obj/machinery/atmospherics/unary/vent_pump{dir = 8},/turf/simulated/floor/wood,/area/template_noop) +"Rm" = (/obj/structure/closet/wardrobe/grey,/turf/simulated/floor/tiled/dark,/area/template_noop) +"Ru" = (/obj/item/frame/light{dir = 4},/turf/simulated/floor/tiled/freezer,/area/template_noop) +"SS" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor/plating,/area/template_noop) +"Td" = (/obj/structure/toilet{dir = 1},/turf/simulated/floor/tiled/freezer,/area/template_noop) +"TQ" = (/obj/structure/table/standard,/obj/item/weapon/coin/silver,/obj/item/clothing/head/soft/grey{pixel_x = -2; pixel_y = 3},/turf/simulated/floor/plating,/area/template_noop) +"Ul" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/template_noop) +"Vt" = (/obj/structure/bed/chair/sofa/beige/left{dir = 4},/turf/simulated/floor/wood,/area/template_noop) +"Xg" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/tiled/dark,/area/template_noop) +"Xi" = (/obj/structure/table/standard,/obj/item/frame,/turf/simulated/floor/plating,/area/template_noop) +"Xz" = (/obj/item/frame/extinguisher_cabinet,/turf/simulated/floor/tiled/dark,/area/template_noop) +"Yu" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/wood,/area/template_noop) +"YN" = (/obj/structure/bed/double/padded,/obj/item/weapon/bedsheet/browndouble,/obj/item/weapon/handcuffs/fuzzy{pixel_x = -5},/obj/item/device/radio/intercom{pixel_y = -21},/turf/simulated/floor/wood,/area/template_noop) +"YR" = (/obj/item/weapon/stool/padded{dir = 1},/turf/simulated/floor/plating,/area/template_noop) +"Zv" = (/obj/machinery/door/airlock{name = "Dorm 2"},/obj/machinery/door/firedoor/border_only,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/wood/broken,/area/template_noop) +"ZB" = (/obj/structure/closet/wardrobe/black,/obj/machinery/light,/turf/simulated/floor/tiled/dark,/area/template_noop) +"ZD" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/plating,/area/template_noop) + +(1,1,1) = {" +QNQNQNQNQNQNQNpjQNQNQNQNQNQNQNDV +QNbIifzZjyelBSUlQNVtItxIQNQNQNQN +QNDADiNWzmifmQSSQNOdYuQTQNeHsxQN +QNMGifDiTQXiDifemPAgwmEoCKaKRuQN +QNqGififkuCbZDIJQNLZMIjVQNCQdfQN +QNFPDiifnYYRbobtQNQNQNQNQNQNQNQN +QNXzeQcDQNQNiMfIQNmkoRJmQNCQdrQN +QNaFeQGYdmdmzOcLZvAgxvvLloaKzrQN +QNXgupLzLzLzzXFnQNVteOlBQNFETdQN +QNQNqbZBRmsucyxcQNbxBjYNQNQNQNQN +DVQNQNQNQNQNQNQNQNQNQNQNQNQNQNDV +"} diff --git a/maps/cynosure/submaps/7x7/FightClub.dmm b/maps/cynosure/submaps/7x7/FightClub.dmm new file mode 100644 index 0000000000..6c3aa68b65 --- /dev/null +++ b/maps/cynosure/submaps/7x7/FightClub.dmm @@ -0,0 +1,32 @@ +"a" = (/obj/structure/sign/poster/custom{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_14},/turf/template_noop,/area/template_noop) +"i" = (/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/obj/item/weapon/cell/high/empty,/turf/simulated/floor/plating,/area/template_noop) +"m" = (/obj/structure/railing,/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/template_noop) +"o" = (/turf/simulated/wall{can_open = 1},/area/template_noop) +"u" = (/obj/structure/railing{dir = 4},/turf/simulated/floor/plating,/area/template_noop) +"y" = (/obj/structure/railing{dir = 1},/turf/simulated/floor/plating,/area/template_noop) +"z" = (/obj/structure/railing{dir = 8},/obj/structure/railing,/turf/simulated/floor/plating,/area/template_noop) +"C" = (/turf/simulated/wall/r_wall,/area/template_noop) +"D" = (/obj/structure/railing{dir = 4},/obj/structure/railing,/turf/simulated/floor/plating,/area/template_noop) +"F" = (/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_11},/turf/simulated/floor/plating,/area/template_noop) +"G" = (/obj/random/trash,/turf/simulated/floor/plating,/area/template_noop) +"I" = (/obj/random/crate,/obj/random/contraband,/obj/random/contraband,/obj/random/maintenance/engineering,/obj/random/maintenance/security,/obj/random/maintenance/security,/turf/simulated/floor/plating,/area/template_noop) +"J" = (/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/pol_16},/turf/simulated/floor/plating,/area/template_noop) +"L" = (/obj/random/crate,/obj/random/plushie,/obj/random/maintenance/clean,/obj/random/medical,/obj/random/medical/lite,/obj/random/medical/lite,/turf/simulated/floor/plating,/area/template_noop) +"N" = (/turf/simulated/floor/plating,/area/template_noop) +"O" = (/turf/simulated/wall,/area/template_noop) +"P" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/template_noop) +"Q" = (/obj/item/clothing/gloves/boxing/yellow,/obj/item/clothing/gloves/boxing/green,/obj/item/clothing/gloves/boxing/blue,/obj/item/clothing/gloves/boxing,/obj/structure/table/rack,/turf/simulated/floor/plating,/area/template_noop) +"W" = (/obj/structure/railing{dir = 4},/obj/structure/railing{dir = 1},/obj/effect/decal/cleanable/blood,/turf/simulated/floor/plating,/area/template_noop) +"X" = (/obj/random/mouseremains,/turf/simulated/floor/plating,/area/template_noop) +"Y" = (/obj/structure/railing{dir = 8},/obj/structure/railing{dir = 1},/turf/simulated/floor/plating,/area/template_noop) +"Z" = (/obj/structure/railing{dir = 8},/turf/simulated/floor/plating,/area/template_noop) + +(1,1,1) = {" +OCCCCCC +OGJPFNO +ONYyWNO +oNZNuNX +ONzmDNO +OOLIQiO +aOOOOOO +"} diff --git a/maps/cynosure/submaps/8x9/MouseHouse.dmm b/maps/cynosure/submaps/8x9/MouseHouse.dmm new file mode 100644 index 0000000000..f12e330ee4 --- /dev/null +++ b/maps/cynosure/submaps/8x9/MouseHouse.dmm @@ -0,0 +1,45 @@ +"a" = (/turf/simulated/wall,/area/template_noop) +"b" = (/obj/effect/decal/remains/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"c" = (/turf/simulated/wall{can_open = 1},/area/template_noop) +"e" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/random/plushie,/turf/simulated/floor/wood,/area/template_noop) +"f" = (/obj/structure/dogbed,/obj/effect/decal/remains/mouse,/obj/item/weapon/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"k" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/powercell,/turf/simulated/floor/wood,/area/template_noop) +"l" = (/obj/random/plushielarge,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"m" = (/turf/template_noop,/area/template_noop) +"n" = (/obj/structure/dogbed,/obj/machinery/light/small{dir = 1},/obj/item/weapon/reagent_containers/glass/rag,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"o" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance,/obj/random/drinksoft,/obj/random/snack,/turf/simulated/floor/wood,/area/template_noop) +"p" = (/obj/machinery/door/window/westright,/turf/simulated/floor/wood,/area/template_noop) +"t" = (/obj/item/trash/cookiesnack,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"u" = (/obj/structure/flora/pottedplant/overgrown,/turf/simulated/floor/wood,/area/template_noop) +"v" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 4},/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"w" = (/obj/machinery/door/window/northleft,/obj/structure/window/basic{dir = 8},/turf/simulated/floor/wood/broken,/area/template_noop) +"y" = (/turf/simulated/floor/wood/broken,/area/template_noop) +"z" = (/obj/machinery/papershredder,/turf/simulated/floor/wood,/area/template_noop) +"B" = (/obj/structure/dogbed,/obj/random/plushie,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"F" = (/obj/item/weapon/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/obj/structure/sink/generic{dir = 4; pixel_x = -12; pixel_y = -4},/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"G" = (/obj/item/trash/semki,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"H" = (/obj/structure/sign/poster{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_49},/turf/simulated/floor/wood,/area/template_noop) +"J" = (/obj/item/weapon/beach_ball,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"K" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood,/area/template_noop) +"L" = (/obj/item/trash/candy,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"M" = (/obj/structure/window/basic{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/template_noop) +"O" = (/obj/machinery/light/small,/turf/simulated/floor/wood,/area/template_noop) +"R" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/vore_91},/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"S" = (/obj/item/weapon/shreddedp,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop) +"V" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/mouse,/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"W" = (/obj/structure/loot_pile/maint/trash,/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/template_noop) +"X" = (/turf/simulated/floor/carpet/bcarpet,/area/template_noop) +"Z" = (/turf/simulated/floor/wood,/area/template_noop) + +(1,1,1) = {" +aaaaaaaa +aVBnRfVa +aGXXXXXa +aFSXXlXa +avbLJSta +aMTkoewa +aHKyKZpa +azWZOuaa +aaacaaam +"} diff --git a/maps/cynosure/submaps/8x9/ReptileRoom.dmm b/maps/cynosure/submaps/8x9/ReptileRoom.dmm new file mode 100644 index 0000000000..144188a834 --- /dev/null +++ b/maps/cynosure/submaps/8x9/ReptileRoom.dmm @@ -0,0 +1,42 @@ +"a" = (/turf/simulated/wall,/area/template_noop) +"c" = (/turf/simulated/wall{can_open = 1},/area/template_noop) +"h" = (/obj/effect/decal/remains/lizard,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"k" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance/engineering,/obj/random/maintenance/engineering,/obj/random/maintenance/clean,/obj/random/maintenance/clean,/obj/random/powercell,/turf/simulated/floor/wood,/area/template_noop) +"m" = (/turf/template_noop,/area/template_noop) +"n" = (/obj/structure/dogbed,/obj/structure/sign/poster{dir = 1; pixel_y = 32; poster_decl = /decl/poster/vore_45},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"o" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/random/maintenance,/obj/random/drinksoft,/obj/random/snack,/turf/simulated/floor/wood,/area/template_noop) +"p" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard/large,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"u" = (/obj/structure/flora/pottedplant/overgrown,/turf/simulated/floor/wood,/area/template_noop) +"v" = (/obj/machinery/door/window/westright,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/template_noop) +"w" = (/obj/structure/sign/poster{dir = 8; pixel_x = -32; poster_decl = /decl/poster/bay_19},/turf/simulated/floor/wood/broken,/area/template_noop) +"x" = (/obj/machinery/light/small{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"z" = (/obj/structure/loot_pile/maint/trash,/turf/simulated/floor/wood,/area/template_noop) +"B" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard,/obj/item/trash/unajerky,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"E" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/structure/bedsheetbin,/obj/random/plushie,/turf/simulated/floor/wood,/area/template_noop) +"G" = (/obj/machinery/light/small{dir = 8},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"I" = (/obj/item/weapon/reagent_containers/food/snacks/wishsoup{pixel_y = -6},/obj/structure/sink/generic{dir = 4; pixel_x = -12; pixel_y = -4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"L" = (/obj/item/trash/sosjerky,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"M" = (/obj/structure/window/basic{dir = 1},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/wood,/area/template_noop) +"N" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/simulated/floor/wood,/area/template_noop) +"O" = (/obj/machinery/light/small,/obj/item/stack/emptysandbag,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood/broken,/area/template_noop) +"P" = (/obj/machinery/door/window/northleft,/obj/structure/window/basic{dir = 8},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/wood,/area/template_noop) +"R" = (/obj/structure/disposalpipe/trunk,/obj/structure/disposaloutlet{dir = 4},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"T" = (/obj/structure/window/basic{dir = 1},/obj/structure/table/standard,/obj/item/device/flashlight/lamp/green,/obj/item/weapon/paper_bin{pixel_x = 1; pixel_y = 9},/turf/simulated/floor/wood,/area/template_noop) +"U" = (/obj/item/toy/plushie/lizard,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"V" = (/obj/machinery/space_heater,/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"W" = (/obj/item/stack/sandbags,/obj/machinery/power/apc{coverlocked = 0; locked = 0; name = "south bump"; operating = 0; pixel_y = -24},/turf/simulated/floor/wood,/area/template_noop) +"X" = (/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"Y" = (/obj/structure/dogbed,/mob/living/simple_mob/animal/passive/lizard,/obj/machinery/light/small{dir = 1},/turf/simulated/mineral/floor/ignore_mapgen,/area/template_noop) +"Z" = (/turf/simulated/floor/wood,/area/template_noop) + +(1,1,1) = {" +aaaaaaaa +aVBnYpVa +aGXXXLXa +aIXUXXxa +aRXXXhXa +aMTkoEPa +awNZNZva +azWZOuaa +aaacaaam +"} diff --git a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm index f08d716e93..a1f2dbd4cf 100644 --- a/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm +++ b/maps/expedition_vr/aerostat/_aerostat_science_outpost.dm @@ -280,6 +280,14 @@ VIRGO2_TURF_CREATE(/turf/simulated/floor/hull) name = "Firing Range" icon_state = "orawhisqu" +/area/offmap/aerostat/inside/miscstorage + name = "Miscellaneous Storage" + icon_state = "orawhisqu" + +/area/offmap/aerostat/inside/virology + name = "Virology Lab" + icon_state = "yelwhicir" + /area/offmap/aerostat/inside/south name = "Miscellaneous Labs A" icon_state = "blublasqu" diff --git a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm index 1f476ba593..49d0f2963b 100644 --- a/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm +++ b/maps/expedition_vr/aerostat/aerostat_science_outpost.dmm @@ -195,6 +195,15 @@ }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) +"aA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "aB" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/industrial/warning/dust{ @@ -216,11 +225,11 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/airlock/west) "aF" = ( -/obj/machinery/atmospherics/unary/heat_exchanger, -/obj/structure/window/basic, -/obj/effect/floor_decal/corner/red/border, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/toxins) +/obj/machinery/atmospherics/unary/freezer{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/northchamb) "aG" = ( /obj/machinery/power/solar, /obj/effect/floor_decal/rust, @@ -229,16 +238,19 @@ }, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) -"aH" = ( -/turf/simulated/wall, -/area/offmap/aerostat/inside/misclab) "aI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue, +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "aJ" = ( /obj/effect/decal/cleanable/cobweb, -/obj/machinery/telecomms/relay/preset/sd, +/obj/machinery/telecomms/relay/preset/station, /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) @@ -418,7 +430,10 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/north) "bj" = ( -/obj/effect/floor_decal/industrial/warning/dust, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "bk" = ( @@ -454,16 +469,6 @@ }, /turf/simulated/floor, /area/offmap/aerostat/inside/airlock/north) -"bm" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) "bn" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -497,15 +502,13 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/north) "bq" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/vending/fitness{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "br" = ( @@ -558,11 +561,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) -"bx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/reinforced, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) "bz" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -586,9 +584,6 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "bC" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Toxins Lab" - }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 4 }, @@ -596,24 +591,27 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/toxins) +/turf/simulated/wall, +/area/offmap/aerostat/inside/xenoarch) "bE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, /turf/simulated/wall/r_wall, /area/offmap/aerostat/inside/xenoarch) +"bF" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "bG" = ( -/obj/structure/table/standard, -/obj/item/stack/cable_coil, -/obj/item/weapon/tool/wirecutters, -/obj/item/stack/cable_coil, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/tank/phoron, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access = list(7) + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "bI" = ( @@ -677,15 +675,11 @@ /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) -"bO" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) "bP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red, /obj/machinery/meter, @@ -697,11 +691,8 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "bR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -714,20 +705,6 @@ }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) -"bT" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "bU" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 @@ -742,7 +719,7 @@ dir = 4 }, /turf/simulated/wall, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "bW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 9 @@ -789,6 +766,12 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) +"ci" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/northchamb) "cj" = ( /obj/structure/closet/emcloset, /turf/simulated/shuttle/floor/yellow, @@ -828,7 +811,6 @@ /obj/structure/cable/heavyduty{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "cp" = ( @@ -847,6 +829,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "cr" = ( @@ -866,6 +851,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/xenoarch) +"cs" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/miscstorage) "ct" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -935,14 +926,12 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/arm/nw) "cz" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 9 }, +/obj/structure/closet/wardrobe/genetics_white, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/genetics) "cA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/green, /turf/simulated/floor/tiled/techfloor, @@ -960,6 +949,12 @@ /obj/machinery/meter, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) +"cD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "cE" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/black, /turf/simulated/floor/tiled/techfloor, @@ -968,8 +963,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 6 }, +/obj/machinery/light, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) +"cG" = ( +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "cI" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -1006,6 +1012,20 @@ }, /turf/simulated/floor, /area/offmap/aerostat/inside/arm/sw) +"cM" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/storage/lockbox/vials, +/obj/item/weapon/storage/fancy/vials, +/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "cO" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -1033,6 +1053,12 @@ }, /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) +"cQ" = ( +/obj/structure/dispenser{ + phorontanks = 0 + }, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/drillstorage) "cR" = ( /obj/structure/bed/chair/sofa/purp/left, /obj/structure/sign/painting/public{ @@ -1040,6 +1066,10 @@ }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) +"cT" = ( +/obj/machinery/smartfridge/chemistry/virology, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "cU" = ( /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/sw) @@ -1059,12 +1089,15 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch/chamber) "cX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "cZ" = ( @@ -1289,6 +1322,19 @@ }, /turf/simulated/floor, /area/offmap/aerostat/inside/arm/ne) +"dz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/window/basic, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/heat_exchanger, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/toxins) "dA" = ( /obj/effect/floor_decal/rust, /obj/effect/decal/cleanable/blood, @@ -1352,8 +1398,24 @@ /area/offmap/aerostat/solars) "dH" = ( /obj/structure/table/standard, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/parachute{ + pixel_x = -6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/telesci) +/area/offmap/aerostat/inside/miscstorage) "dI" = ( /obj/machinery/power/solar, /obj/effect/floor_decal/industrial/warning/dust, @@ -1517,12 +1579,8 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/arm/nw) "dY" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/shuttle/wall/voidcraft/green, +/area/offmap/aerostat/inside/atmos) "dZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable{ @@ -1561,6 +1619,8 @@ /area/offmap/aerostat/inside/airlock/east) "ed" = ( /obj/machinery/light, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/mining/brace, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) "ef" = ( @@ -1568,7 +1628,7 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "ei" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -1586,39 +1646,55 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/easthall) "el" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/machinery/atmospherics/pipe/tank/phoron{ dir = 8 }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 23 - }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "er" = ( /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) +"ev" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/storage/box/monkeycubes, +/obj/item/weapon/storage/box/monkeycubes/wolpincubes, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "ey" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "ez" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/xenoarch) +"eA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/wall, -/area/offmap/aerostat/inside/toxins) +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 5 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/firingrange) "eE" = ( /obj/structure/bed/chair/sofa/purp/right, /obj/structure/sign/painting/public{ @@ -1643,6 +1719,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/xenoarch) +"eJ" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "eL" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/yellow{ @@ -1652,37 +1734,45 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "eM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/black, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "eN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/wall, /area/offmap/aerostat/inside/firingrange) "eO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ - dir = 1 +/obj/machinery/atmospherics/pipe/manifold/hidden/red{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "eP" = ( /obj/machinery/camera/network/research_outpost{ dir = 4 }, -/obj/structure/flora/pottedplant/unusual, +/obj/structure/bed/chair/sofa/purp/left{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "eR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_research{ + name = "Xenoarchaeology Storage" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/xenoarch) "eT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1694,34 +1784,35 @@ /obj/effect/floor_decal/industrial/warning{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "eV" = ( /obj/structure/sign/painting/public{ pixel_x = -30 }, +/obj/structure/bed/chair/sofa/purp/right{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "eW" = ( /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "eX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "eZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "fa" = ( @@ -1735,6 +1826,14 @@ "fb" = ( /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/ne) +"fc" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "fe" = ( /obj/effect/decal/cleanable/cobweb2, /obj/effect/floor_decal/rust, @@ -1754,8 +1853,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 4 }, +/obj/machinery/light, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "fg" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -1767,18 +1867,37 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "fh" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/xenoarch) "fi" = ( -/obj/structure/table/standard, -/obj/machinery/computer/atmoscontrol/laptop{ - monitored_alarm_ids = list("anomaly_testing"); - req_one_access = list(47,24,11) +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/wall, /area/offmap/aerostat/inside/xenoarch) "fj" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -1797,37 +1916,43 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/north) "fn" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/wall, /area/offmap/aerostat/inside/xenoarch) "fo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "fp" = ( /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) +"fr" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/drillstorage) "ft" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/machinery/vending/sovietsoda{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "fw" = ( @@ -1841,16 +1966,16 @@ /area/offmap/aerostat/inside/southchamb) "fx" = ( /obj/structure/bed/chair/office/light{ - dir = 4 + dir = 1 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) -"fA" = ( -/obj/machinery/light/small{ - dir = 1 +"fC" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "fD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -1872,6 +1997,9 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "fI" = ( @@ -1887,12 +2015,12 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "fJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) @@ -1921,20 +2049,22 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/arm/nw) +"fP" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "fQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "fR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/portable_atmospherics/powered/scrubber, +/turf/simulated/floor/plating, +/area/offmap/aerostat/inside/toxins) "fS" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -1949,12 +2079,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/chem_master, +/obj/machinery/camera/network/research_outpost{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "fV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/wall, /area/offmap/aerostat/inside/atmos) "fW" = ( @@ -1967,13 +2104,26 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/airlock/north) +"fX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/window/reinforced/full, +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "fY" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "ga" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -1981,6 +2131,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) +"gb" = ( +/obj/machinery/computer/centrifuge, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "gd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -2000,7 +2154,7 @@ /turf/simulated/shuttle/wall/voidcraft/hard_corner{ stripe_color = "#00FF00" }, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/westhall) "gh" = ( /obj/machinery/atmospherics/binary/pump/on{ dir = 1 @@ -2021,8 +2175,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) +"gl" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/miscstorage) "gs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -2049,11 +2218,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/floor_decal/rust, +/obj/structure/sign/poster{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "gx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) "gy" = ( /obj/structure/closet/crate/bin{ @@ -2061,6 +2238,17 @@ }, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) +"gz" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_research{ + name = "Telescience" + }, +/obj/machinery/door/blast/regular/open{ + id = telesci_blast; + name = "Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/offmap/aerostat/inside/telesci) "gC" = ( /obj/machinery/alarm{ pixel_y = 26 @@ -2074,33 +2262,31 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -28 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/anomaly_container, +/obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "gG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/machinery/atmospherics/portables_connector{ + dir = 8 }, +/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"gK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/atmos) "gL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/cable/heavyduty{ + icon_state = "2-8" }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -2124,6 +2310,12 @@ dir = 4; pixel_x = 5 }, +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "gQ" = ( @@ -2149,7 +2341,7 @@ dir = 4 }, /turf/simulated/wall, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "gS" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -2168,26 +2360,32 @@ }, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) +"gU" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/regular/open{ + id = telesci_blast; + name = "Blast Door" + }, +/turf/simulated/floor/reinforced, +/area/offmap/aerostat/inside/telesci) "gV" = ( -/obj/machinery/atmospherics/binary/pump/on{ - name = "N2O pump" +/obj/machinery/atmospherics/omni/atmos_filter{ + name = "Phoron Filter"; + tag_east = 6; + tag_north = 1; + tag_south = 2 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"gW" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/atmos) "gX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "gZ" = ( @@ -2243,16 +2441,21 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold4w/hidden, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"hn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"hp" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/atmos) +"hn" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating/virgo2, +/area/offmap/aerostat/inside/atmos) +"hp" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) @@ -2275,42 +2478,48 @@ /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) "hs" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/sign/poster{ + dir = 4; + pixel_x = 32 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "hu" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "hv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) -"hA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) -"hB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"hw" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/reagent_containers/dropper, +/obj/item/weapon/reagent_containers/glass/beaker, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/machinery/camera/network/research_outpost{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/virology) +"hA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/closet/crate, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/obj/random/tool, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "hC" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -2331,18 +2540,6 @@ }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/aerostat) -"hG" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ - scrub_id = "science_outpost" - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) -"hJ" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) "hL" = ( /obj/structure/window/reinforced{ dir = 8 @@ -2352,12 +2549,6 @@ /obj/structure/grille, /turf/simulated/floor, /area/offmap/aerostat/inside/toxins) -"hM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) "hN" = ( /obj/structure/table/rack/shelf, /turf/simulated/floor/tiled/techfloor, @@ -2369,9 +2560,8 @@ /turf/simulated/shuttle/floor/yellow, /area/shuttle/aerostat) "hQ" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/mech_recharger, -/turf/simulated/floor/tiled, +/turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/drillstorage) "hS" = ( /obj/machinery/alarm{ @@ -2387,6 +2577,9 @@ tag_north = 2; tag_west = 1 }, +/obj/machinery/camera/network/research_outpost{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "hX" = ( @@ -2414,36 +2607,50 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) "ie" = ( /turf/simulated/wall, /area/offmap/aerostat/inside/zorrenoffice) "if" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/obj/machinery/camera/network/research_outpost, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/westhall) "ig" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/structure/window/reinforced{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "ii" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ +/obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 4 }, -/obj/machinery/meter, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) -"il" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/xenoarch) +"ik" = ( +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) +"il" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/power/apc{ dir = 1; @@ -2455,15 +2662,32 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "io" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/bomb_tester, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access = list(7) + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"is" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/curtain/open/shower/medical, +/obj/machinery/shower{ + pixel_y = 13 + }, +/turf/simulated/floor/tiled/dark, +/area/offmap/aerostat/inside/virology) "it" = ( /obj/machinery/light, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -2489,16 +2713,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/east) -"iB" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) "iC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -2511,7 +2725,6 @@ /obj/machinery/alarm{ pixel_y = 26 }, -/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "iK" = ( @@ -2539,6 +2752,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/virgo2, /area/shuttle/aerostat) +"iQ" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "iU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -2546,9 +2765,7 @@ /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/ne) "iV" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "iW" = ( @@ -2574,14 +2791,19 @@ /obj/effect/floor_decal/industrial/danger{ dir = 8 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "iZ" = ( /obj/machinery/camera/network/research_outpost{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/closet/wardrobe/genetics_white, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/genetics) "ja" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -2605,31 +2827,27 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "ji" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 10 }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "2-4" }, -/obj/machinery/medical_kiosk, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "jj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/unary/freezer{ - dir = 8; - icon_state = "freezer" - }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "jl" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ frequency = 1452 @@ -2638,6 +2856,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/xenoarch/chamber) +"jm" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/arm/ne) "jn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -2658,20 +2882,21 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "ju" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"jw" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +/turf/simulated/wall, +/area/offmap/aerostat/inside/xenoarch) +"jw" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/misclab) "jy" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -2683,13 +2908,16 @@ /obj/structure/sign/painting/public{ pixel_y = 30 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "jE" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, -/obj/structure/table/glass, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "jF" = ( @@ -2706,15 +2934,17 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "jH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 - }, /obj/structure/cable{ icon_state = "2-4" }, /obj/structure/cable{ icon_state = "2-8" }, +/obj/machinery/atmospherics/trinary/mixer/m_mixer{ + dir = 4; + name = "High Power Gas mixer"; + power_rating = 15000 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "jI" = ( @@ -2726,9 +2956,6 @@ }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch/chamber) -"jJ" = ( -/turf/simulated/shuttle/wall/voidcraft/green/virgo2/nocol, -/area/offmap/aerostat/inside/airlock/east) "jL" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -2749,17 +2976,19 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "jN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/pipedispenser, +/turf/simulated/floor/plating, +/area/offmap/aerostat/inside/toxins) "jQ" = ( -/obj/machinery/light/floortube{ - dir = 8; - pixel_x = -6 +/obj/structure/cable{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/white, +/obj/machinery/door/airlock/glass_research{ + name = "Telescience" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/telesci) "jR" = ( /obj/effect/floor_decal/rust, @@ -2771,12 +3000,6 @@ }, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) -"jS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) "jT" = ( /obj/structure/table/standard, /obj/item/weapon/tool/wrench{ @@ -2787,6 +3010,9 @@ pixel_x = 2; pixel_y = 2 }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "jU" = ( @@ -2799,11 +3025,9 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/arm/se) "jV" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/obj/structure/flora/ausbushes/ppflowers, +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) "jW" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2823,9 +3047,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "ka" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -2870,6 +3095,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "kg" = ( @@ -2878,7 +3106,7 @@ }, /obj/effect/map_helper/airlock/sensor/ext_sensor, /turf/simulated/shuttle/wall/voidcraft/green/virgo2/nocol, -/area/offmap/aerostat/inside/airlock/east) +/area/offmap/aerostat/inside/virology) "kk" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -2903,7 +3131,7 @@ }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/virgo2, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "kp" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/industrial/warning/dust{ @@ -2915,11 +3143,15 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "kq" = ( -/obj/machinery/camera/network/research_outpost{ - dir = 4 +/obj/machinery/power/apc{ + dir = 4; + pixel_x = 28 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/misclab) "ks" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -2958,6 +3190,9 @@ /obj/machinery/camera/network/research_outpost{ dir = 8 }, +/obj/structure/bed/chair/sofa/purp/right{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "kD" = ( @@ -3027,30 +3262,33 @@ /area/offmap/aerostat/inside/arm/se) "kN" = ( /obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/powercontrol) "kO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/camera/network/research_outpost{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "kR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/machinery/atmospherics/binary/pump/on, /obj/structure/cable{ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) +"kS" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "kV" = ( /obj/structure/cable{ icon_state = "4-8" @@ -3075,54 +3313,34 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/northchamb) "lb" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/camera/network/research_outpost{ - dir = 1 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/obj/structure/window/reinforced/full, +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "lc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/autolathe, /obj/machinery/camera/network/research_outpost{ dir = 4 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "ld" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) -"le" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/northchamb) "lh" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 1 +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -3135,13 +3353,18 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/north) "lk" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(7) +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sign/directions/science/xenoarch, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/xenoarch) "ll" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 5 @@ -3159,10 +3382,12 @@ }, /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/sw) -"lq" = ( -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +"lr" = ( +/obj/machinery/atmospherics/valve{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "ls" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -3187,7 +3412,7 @@ }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/virgo2, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "lv" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -3195,14 +3420,32 @@ /obj/effect/floor_decal/industrial/warning/cee{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "lx" = ( /obj/machinery/camera/network/research_outpost{ dir = 4 }, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) +"ly" = ( +/obj/machinery/light_switch{ + pixel_y = 25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "lz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3220,38 +3463,33 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "lA" = ( -/obj/machinery/mining/drill, -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/mineral/equipment_vendor, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) -"lD" = ( -/obj/effect/floor_decal/industrial/warning{ +"lC" = ( +/obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/rust, +/obj/machinery/camera/network/research_outpost{ + dir = 8 }, -/obj/machinery/light, /turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/arm/se) "lG" = ( -/obj/structure/table/standard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) "lH" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/wall, +/area/offmap/aerostat/inside/atmos) "lI" = ( /obj/machinery/door/window/brigdoor/eastleft{ dir = 1; @@ -3260,8 +3498,16 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/firingrange) "lK" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 10 +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24; + pixel_y = -5 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -3284,19 +3530,24 @@ }, /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) -"lR" = ( -/obj/machinery/medical_kiosk, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +"lP" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) +"lS" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/northchamb) "lT" = ( -/obj/machinery/pipedispenser, +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "lW" = ( -/obj/machinery/light/floortube{ - dir = 8; - pixel_x = -6 - }, +/obj/machinery/atmospherics/binary/pump, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "lX" = ( @@ -3320,10 +3571,18 @@ }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) -"mg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +"md" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) +"me" = ( +/obj/machinery/light, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) +"mg" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 1 }, @@ -3333,28 +3592,45 @@ /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) "mi" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "mj" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/floor_decal/rust, +/obj/random/maintenance/research, +/obj/random/firstaid, +/obj/random/maintenance/engineering, +/obj/random/soap, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "mk" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 10 }, /obj/machinery/meter, -/obj/machinery/camera/network/research_outpost{ +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) +"mm" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/goggles, +/obj/item/clothing/ears/earmuffs, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/firingrange) "mn" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/glass_external/public, @@ -3373,6 +3649,26 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) +"mp" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) +"ms" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_research{ + name = "Genetics Lab" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/genetics) "mt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3383,6 +3679,7 @@ /obj/machinery/alarm{ pixel_y = 26 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "mx" = ( @@ -3393,11 +3690,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/north) -"mz" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/structure/anomaly_container, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "mA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -3410,14 +3702,15 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "mD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 6 +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access = list(7) }, -/obj/effect/floor_decal/industrial/warning/cee, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "mE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3460,28 +3753,39 @@ dir = 4 }, /obj/structure/table/standard, +/obj/random/tool, +/obj/random/tool, +/obj/structure/sign/poster{ + dir = 4; + pixel_x = 32 + }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/telesci) +/area/offmap/aerostat/inside/miscstorage) +"mI" = ( +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/stack/nanopaste, +/obj/item/device/flashlight/lamp{ + pixel_x = 5; + pixel_y = 9 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) +"mJ" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/portable_atmospherics/powered/pump, +/turf/simulated/floor/plating, +/area/offmap/aerostat/inside/toxins) "mL" = ( /obj/machinery/light{ dir = 1 }, -/obj/item/modular_computer/console, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) -"mM" = ( -/obj/machinery/light{ +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/toxins) "mN" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/arm/nw) @@ -3529,16 +3833,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/easthall) -"mY" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) "mZ" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/yellow{ @@ -3548,15 +3842,31 @@ /obj/machinery/power/solar, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) +"na" = ( +/obj/machinery/light/small, +/obj/machinery/power/quantumpad/scioutpost, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/bluegrid, +/area/offmap/aerostat/inside/powercontrol) "nb" = ( -/obj/machinery/vending/tool, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4; + pixel_x = 28 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "nf" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 +/obj/machinery/atmospherics/trinary/atmos_filter{ + dir = 4; + name = "High Power Gas filter"; + power_rating = 15000; + use_power = 0 }, -/obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "nh" = ( @@ -3567,14 +3877,27 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"ni" = ( +/obj/effect/floor_decal/rust, +/obj/machinery/power/apc{ + dir = 4; + pixel_x = 28 + }, +/obj/structure/cable, +/turf/simulated/floor, +/area/offmap/aerostat/inside/westhall) "nm" = ( -/obj/machinery/atmospherics/unary/freezer{ - dir = 8 +/obj/machinery/atmospherics/binary/pump/on{ + name = "Scrubber to Waste" }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "no" = ( /obj/machinery/atmospherics/omni/mixer{ name = "Air Mixer"; @@ -3624,16 +3947,15 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_research{ - name = "Toxins Lab"; - req_one_access = null - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_research{ + name = "Toxins Lab" + }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) "nw" = ( @@ -3658,10 +3980,11 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) "nB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/visible, +/obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "nE" = ( @@ -3683,6 +4006,15 @@ }, /turf/simulated/floor, /area/offmap/aerostat/inside/firingrange) +"nG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/easthall) "nJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -3690,15 +4022,6 @@ }, /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/firingrange) -"nK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/wall, -/area/offmap/aerostat/inside/toxins) "nL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/bluegrid, @@ -3763,10 +4086,10 @@ /turf/simulated/floor/reinforced/airless, /area/offmap/aerostat/inside/toxins) "nV" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/green, +/obj/machinery/portable_atmospherics/powered/pump, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/light, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "nW" = ( @@ -3776,29 +4099,15 @@ /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/ne) "nY" = ( -/obj/structure/table/rack, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/machinery/alarm{ dir = 4; pixel_x = -23 }, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/storage/belt/archaeology, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/anomaly/heat, -/obj/item/clothing/head/helmet/space/anomaly/heat, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/excavation, -/obj/item/stack/flag/yellow, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "oc" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 9 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -3819,6 +4128,13 @@ }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"oi" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "oj" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 @@ -3831,9 +4147,10 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/arm/sw) "ol" = ( -/obj/machinery/atmospherics/unary/freezer{ +/obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/portable_atmospherics/canister/phoron, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "om" = ( @@ -3851,17 +4168,12 @@ /area/offmap/aerostat/inside/powercontrol) "oo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "op" = ( /turf/simulated/wall/r_wall, /area/offmap/aerostat/inside/xenoarch) @@ -3875,6 +4187,23 @@ /obj/effect/map_helper/airlock/atmos/pump_out_internal, /turf/simulated/floor, /area/offmap/aerostat/inside/arm/nw) +"ot" = ( +/turf/simulated/shuttle/wall/voidcraft/green, +/area/offmap/aerostat/inside/virology) +"ou" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/blue, +/obj/structure/table/standard, +/obj/item/weapon/tool/screwdriver, +/obj/item/device/analyzer, +/obj/item/weapon/tool/wrench, +/obj/item/clothing/glasses/welding, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "ov" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -3912,6 +4241,9 @@ /area/offmap/aerostat/inside/firingrange) "oG" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "oJ" = ( @@ -3922,14 +4254,18 @@ /obj/structure/cable{ icon_state = "0-8" }, +/obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "oK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/dispenser, -/obj/machinery/light, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access = list(7) + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "oL" = ( @@ -3981,38 +4317,33 @@ /area/offmap/aerostat/inside/toxins) "oY" = ( /obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, -/obj/item/weapon/anobattery{ - pixel_x = 5; - pixel_y = 2 +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/anodevice{ + pixel_x = 1 }, -/obj/item/weapon/anobattery, -/obj/item/weapon/anobattery{ - pixel_x = -4; - pixel_y = 3 +/obj/item/weapon/anodevice{ + pixel_x = -2 }, -/obj/item/weapon/anobattery{ - pixel_x = -5; - pixel_y = -3 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/item/device/flashlight/lamp, -/turf/simulated/floor/tiled, +/obj/item/device/multitool, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "oZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ - icon_state = "0-8" + icon_state = "4-8" }, -/obj/machinery/power/apc{ - dir = 4; - pixel_x = 28 - }, -/obj/structure/closet/wardrobe/genetics_white, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) +"pa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "pd" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 @@ -4047,6 +4378,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) +"ph" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/black, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "pj" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -4056,6 +4391,7 @@ /area/offmap/aerostat/solars) "pm" = ( /obj/machinery/light, +/obj/structure/table/wooden_reinforced, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "pn" = ( @@ -4066,6 +4402,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) +"po" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden, +/obj/machinery/camera/network/research_outpost{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "pq" = ( /obj/structure/table/steel_reinforced, /obj/machinery/door/window/brigdoor/eastright{ @@ -4086,8 +4429,12 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "ps" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -4098,19 +4445,11 @@ }, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) -"pu" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/flora/pottedplant/overgrown, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) "py" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/machinery/atmospherics/binary/pump{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "pz" = ( /obj/structure/cable/heavyduty{ @@ -4127,10 +4466,6 @@ /area/offmap/aerostat/inside/arm/se) "pA" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 2; - req_access = list(1337) - }, /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/shutters{ dir = 2; @@ -4165,14 +4500,14 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "pH" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/cable{ - icon_state = "1-2" + icon_state = "1-8" }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/southchamb) +/area/offmap/aerostat/inside/northchamb) "pL" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -4183,13 +4518,6 @@ }, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) -"pM" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "pP" = ( /obj/machinery/light/floortube{ dir = 1; @@ -4258,6 +4586,9 @@ dir = 8; pixel_x = -6 }, +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "pZ" = ( @@ -4276,26 +4607,19 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/southchamb) -"qe" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" +"qf" = ( +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/alarm{ + pixel_y = 26 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) -"qf" = ( -/obj/structure/window/reinforced, -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(7) - }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "qh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 1 @@ -4303,6 +4627,9 @@ /obj/machinery/light_switch{ pixel_y = 25 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "qi" = ( @@ -4327,12 +4654,16 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "ql" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "2-8" + }, +/obj/structure/bed/chair/sofa/purp/left{ + dir = 8 }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) @@ -4340,7 +4671,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/structure/table/steel_reinforced, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "qq" = ( @@ -4359,6 +4690,33 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) +"qr" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = -4 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) +"qt" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) +"qv" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/firingrange) "qw" = ( /obj/machinery/power/apc{ dir = 4; @@ -4390,6 +4748,13 @@ "qC" = ( /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"qD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "qE" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -4419,14 +4784,15 @@ /turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "qJ" = ( -/obj/machinery/atmospherics/omni/atmos_filter{ - name = "N2O Filter"; - tag_east = 7; - tag_north = 1; - tag_south = 2 - }, +/obj/machinery/vending/cigarette, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) +"qK" = ( +/obj/machinery/computer/telescience{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/telesci) "qL" = ( /obj/structure/window/reinforced{ dir = 8 @@ -4457,11 +4823,12 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "qP" = ( -/obj/machinery/light{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/steel_reinforced, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "qQ" = ( @@ -4469,7 +4836,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/wall, /area/offmap/aerostat/inside/xenoarch) "qR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4479,12 +4846,11 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "qS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "qT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -4492,19 +4858,19 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "qU" = ( -/obj/machinery/alarm{ - pixel_y = 26 - }, -/obj/machinery/vending/phoronresearch{ - name = "Toximate 2556"; - products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12) +/obj/structure/window/reinforced{ + dir = 4 }, +/obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "qZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "rd" = ( /obj/machinery/atmospherics/pipe/simple/insulated, /obj/machinery/door/blast/regular{ @@ -4515,18 +4881,25 @@ /turf/simulated/floor/reinforced/airless, /area/offmap/aerostat/inside/toxins) "re" = ( -/obj/machinery/atmospherics/pipe/tank/nitrous_oxide{ +/obj/machinery/atmospherics/unary/freezer{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"rg" = ( -/obj/machinery/light/floortube{ - dir = 4; - pixel_x = 5 +/area/offmap/aerostat/inside/atmos) +"rf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 6 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"rg" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/closet/crate/science, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "ri" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/external{ @@ -4536,29 +4909,9 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/north) -"rk" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "rq" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/firingrange) -"rr" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Xenoarchaeology" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/xenoarch) "rs" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, @@ -4585,31 +4938,37 @@ }, /turf/simulated/wall, /area/offmap/aerostat/inside/atmos) -"rx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 10 - }, +"ry" = ( +/obj/structure/flora/pottedplant/subterranean, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/northchamb) +"rz" = ( +/obj/structure/table/standard, +/obj/item/weapon/tank/phoron, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil, +/obj/item/weapon/tool/wirecutters, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) -"ry" = ( -/turf/simulated/shuttle/wall/voidcraft/green, -/area/offmap/aerostat/inside/xenoarch) -"rF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +"rC" = ( +/obj/machinery/computer/diseasesplicer{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/alarm{ - pixel_y = 26 - }, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) -"rH" = ( -/obj/structure/table/standard, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) +"rH" = ( +/obj/structure/closet/crate/science, +/obj/effect/floor_decal/rust, +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 24 + }, +/obj/structure/cable, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor, /area/offmap/aerostat/inside/xenoarch) "rI" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ @@ -4630,6 +4989,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/north) +"rP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/xenoarch) "rS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -4643,18 +5008,35 @@ }, /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/east) +"rU" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/toxins) +"rW" = ( +/obj/structure/bed/chair/office/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "sb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/closet/excavation, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "sc" = ( -/obj/effect/floor_decal/industrial/warning/dust{ +/obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "se" = ( /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, @@ -4682,18 +5064,30 @@ }, /turf/simulated/floor/reinforced/airless, /area/offmap/aerostat/inside/toxins) +"sj" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 1; + req_access = null + }, +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) "sk" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/south) "sm" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(7) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/structure/table/rack, +/obj/item/clothing/suit/bio_suit/anomaly, +/obj/item/clothing/head/bio_hood/anomaly, +/obj/item/clothing/gloves/sterile/latex, +/obj/item/clothing/glasses/science, +/obj/item/clothing/mask/breath, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) "sn" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/shuttle/wall/voidcraft/green/virgo2, @@ -4742,20 +5136,24 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) -"sz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +"sy" = ( +/obj/structure/cable{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "sD" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "sE" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/yellow{ @@ -4773,22 +5171,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "sJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "sK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "sN" = ( @@ -4796,7 +5197,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/portable_atmospherics/canister/empty, /obj/machinery/camera/network/research_outpost{ dir = 4 }, @@ -4818,6 +5218,7 @@ icon_state = "1-2" }, /obj/structure/table/standard, +/obj/item/weapon/ore/bluespace_crystal, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "sQ" = ( @@ -4839,12 +5240,6 @@ }, /turf/simulated/wall/r_wall, /area/offmap/aerostat/inside/xenoarch) -"sW" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "sX" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -4871,6 +5266,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/ne) +"tf" = ( +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/telesci) "tg" = ( /obj/effect/shuttle_landmark{ base_area = /area/offmap/aerostat; @@ -4885,8 +5286,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) +"tj" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/obj/structure/table/rack, +/obj/random/contraband, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "tk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -4894,9 +5306,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -4916,6 +5325,14 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/north) +"tn" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/medical, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "tq" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; @@ -4938,6 +5355,15 @@ }, /turf/simulated/floor, /area/offmap/aerostat/inside/airlock/north) +"tr" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/easthall) "ts" = ( /obj/structure/shuttle/window, /obj/structure/grille, @@ -4948,32 +5374,25 @@ /turf/simulated/floor, /area/shuttle/aerostat) "tu" = ( -/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "tv" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Toxins Lab"; - req_one_access = null - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_research{ + name = "Toxins Lab" + }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) "ty" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/easthall) -"tA" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) "tD" = ( -/obj/structure/bed/chair/office/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) "tE" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -4993,44 +5412,35 @@ /obj/effect/floor_decal/rust, /obj/machinery/power/apc{ dir = 8; - name = "east bump"; pixel_x = -22 }, /turf/simulated/floor, /area/offmap/aerostat/inside/arm/se) -"tG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) "tH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/wall, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/regular/open{ + id = telesci_blast; + name = "Blast Door" + }, +/turf/simulated/floor/reinforced, /area/offmap/aerostat/inside/telesci) "tI" = ( /obj/effect/floor_decal/industrial/danger/corner{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "tJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light/floortube{ - dir = 8; - pixel_x = -6 + dir = 5 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "tL" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Toxins Lab" - }, /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 9 }, @@ -5038,8 +5448,14 @@ dir = 4 }, /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/airlock/glass_research{ + name = "Xenoarchaeology Prep Room" + }, /turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "tM" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -5049,15 +5465,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/arm/ne) -"tP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 4 - }, -/obj/machinery/alarm{ - pixel_y = 26 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) "tR" = ( /obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/tiled/techfloor, @@ -5070,71 +5477,70 @@ /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/aerostat) "tU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/light_switch{ pixel_y = 24 }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "tV" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/dispenser{ - phorontanks = 0 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -25; - pixel_y = -2 - }, +/obj/machinery/suspension_gen, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "tY" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/east) "ua" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 +/obj/machinery/door/airlock/glass_research{ + name = "Atmospherics"; + req_one_access = list(47,10) }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/atmos) "ud" = ( -/obj/structure/cable/heavyduty{ - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"uf" = ( +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = 2; + name = "Virology Emergency Quarantine"; + pixel_y = 5 + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/virology) "ug" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/steel_reinforced, /obj/structure/sign/painting/public{ pixel_x = 30 }, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "uh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /obj/structure/cable{ - icon_state = "2-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/southchamb) +/area/offmap/aerostat/inside/northchamb) "uj" = ( -/obj/machinery/light/floortube{ - dir = 4; - pixel_x = 5 - }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "uk" = ( /obj/machinery/light, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/se) "um" = ( /obj/machinery/door/airlock/external, /obj/structure/cable{ @@ -5144,9 +5550,8 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/northchamb) "un" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, +/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "uq" = ( @@ -5157,7 +5562,7 @@ dir = 1 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "ur" = ( /obj/machinery/atmospherics/pipe/simple/insulated{ dir = 4 @@ -5177,6 +5582,12 @@ }, /turf/simulated/wall, /area/offmap/aerostat/inside/firingrange) +"ut" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/offmap/aerostat/inside/telesci) "uu" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/red{ dir = 1 @@ -5193,15 +5604,9 @@ /obj/structure/window/basic{ dir = 1 }, -/obj/structure/window/basic{ - dir = 8 - }, /obj/effect/floor_decal/corner/red/border{ dir = 1 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) "ux" = ( @@ -5222,12 +5627,6 @@ "uA" = ( /obj/machinery/atmospherics/unary/heat_exchanger, /obj/structure/window/basic, -/obj/structure/window/basic{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) @@ -5236,23 +5635,50 @@ /obj/machinery/camera/network/research_outpost{ dir = 4 }, +/obj/machinery/mining/drill, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) -"uG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +"uE" = ( +/obj/machinery/vending/snlvend{ + dir = 8 }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) +"uF" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/camera/network/research_outpost{ + dir = 8 + }, +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) +"uG" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/camera/network/research_outpost, +/obj/structure/table/rack, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) +"uK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/mining/drill, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/drillstorage) +"uN" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/northchamb) "uS" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/arm/sw) "uV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black, -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) @@ -5263,8 +5689,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) +"va" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) "vb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -5279,9 +5710,12 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/south) "vd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) "ve" = ( /obj/machinery/door/blast/regular{ dir = 8; @@ -5305,23 +5739,32 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/south) "vm" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(7) - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/structure/table/rack, +/obj/item/clothing/suit/bio_suit/anomaly, +/obj/item/clothing/head/bio_hood/anomaly, +/obj/item/clothing/gloves/sterile/latex, +/obj/item/clothing/glasses/science, +/obj/item/clothing/mask/breath, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) "vo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/table/wooden_reinforced, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "vp" = ( /obj/machinery/camera/network/research_outpost{ dir = 8 }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "vq" = ( @@ -5341,21 +5784,36 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) +"vu" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/firingrange) "vy" = ( /obj/machinery/power/apc{ dir = 8; - name = "east bump"; pixel_x = -22 }, /obj/structure/cable, +/obj/structure/table/reinforced, +/obj/item/weapon/storage/box/disks, +/obj/item/weapon/storage/box/disks, +/obj/item/toy/figure/geneticist, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/genetics) "vz" = ( -/obj/machinery/light/floortube{ - dir = 8; - pixel_x = -6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/network/research_outpost, +/obj/structure/table/rack, +/obj/item/clothing/suit/bio_suit/anomaly, +/obj/item/clothing/head/bio_hood/anomaly, +/obj/item/clothing/gloves/sterile/latex, +/obj/item/clothing/glasses/science, +/obj/item/clothing/mask/breath, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "vA" = ( @@ -5366,6 +5824,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "vC" = ( @@ -5420,17 +5879,25 @@ name = "Firing Range"; req_one_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/firingrange) +"vQ" = ( +/obj/item/modular_computer/console/preset/research{ + dir = 8 + }, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) "vR" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, -/area/offmap/aerostat/inside/toxins) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/wall, +/area/offmap/aerostat/inside/xenoarch) "vT" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -5442,23 +5909,37 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/firingrange) +"vU" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/mining/brace, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/drillstorage) "vW" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ - dir = 1 +/obj/structure/cable/heavyduty{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "vX" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, /turf/simulated/shuttle/wall, /area/shuttle/aerostat) +"vY" = ( +/obj/machinery/bomb_tester, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "wb" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 8 +/obj/machinery/alarm{ + dir = 8; + pixel_x = 23 }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "wc" = ( @@ -5472,18 +5953,14 @@ /turf/simulated/shuttle/wall/hard_corner, /area/shuttle/aerostat) "wg" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -26 +/obj/machinery/vending/cola/soft{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) @@ -5498,9 +5975,6 @@ /area/offmap/aerostat/inside/xenoarch) "wi" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -5514,6 +5988,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/arm/se) +"wl" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/dark, +/area/offmap/aerostat/inside/lobby) "wm" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -5525,6 +6003,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "wp" = ( @@ -5538,22 +6017,30 @@ }, /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/xenoarch) -"wq" = ( -/obj/structure/closet/crate/science, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "wr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"ws" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/black{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "wz" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) +"wA" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/misclab) "wC" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner{ stripe_color = "#00FF00" @@ -5590,10 +6077,13 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "wG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "wI" = ( /obj/structure/cable/heavyduty{ @@ -5623,10 +6113,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) -"wR" = ( -/obj/machinery/vending/tool, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +"wT" = ( +/obj/effect/floor_decal/rust, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/obj/random/maintenance/engineering, +/obj/structure/closet, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "wY" = ( /obj/machinery/alarm{ pixel_y = 26 @@ -5664,13 +6158,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 32; - pixel_y = -24 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "xe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5678,32 +6168,35 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "xf" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/portables_connector{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "xg" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" - }, -/obj/machinery/alarm{ - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/camera/network/research_outpost{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) +"xj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/easthall) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/se) "xl" = ( /obj/structure/cable{ icon_state = "4-8" @@ -5733,28 +6226,49 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/radiocarbon_spectrometer, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "xs" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/bio_suit/anomaly, -/obj/item/clothing/head/bio_hood/anomaly, -/obj/item/clothing/mask/breath, -/obj/item/clothing/gloves/sterile/latex, -/obj/item/clothing/glasses/science, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor, /area/offmap/aerostat/inside/xenoarch) "xt" = ( /turf/simulated/wall, /area/offmap/aerostat/inside/drillstorage) "xu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 5 +/obj/machinery/alarm{ + alarm_id = "anomaly_testing"; + dir = 4; + pixel_x = -23 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"xv" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/sign/directions/science/xenoarch{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/easthall) "xw" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -5784,19 +6298,29 @@ }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) -"xC" = ( -/obj/structure/filingcabinet/filingcabinet, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 23 +"xB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/medical{ + name = "Virology Lab"; + req_access = list(39); + req_one_access = null + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/virology) "xD" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/table/steel_reinforced, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "xF" = ( @@ -5809,21 +6333,39 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/arm/se) "xG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) -"xK" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +"xH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "zorrenpartyroom"; + layer = 3.3; + name = "shutter" }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/machinery/vending/sovietsoda, +/turf/simulated/floor/plating/virgo2, +/area/offmap/aerostat/inside/zorrenoffice) +"xK" = ( +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "xM" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -5841,12 +6383,13 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/arm/sw) "xO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/green{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access = list(7) }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -5854,22 +6397,21 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "xR" = ( -/obj/machinery/light/floortube{ - dir = 8; - pixel_x = -6 +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) +"xS" = ( +/obj/structure/cable{ + icon_state = "1-2" }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) -"xS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/virology) "xU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"xV" = ( +/turf/simulated/wall, +/area/offmap/aerostat/inside/virology) "xW" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" @@ -5892,11 +6434,17 @@ }, /turf/simulated/floor/plating, /area/offmap/aerostat/inside/atmos) +"yd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/virology) "ye" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/modular_computer/console{ - dir = 8 - }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "yi" = ( @@ -5920,12 +6468,12 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/se) "yq" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -5936,14 +6484,7 @@ "yr" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/drillstorage) -"ys" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "yu" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 4 - }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -5951,6 +6492,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/vending/snack{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "yv" = ( @@ -5984,8 +6528,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/wall, +/area/offmap/aerostat/inside/arm/ne) "yD" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -6001,14 +6545,11 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/south) "yG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/alarm{ pixel_y = 26 }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "yH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -6026,10 +6567,13 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "yI" = ( -/obj/machinery/atmospherics/valve{ - dir = 4 - }, /obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "yK" = ( @@ -6039,6 +6583,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = -6 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "yN" = ( @@ -6056,6 +6604,17 @@ /obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"yQ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/obj/structure/table/rack, +/obj/random/toolbox, +/obj/random/soap, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "yT" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 10 @@ -6067,11 +6626,11 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "yX" = ( -/obj/machinery/light{ +/obj/machinery/camera/network/research_outpost{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/misclab) "yZ" = ( /obj/structure/cable/heavyduty{ icon_state = "0-8" @@ -6093,25 +6652,20 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "zc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/wall, -/area/offmap/aerostat/inside/misclab) +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/telesci) "ze" = ( -/obj/machinery/artifact_analyser, -/obj/machinery/camera/network/research_outpost{ - dir = 8 +/turf/simulated/shuttle/wall/voidcraft/hard_corner{ + stripe_color = "#00FF00" }, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/virology) "zf" = ( -/obj/structure/table/steel_reinforced, /obj/random/maintenance/research, /obj/structure/sign/painting/public{ pixel_x = -30 }, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "zg" = ( @@ -6133,13 +6687,11 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "zn" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 +/obj/machinery/door/airlock/glass_research{ + name = "Xenoarchaeology" }, -/obj/item/modular_computer/console/preset/research{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/xenoarch) "zo" = ( /obj/structure/cable{ @@ -6169,11 +6721,15 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/arm/ne) "zr" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/drillstorage) +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "zt" = ( /obj/machinery/door/airlock/glass_research{ req_one_access = null @@ -6184,12 +6740,10 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/zorrenoffice) "zu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/camera/network/research_outpost{ - dir = 8 - }, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "zw" = ( @@ -6206,10 +6760,17 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) +"zz" = ( +/obj/structure/bed/chair/bay{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "zA" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/structure/flora/pottedplant/crystal, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "zB" = ( @@ -6236,6 +6797,13 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/south) +"zD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/vending/tool, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "zE" = ( /obj/machinery/power/apc{ dir = 1; @@ -6260,6 +6828,9 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) +"zH" = ( +/turf/simulated/shuttle/wall/voidcraft/green, +/area/offmap/aerostat/inside/misclab) "zI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -6267,12 +6838,6 @@ }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) -"zJ" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) "zM" = ( /obj/machinery/door/airlock/external, /obj/structure/cable{ @@ -6340,15 +6905,6 @@ /obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/arm/nw) -"Aa" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - name = "Distro Loop Drain" - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) "Ab" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -6381,18 +6937,11 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/arm/se) "Ae" = ( -/obj/structure/table/rack, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/storage/belt/archaeology, -/obj/item/clothing/mask/breath, -/obj/item/clothing/suit/space/anomaly/heat, -/obj/item/clothing/head/helmet/space/anomaly/heat, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/excavation, -/obj/item/stack/flag/yellow, -/obj/item/weapon/tool/wrench, -/obj/item/device/measuring_tape, -/turf/simulated/floor/tiled/white, +/obj/machinery/door/airlock/glass_research{ + name = "Xenoarchaeology Storage" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/xenoarch) "Ah" = ( /obj/structure/cable{ @@ -6400,6 +6949,13 @@ }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) +"Ai" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/telesci) "Ak" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ dir = 5 @@ -6407,9 +6963,28 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "Al" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/tiled, +/obj/machinery/artifact_scanpad, +/turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) +"An" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/storage/box/monkeycubes, +/obj/item/weapon/storage/box/monkeycubes, +/obj/item/weapon/storage/pill_bottle/dylovene, +/obj/item/weapon/storage/pill_bottle/dylovene, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "Ao" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -6420,11 +6995,15 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/southchamb) "Ap" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/ppflowers, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) "Aq" = ( /obj/machinery/door/airlock/glass_research{ req_one_access = null @@ -6440,13 +7019,14 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/zorrenoffice) "Ar" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(7) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_research{ + name = "Xenoarchaeology Prep Room" }, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/xenoarch) "As" = ( /obj/machinery/door/airlock/glass_research{ name = "Atmospherics"; @@ -6462,9 +7042,6 @@ /obj/effect/floor_decal/industrial/warning/dust, /obj/structure/table/standard, /obj/fiftyspawner/steel, -/obj/machinery/camera/network/research_outpost{ - dir = 1 - }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Au" = ( @@ -6489,13 +7066,11 @@ /turf/simulated/floor/reinforced/airless, /area/offmap/aerostat/inside/toxins) "Ay" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/machinery/atmospherics/pipe/manifold/visible/red, +/obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Az" = ( @@ -6505,9 +7080,6 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/powercontrol) "AB" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Xenoarchaeology" - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -6516,8 +7088,7 @@ /obj/structure/cable{ icon_state = "2-8" }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "AC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -6526,25 +7097,22 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "AD" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/arm/ne) "AE" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/obj/item/weapon/virusdish/random, +/obj/item/weapon/virusdish/random, +/obj/item/weapon/virusdish/random, +/obj/item/weapon/virusdish/random, +/obj/item/weapon/virusdish/random, +/obj/structure/closet/crate/medical{ + name = "Virus Samples" }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "AF" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -6611,12 +7179,26 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) +"AR" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/firingrange) "AX" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/se) +"AY" = ( +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ + scrub_id = "science_outpost" + }, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/offmap/aerostat/inside/toxins) "Bb" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/structure/cable{ @@ -6630,12 +7212,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/north) -"Bc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/wall, -/area/offmap/aerostat/inside/toxins) "Be" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -6648,12 +7224,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) -"Bh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +"Bi" = ( +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "Bj" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6661,11 +7236,24 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch/chamber) "Bk" = ( -/obj/machinery/atmospherics/portables_connector, +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 24 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/dispenser{ + phorontanks = 0 + }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "Bm" = ( /obj/machinery/camera/network/research_outpost, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "Bo" = ( @@ -6699,53 +7287,34 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) -"Br" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) "Bs" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/blue, /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/powercontrol) -"Bt" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +"Bv" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) -"Bu" = ( -/obj/machinery/dna_scannernew, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) -"By" = ( /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/toxins) "Bz" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/virgo2, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/westhall) "BA" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating/virgo2, -/area/offmap/aerostat/inside/northchamb) -"BB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 10 }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/turf/simulated/shuttle/wall/voidcraft/green, +/area/offmap/aerostat/inside/atmos) "BE" = ( /obj/machinery/light/floortube{ dir = 8; @@ -6766,15 +7335,17 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "BG" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ - scrub_id = "science_outpost" +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 6 + }, +/obj/machinery/camera/network/research_outpost{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/visible/blue, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "BH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/steel_reinforced, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "BK" = ( @@ -6783,19 +7354,6 @@ }, /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/east) -"BM" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "BO" = ( /obj/structure/cable/heavyduty{ icon_state = "0-8" @@ -6848,9 +7406,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) +"BT" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "BU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -6869,20 +7433,18 @@ name = "Distro Loop Drain" }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"BX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/area/offmap/aerostat/inside/atmos) +"Ca" = ( +/obj/structure/table/standard, +/obj/item/weapon/folder/white, +/obj/item/weapon/pen/fountain, +/obj/item/device/assembly_holder/timer_igniter, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/alarm{ - pixel_y = 26 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) -"Ca" = ( -/obj/machinery/computer/area_atmos/tag{ - dir = 8; - scrub_id = "science_outpost" +/obj/item/weapon/weldingtool, +/obj/structure/extinguisher_cabinet{ + pixel_x = 30 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -6893,17 +7455,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/cable{ icon_state = "1-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/wall, -/area/offmap/aerostat/inside/toxins) -"Cd" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/xenoarch) +"Cd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/northchamb) "Ce" = ( /turf/simulated/wall, /area/offmap/aerostat/inside/atmos) @@ -6938,39 +7506,23 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) -"Cq" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) -"Ct" = ( -/obj/machinery/light/floortube{ - dir = 4; - pixel_x = 5 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) -"Cu" = ( -/obj/structure/closet/secure_closet/xenoarchaeologist, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) -"Cw" = ( -/obj/structure/table/standard, -/obj/item/weapon/tool/crowbar, -/obj/item/weapon/anodevice{ - pixel_x = -2 - }, -/obj/item/weapon/anodevice{ - pixel_x = 1 - }, -/obj/item/device/multitool, -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, +"Cm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/northchamb) +"Cu" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) +"Cw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc, +/obj/structure/cable, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "CA" = ( /obj/effect/floor_decal/industrial/warning/dust{ @@ -6986,12 +7538,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = -28 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "CE" = ( -/obj/machinery/atmospherics/binary/pump, -/obj/machinery/atmospherics/pipe/simple/hidden/universal{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -7009,7 +7564,7 @@ /obj/effect/floor_decal/industrial/warning/dust{ dir = 4 }, -/obj/structure/table/glass, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "CJ" = ( @@ -7045,6 +7600,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"CN" = ( +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "CO" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 4 @@ -7067,30 +7626,28 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/rust, /obj/machinery/door/airlock/maintenance/rnd{ req_one_access = null }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/misclab) +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/se) "CT" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/table/steel_reinforced, /obj/random/firstaid, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "CV" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/miscstorage) "Da" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/green{ dir = 1 @@ -7102,7 +7659,7 @@ /area/offmap/aerostat/inside/atmos) "Db" = ( /turf/simulated/shuttle/wall/voidcraft/green/virgo2/nocol, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/virology) "Dd" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -7111,9 +7668,11 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/airlock/east) "De" = ( -/obj/machinery/computer/telescience, -/turf/simulated/floor/reinforced, -/area/offmap/aerostat/inside/telesci) +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/miscstorage) "Dg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -7127,6 +7686,17 @@ }, /turf/simulated/wall, /area/offmap/aerostat/inside/toxins) +"Di" = ( +/obj/structure/flora/pottedplant/minitree, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "Dk" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/light/floortube{ @@ -7138,16 +7708,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/south) -"Dl" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +"Dp" = ( +/obj/structure/sign/department/virology, +/turf/simulated/shuttle/wall/voidcraft/green, +/area/offmap/aerostat/inside/virology) "Dq" = ( /obj/structure/window/reinforced{ dir = 8 @@ -7198,13 +7762,28 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/se) "DC" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/south) +"DD" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/atmos) +"DE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/miscstorage) "DF" = ( /obj/machinery/door/airlock/multi_tile/metal{ dir = 1; @@ -7221,19 +7800,15 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "DH" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/sign/poster{ - dir = 8; - pixel_x = -32 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -7242,20 +7817,21 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "DJ" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/hidden/aux{ dir = 4 }, +/obj/structure/cable/heavyduty{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "DK" = ( /obj/machinery/door/airlock/multi_tile/glass{ - name = "Toxins Lab" + name = "Toxins Lab"; + req_one_access = list(47) }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, @@ -7271,11 +7847,13 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "DM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/red{ - dir = 8 +/obj/machinery/alarm{ + alarm_id = "anomaly_testing"; + dir = 4; + pixel_x = -23 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "DN" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 10 @@ -7289,12 +7867,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/power/apc{ dir = 8; - name = "east bump"; pixel_x = -22 }, /obj/structure/cable, -/obj/structure/table/standard, -/obj/item/device/multitool, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "DP" = ( @@ -7317,6 +7892,10 @@ }, /turf/simulated/floor, /area/offmap/aerostat/inside/airlock/south) +"DV" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "DY" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ @@ -7325,11 +7904,10 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "Eb" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/xenoarch) +/obj/machinery/portable_atmospherics/powered/pump, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Eh" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -7349,6 +7927,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) +"Em" = ( +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/binary/pump{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Ep" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -7370,6 +7955,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) +"Et" = ( +/obj/structure/ore_box, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/drillstorage) "Eu" = ( /obj/machinery/atmospherics/portables_connector/aux{ dir = 4 @@ -7398,12 +7987,26 @@ /area/offmap/aerostat/inside/firingrange) "Ey" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) +"EA" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating/virgo2, +/area/offmap/aerostat/inside/misclab) +"EC" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/weapon/reagent_containers/glass/beaker, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "ED" = ( /obj/machinery/atmospherics/omni/atmos_filter{ name = "N2/O2 Filter"; @@ -7413,14 +8016,7 @@ tag_west = 3 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"EF" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/atmos) "EI" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -7445,45 +8041,74 @@ "EN" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/west) +"EP" = ( +/obj/structure/table/wooden_reinforced, +/obj/item/weapon/reagent_containers/food/drinks/cup{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/weapon/reagent_containers/food/drinks/cup{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/weapon/reagent_containers/food/drinks/cup{ + pixel_x = -5; + pixel_y = -4 + }, +/obj/item/weapon/reagent_containers/food/drinks/cup{ + pixel_x = 5; + pixel_y = -4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "EQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) "ER" = ( -/obj/machinery/light{ - dir = 1 +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/miscstorage) +"ES" = ( +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) -"ES" = ( -/turf/simulated/floor/reinforced, /area/offmap/aerostat/inside/telesci) "EV" = ( /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"EW" = ( +/obj/structure/table/standard, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/random/toolbox, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/miscstorage) "EX" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/structure/sign/directions/science/xenoarch{ - dir = 1; - pixel_y = 32 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "Fa" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 }, -/obj/structure/table/glass, /obj/random/maintenance/research, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "Ff" = ( @@ -7497,7 +8122,7 @@ dir = 10 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "Fi" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4 @@ -7521,6 +8146,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Fo" = ( @@ -7574,12 +8200,7 @@ /turf/simulated/floor/reinforced/airless, /area/offmap/aerostat/inside/toxins) "Fw" = ( -/obj/machinery/atmospherics/trinary/atmos_filter{ - dir = 4; - name = "High Power Gas filter"; - power_rating = 15000; - use_power = 0 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/black, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Fy" = ( @@ -7597,9 +8218,25 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/south) +"FA" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) +"FD" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/obj/structure/cable{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, +/area/offmap/aerostat/inside/lobby) "FF" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/camera/network/research_outpost, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "FJ" = ( @@ -7609,11 +8246,8 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/west) "FK" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 30 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ + scrub_id = "science_outpost" }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -7639,10 +8273,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light/floortube{ - dir = 4; - pixel_x = 5 - }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "FU" = ( @@ -7674,20 +8304,22 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "FX" = ( -/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) -"Gb" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 +"FY" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner{ + stripe_color = "#00FF00" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/area/offmap/aerostat/inside/misclab) +"FZ" = ( +/obj/machinery/alarm{ + pixel_y = 26 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) "Gc" = ( /obj/effect/shuttle_landmark{ @@ -7720,25 +8352,28 @@ /turf/unsimulated/floor/sky/virgo2_sky, /area/offmap/aerostat) "Gf" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"Gi" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) +"Gi" = ( /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/suspension_gen, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Gl" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 4 }, -/obj/structure/table/glass, /obj/random/maintenance/research, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "Gm" = ( @@ -7746,16 +8381,20 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/powercontrol) -"Go" = ( -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +"Gn" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Gq" = ( /obj/structure/cable/heavyduty{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/se) "Gr" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -7789,20 +8428,21 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "Gt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ + scrub_id = "science_outpost" + }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Gu" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Toxins Lab" +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) -"Gv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) "Gy" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -7870,7 +8510,7 @@ icon_state = "4-8" }, /turf/simulated/wall, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "GG" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/yellow{ @@ -7881,17 +8521,22 @@ }, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) -"GK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +"GI" = ( +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 32; + pixel_y = -24 }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) +"GK" = ( /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "GL" = ( -/obj/machinery/meter, /obj/machinery/atmospherics/pipe/manifold/visible/red{ dir = 1 }, @@ -7909,6 +8554,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) +"GO" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/folder/white, +/obj/item/weapon/pen, +/obj/item/weapon/paper_bin, +/obj/item/weapon/hand_labeler, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "GP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -7917,15 +8570,10 @@ /turf/simulated/wall, /area/offmap/aerostat/inside/telesci) "GR" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/structure/closet/crate/science, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "GT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ @@ -7939,40 +8587,64 @@ /obj/effect/floor_decal/industrial/danger/corner{ dir = 4 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = -28 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "GX" = ( -/obj/machinery/atmospherics/binary/pump{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) +"Ha" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) -"Ha" = ( -/obj/machinery/atmospherics/omni/atmos_filter{ - name = "Phoron Filter"; - tag_east = 6; - tag_north = 1; - tag_south = 2 - }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) "Hb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/green, +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Hd" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"Hh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/item/weapon/storage/box/beakers, +/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/weapon/reagent_containers/dropper, +/obj/machinery/reagentgrinder, +/obj/structure/reagent_dispensers/acid{ + pixel_x = 31 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) "Hj" = ( /obj/structure/table/steel_reinforced, /obj/machinery/light_switch{ @@ -8001,13 +8673,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) -"Hn" = ( -/obj/machinery/artifact_harvester, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) "Ho" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8030,18 +8695,24 @@ /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/aerostat) "Hq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) +"Hs" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/machinery/camera/network/research_outpost{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/firingrange) "Ht" = ( /turf/simulated/shuttle/wall/voidcraft/green, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/genetics) "Hu" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -8073,25 +8744,25 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/glass_research{ - name = "Telescience" + name = "Miscellaneous Storage"; + req_one_access = null }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/telesci) -"Hx" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-8" }, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/miscstorage) +"Hx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/portable_atmospherics/canister/air/airlock, /obj/machinery/camera/network/research_outpost{ dir = 8 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Hy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) @@ -8102,16 +8773,27 @@ /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) "HA" = ( -/obj/machinery/artifact_scanpad, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) +"HE" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "HH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -8121,26 +8803,19 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "HK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/glass/reinforced{ + color = "#eacd7c" }, -/obj/machinery/light, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/glassgetsitsownarea) "HL" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible, -/obj/machinery/meter, +/obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "HM" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -8160,7 +8835,10 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/zorrenoffice) "HO" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/flora/pottedplant/subterranean, +/obj/machinery/camera/network/research_outpost{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "HQ" = ( @@ -8171,25 +8849,23 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/southchamb) "HR" = ( -/obj/structure/table/standard, -/obj/item/device/gps{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/device/gps{ - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/device/gps{ - pixel_x = 1; - pixel_y = -1 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/telesci) +/area/offmap/aerostat/inside/miscstorage) "HS" = ( -/obj/structure/flora/pottedplant/crystal, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/westhall) "HT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8202,11 +8878,21 @@ /obj/machinery/atmospherics/binary/pump/on{ dir = 8 }, +/obj/machinery/power/apc, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "HV" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 1 +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -8219,11 +8905,12 @@ /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/aerostat) "Id" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red, -/obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Ig" = ( @@ -8233,27 +8920,33 @@ /turf/simulated/shuttle/wall/voidcraft/green/virgo2/nocol, /area/offmap/aerostat/inside/airlock/east) "Ih" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 6 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Ii" = ( -/obj/machinery/atmospherics/binary/pump/on{ - name = "Scrubber to Waste" - }, /obj/machinery/camera/network/research_outpost{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/red{ + dir = 5 + }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "Ij" = ( /obj/effect/floor_decal/industrial/danger{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/camera/network/research_outpost{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Im" = ( @@ -8270,27 +8963,21 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "In" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/wall, +/area/offmap/aerostat/inside/atmos) "Ip" = ( -/obj/structure/table/standard, -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Ir" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "east bump"; - pixel_x = -22 +/obj/machinery/artifact_analyser, +/obj/machinery/camera/network/research_outpost{ + dir = 4 }, -/obj/structure/cable, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) "Is" = ( /obj/machinery/atmospherics/valve, @@ -8300,12 +8987,10 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/arm/se) "Iu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 8 - }, /obj/structure/table/standard, -/obj/item/weapon/ore/bluespace_crystal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "Iw" = ( @@ -8333,14 +9018,9 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/south) "IA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/blue{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/disease2/diseaseanalyser, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/virology) "IB" = ( /obj/structure/grille, /obj/structure/grille, @@ -8358,6 +9038,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "IH" = ( @@ -8378,7 +9059,6 @@ /obj/structure/cable, /obj/machinery/power/apc{ dir = 8; - name = "east bump"; pixel_x = -22 }, /obj/machinery/mining/drill, @@ -8400,16 +9080,29 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/southchamb) "IN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, /obj/machinery/atmospherics/binary/pump/on{ - name = "phoron pump" + name = "N2O pump" }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) +"IO" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating/virgo2, +/area/offmap/aerostat/inside/virology) "IP" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner{ stripe_color = "#00FF00" }, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/genetics) +"IS" = ( +/obj/machinery/telepad, +/turf/simulated/floor/reinforced, +/area/offmap/aerostat/inside/telesci) "IV" = ( /obj/machinery/airlock_sensor{ dir = 1; @@ -8469,19 +9162,25 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/airlock/south) -"Ji" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 +"Je" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/virology) +"Ji" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/rust, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/rnd{ + req_one_access = null + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/arm/se) "Jn" = ( -/obj/structure/table/steel_reinforced, /obj/random/maintenance/research, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "Jo" = ( @@ -8502,16 +9201,18 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Jr" = ( -/obj/structure/sign/painting/public{ - pixel_y = 30 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "Ju" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "Jz" = ( /obj/structure/grille, @@ -8556,8 +9257,27 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/wall, +/obj/machinery/door/airlock/glass_research{ + name = "Toxins Lab" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) +"JE" = ( +/obj/structure/cable/heavyduty{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/easthall) "JG" = ( /obj/structure/metal_edge, /turf/unsimulated/floor/sky/virgo2_sky, @@ -8578,11 +9298,10 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/airlock/south) "JI" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/effect/floor_decal/rust, +/obj/structure/closet/crate/science, +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "JJ" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced{ @@ -8594,13 +9313,13 @@ /turf/simulated/floor/reinforced/airless, /area/offmap/aerostat/inside/toxins) "JM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_research{ - name = "Toxins Lab"; - req_one_access = null +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "JP" = ( /obj/structure/cable/heavyduty{ @@ -8612,19 +9331,17 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "JQ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/machinery/light{ dir = 4 }, /obj/structure/flora/pottedplant/minitree, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "JR" = ( /obj/machinery/light, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/virology) "JS" = ( /obj/machinery/light{ dir = 1 @@ -8645,15 +9362,24 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/door/airlock/glass_research{ - name = "Toxins Lab" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"JX" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/offmap/aerostat/inside/lobby) +"JY" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) "JZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8661,8 +9387,11 @@ /obj/machinery/light_switch{ pixel_y = 25 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall, /area/offmap/aerostat/inside/telesci) +"Ka" = ( +/turf/simulated/shuttle/wall/voidcraft/hard_corner, +/area/offmap/aerostat/inside/genetics) "Kc" = ( /obj/machinery/door/airlock/external{ frequency = 1380; @@ -8678,15 +9407,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) -"Ke" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/air/airlock, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) "Kh" = ( /obj/effect/floor_decal/industrial/warning/dust/corner, /turf/simulated/floor/tiled/dark, @@ -8702,6 +9425,12 @@ "Kj" = ( /obj/structure/table/standard, /obj/item/device/analyzer, +/obj/machinery/camera/network/research_outpost{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Kk" = ( @@ -8713,11 +9442,7 @@ }, /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/virgo2, -/area/offmap/aerostat/inside/northchamb) -"Kn" = ( -/obj/structure/closet/secure_closet/xenoarchaeologist, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/atmos) "Ko" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8735,18 +9460,14 @@ }, /turf/simulated/shuttle/floor/yellow, /area/shuttle/aerostat) -"Kr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) "Kv" = ( -/turf/simulated/wall, -/area/offmap/aerostat/inside/genetics) +/obj/machinery/button/remote/blast_door{ + id = telesci_blast; + name = "Blast Door Control"; + pixel_x = 25 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/telesci) "Kw" = ( /obj/machinery/atmospherics/unary/heat_exchanger{ dir = 8 @@ -8759,6 +9480,18 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) +"Kz" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/offmap/aerostat/inside/misclab) +"KA" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/westhall) "KC" = ( /obj/machinery/alarm{ pixel_y = 26 @@ -8766,12 +9499,16 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "KD" = ( -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(7) +/obj/structure/cable/heavyduty{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_research{ + name = "Toxins Lab" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/toxins) "KE" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -8790,12 +9527,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/offmap/aerostat/inside/arm/nw) -"KG" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) "KH" = ( /obj/machinery/airlock_sensor/airlock_exterior{ dir = 6; @@ -8824,33 +9555,34 @@ "KK" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/southchamb) +"KM" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/medical{ + name = "Virology Isolation Room"; + req_access = list(39); + req_one_access = null + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/virology) "KN" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner{ stripe_color = "#00FF00" }, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/arm/ne) "KP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "KS" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, /obj/machinery/meter, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) -"KU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "KW" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/door/airlock/external{ @@ -8866,35 +9598,36 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/wall, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "Ld" = ( /turf/simulated/floor, /area/offmap/aerostat/inside/firingrange) "Lf" = ( -/obj/structure/anomaly_container, -/turf/simulated/floor, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air/airlock, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Lg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/table/steel_reinforced, /obj/random/firstaid, /obj/random/maintenance/research, /obj/structure/sign/painting/public{ pixel_x = -30 }, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "Lj" = ( -/obj/structure/cable/heavyduty{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 9 }, +/obj/machinery/light, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Ln" = ( @@ -8904,9 +9637,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/floor_decal/rust, +/obj/structure/closet/crate, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/random/medical/pillbottle, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "Lo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -8917,38 +9654,40 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/north) "Lq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/computer/scan_consolenew, -/obj/item/weapon/paper{ - info = "out of order" - }, -/obj/machinery/camera/network/research_outpost, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) -"Ls" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/firingrange) +/obj/effect/floor_decal/rust, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/offmap/aerostat/inside/westhall) +"Ls" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/airlock/maintenance/rnd{ + req_one_access = null + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/westhall) "Lt" = ( /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "Lu" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/turf/simulated/floor/reinforced, +/area/offmap/aerostat/inside/telesci) "Ly" = ( -/obj/machinery/camera/network/research_outpost{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/outline/red, +/obj/structure/anomaly_container, +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "LB" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/structure/grille, @@ -8956,6 +9695,13 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/offmap/aerostat/inside/xenoarch/chamber) +"LD" = ( +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "LF" = ( /obj/structure/cable/heavyduty{ icon_state = "1-4" @@ -8976,35 +9722,15 @@ /obj/machinery/light, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) -"LI" = ( -/obj/structure/closet/firecloset, -/obj/structure/sign/poster{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) "LK" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/arm/ne) -"LN" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) "LR" = ( -/obj/structure/cable/heavyduty{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/blue, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "LS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -9016,11 +9742,13 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "LT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/se) "LW" = ( /obj/effect/shuttle_landmark{ base_area = /area/offmap/aerostat; @@ -9032,15 +9760,11 @@ /turf/unsimulated/floor/sky/virgo2_sky, /area/offmap/aerostat) "LY" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/wall, +/area/offmap/aerostat/inside/arm/ne) "LZ" = ( /obj/structure/window/reinforced{ dir = 8 @@ -9072,13 +9796,19 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "Mc" = ( -/obj/machinery/telepad, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/reinforced, -/area/offmap/aerostat/inside/telesci) +/obj/structure/cable/heavyduty{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera/network/research_outpost{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/miscstorage) "Md" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -9088,6 +9818,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) +"Mf" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/firingrange) "Mg" = ( /obj/machinery/atmospherics/unary/heater{ dir = 1; @@ -9130,6 +9864,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/structure/flora/pottedplant/mysterious, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "Ml" = ( @@ -9137,7 +9872,7 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "Mn" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9145,23 +9880,13 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Mp" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/wall, /area/offmap/aerostat/inside/xenoarch) "Ms" = ( /obj/effect/floor_decal/industrial/warning/dust, @@ -9176,10 +9901,20 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/west) -"Mv" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 5 +"Mu" = ( +/obj/machinery/atmospherics/unary/freezer{ + icon_state = "freezer" }, +/obj/structure/sign/painting/public{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) +"Mv" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Mw" = ( @@ -9200,34 +9935,48 @@ }, /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/nw) +"MA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/firingrange) +"MB" = ( +/obj/structure/sign/painting/public{ + pixel_y = 30 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "MC" = ( /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) +"ME" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "MH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) -"MK" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "ML" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "MM" = ( @@ -9237,11 +9986,11 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "MO" = ( -/obj/machinery/atmospherics/pipe/tank/phoron{ +/obj/machinery/atmospherics/pipe/tank/nitrous_oxide{ dir = 8 }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "MR" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -9255,6 +10004,12 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/toxins) +"MZ" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "Na" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -9281,9 +10036,8 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "Ng" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/structure/sign/painting/public{ + pixel_x = 30 }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) @@ -9298,17 +10052,16 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/east) "Ni" = ( -/obj/machinery/atmospherics/trinary/mixer/m_mixer{ - dir = 4; - name = "High Power Gas mixer"; - power_rating = 15000 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "Nk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/wall, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/genetics) "Nl" = ( /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) @@ -9328,6 +10081,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/shuttle/wall/hard_corner, /area/shuttle/aerostat) +"Np" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) "Nq" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -9336,35 +10095,50 @@ /obj/effect/floor_decal/industrial/warning/dust, /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/aerostat) +"Ns" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) "Nu" = ( /obj/machinery/atmospherics/pipe/simple/visible/blue{ dir = 5 }, +/obj/machinery/light, /turf/simulated/floor/plating, /area/offmap/aerostat/inside/toxins) "Nw" = ( /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/random/firstaid, +/obj/item/weapon/storage/firstaid, +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/machinery/medical_kiosk, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/telesci) +/area/offmap/aerostat/inside/miscstorage) "Ny" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 1 - }, -/obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) +"NA" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/greengrid, +/area/offmap/aerostat/inside/toxins) "NC" = ( /obj/structure/window/reinforced{ dir = 8 @@ -9393,6 +10167,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ + scrub_id = "science_outpost" + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "NJ" = ( @@ -9400,11 +10177,8 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "NL" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/wall, +/area/offmap/aerostat/inside/arm/ne) "NM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /obj/structure/cable{ @@ -9417,7 +10191,7 @@ dir = 4 }, /turf/simulated/shuttle/wall/voidcraft/green, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "NO" = ( /obj/structure/cable{ icon_state = "1-2" @@ -9428,6 +10202,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) +"NP" = ( +/turf/simulated/wall, +/area/offmap/aerostat/inside/misclab) "NQ" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -9436,16 +10213,13 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "NT" = ( -/obj/machinery/atmospherics/portables_connector{ +/obj/structure/closet/excavation, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) +"NU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, -/obj/machinery/camera/network/research_outpost{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) -"NU" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "NV" = ( @@ -9474,6 +10248,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) +"NY" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "NZ" = ( /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/xenoarch/chamber) @@ -9481,13 +10261,13 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_research{ - name = "Xenoarchaeology" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/rnd{ + req_one_access = null + }, /turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/arm/ne) "Ob" = ( /obj/effect/floor_decal/industrial/warning, /obj/structure/cable{ @@ -9501,12 +10281,8 @@ }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) -"Oe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) "Og" = ( -/obj/machinery/radiocarbon_spectrometer, +/obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Oj" = ( @@ -9522,8 +10298,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) +"Op" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Os" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -9556,23 +10339,11 @@ }, /turf/simulated/wall, /area/offmap/aerostat/inside/toxins) -"Ow" = ( -/obj/machinery/vending/wallmed1{ - pixel_x = 30 - }, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) "Ox" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Oy" = ( @@ -9591,6 +10362,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"OA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "OD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9599,7 +10382,6 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "OE" = ( @@ -9607,21 +10389,17 @@ dir = 4 }, /obj/structure/table/standard, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -6; - pixel_y = 6 +/obj/item/device/gps{ + pixel_x = -5; + pixel_y = 5 }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 6; - pixel_y = 6 +/obj/item/device/gps{ + pixel_x = -2; + pixel_y = 2 }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/weapon/storage/backpack/parachute{ - pixel_x = 6; - pixel_y = -6 +/obj/item/device/gps{ + pixel_x = 1; + pixel_y = -1 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) @@ -9639,24 +10417,27 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "OI" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Genetics Closet" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable{ icon_state = "1-2" }, /obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/genetics) -"OL" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 +/obj/machinery/door/airlock/glass_research{ + name = "Miscellaneous Lab" }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/misclab) +"OJ" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) +"OL" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/glass/reinforced{ + color = "#eacd7c" + }, +/area/offmap/aerostat/glassgetsitsownarea) "OM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -9671,10 +10452,29 @@ }, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) +"OO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/atmos) +"OP" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/medical{ + name = "Virology Lab"; + req_access = list(39); + req_one_access = null + }, +/obj/machinery/door/blast/regular/open{ + id = 2; + name = "Virology Emergency Quarantine" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/offmap/aerostat/inside/virology) "OR" = ( /obj/machinery/power/apc{ dir = 8; - name = "east bump"; pixel_x = -22 }, /obj/structure/cable{ @@ -9690,10 +10490,8 @@ /turf/simulated/shuttle/plating/carry, /area/shuttle/aerostat) "OW" = ( -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 +/obj/machinery/atmospherics/unary/freezer{ + icon_state = "freezer" }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -9711,24 +10509,42 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "Pa" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/turf/simulated/floor/grass, +/area/offmap/aerostat/inside/genetics) "Pe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 6 +/obj/machinery/atmospherics/binary/pump, +/obj/machinery/atmospherics/pipe/simple/hidden/universal{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Ph" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) +/obj/structure/dispenser, +/obj/machinery/alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) +"Pi" = ( +/obj/structure/closet/walllocker_double/medical/west, +/obj/structure/table/reinforced, +/obj/item/weapon/soap, +/obj/item/weapon/storage/box/gloves, +/obj/item/weapon/storage/box/masks, +/obj/item/weapon/storage/box/beakers, +/obj/item/weapon/storage/box/beakers, +/obj/item/weapon/storage/fancy/vials, +/obj/item/weapon/storage/box/syringes, +/obj/item/device/antibody_scanner, +/obj/item/weapon/storage/box/syringes, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "Pl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9736,6 +10552,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "Po" = ( @@ -9745,18 +10564,22 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "Pq" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/black, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Pr" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/blue, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/filingcabinet/filingcabinet, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -9793,13 +10616,15 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_research{ - name = "Telescience" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/telesci) +/obj/structure/sign/poster{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/miscstorage) "PJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -9813,18 +10638,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) +"PK" = ( +/obj/structure/table/reinforced, +/obj/machinery/camera/network/research_outpost{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "PN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) -"PO" = ( -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/offmap/aerostat/inside/misclab) "PP" = ( -/obj/structure/sign/painting/public{ - pixel_x = 30 +/obj/structure/closet/crate/bin{ + anchored = 1 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -9853,26 +10682,25 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/toxins) -"PT" = ( -/obj/effect/floor_decal/industrial/warning{ +"PU" = ( +/obj/structure/closet/secure_closet/xenoarchaeologist, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) +"PX" = ( +/obj/machinery/atmospherics/portables_connector/aux{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, +/obj/machinery/portable_atmospherics/canister/air, /obj/machinery/camera/network/research_outpost{ - dir = 1 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) -"PU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/black{ - dir = 8 + dir = 4 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Qa" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/black, +/obj/machinery/atmospherics/binary/pump{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Qb" = ( @@ -9895,9 +10723,11 @@ /turf/simulated/wall, /area/offmap/aerostat/inside/toxins) "Qe" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/light_switch{ + pixel_y = 24 }, +/obj/structure/flora/pottedplant/crystal, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "Qg" = ( @@ -9905,14 +10735,15 @@ /turf/unsimulated/floor/sky/virgo2_sky, /area/offmap/aerostat) "Qh" = ( -/obj/structure/table/standard, -/obj/item/stack/nanopaste, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/effect/floor_decal/spline/plain{ - dir = 4 +/obj/machinery/vending/phoronresearch{ + name = "Toximate 2556"; + products = list(/obj/item/device/transfer_valve = 3, /obj/item/device/assembly/timer = 6, /obj/item/device/assembly/signaler = 6, /obj/item/device/assembly/prox_sensor = 6, /obj/item/device/assembly/igniter = 12) }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/xenoarch) +/obj/machinery/camera/network/research_outpost{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Qk" = ( /obj/effect/floor_decal/rust, /obj/effect/floor_decal/industrial/warning/dust{ @@ -9938,12 +10769,14 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/drillstorage) "Qr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 4 +/obj/machinery/atmospherics/omni/atmos_filter{ + name = "N2O Filter"; + tag_east = 7; + tag_north = 1; + tag_south = 2 }, -/obj/machinery/atmospherics/pipe/simple/hidden/black, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "Qs" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -9992,26 +10825,30 @@ /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/aerostat) "Qz" = ( -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/pill_bottle/dylovene, -/obj/item/weapon/storage/pill_bottle/dylovene, -/obj/item/weapon/storage/box/disks, -/obj/item/toy/figure/geneticist, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/westhall) "QA" = ( /obj/structure/table/standard, -/obj/structure/reagent_dispensers/acid{ - pixel_x = -32 +/obj/item/weapon/anobattery, +/obj/item/weapon/anobattery{ + pixel_x = 5; + pixel_y = 2 }, -/obj/machinery/reagentgrinder, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/item/weapon/anobattery{ + pixel_x = -4; + pixel_y = 3 }, -/obj/structure/cable{ - icon_state = "1-2" +/obj/item/weapon/anobattery{ + pixel_x = -5; + pixel_y = -3 }, -/turf/simulated/floor/tiled, +/obj/item/weapon/tool/screwdriver, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "QE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -10020,14 +10857,9 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "QH" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/xenoarch) +/obj/structure/closet/firecloset, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "QI" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -10051,14 +10883,6 @@ }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) -"QN" = ( -/obj/structure/table/standard, -/obj/item/clothing/glasses/welding, -/obj/item/weapon/weldingtool, -/obj/item/device/analyzer, -/obj/item/weapon/tool/wrench, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) "QO" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/blue, /obj/machinery/meter, @@ -10073,6 +10897,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/flora/pottedplant/mysterious, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "QT" = ( @@ -10106,8 +10931,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/green, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -10152,11 +10980,8 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/north) "Rb" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/turf/simulated/wall, +/area/offmap/aerostat/inside/genetics) "Rd" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -10175,14 +11000,13 @@ /area/offmap/aerostat/inside/westhall) "Rf" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/offmap/aerostat/inside/drillstorage) +/area/offmap/aerostat/inside/arm/se) "Ri" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "Rj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10217,6 +11041,7 @@ "Rm" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/table/reinforced, +/obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "Rn" = ( @@ -10317,17 +11142,10 @@ icon_state = "4-8" }, /turf/simulated/wall, -/area/offmap/aerostat/inside/drillstorage) +/area/offmap/aerostat/inside/miscstorage) "RE" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/camera/network/research_outpost{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/turf/simulated/wall, +/area/offmap/aerostat/inside/arm/se) "RF" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -10351,6 +11169,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/airlock/south) +"RI" = ( +/obj/machinery/atmospherics/binary/pump{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "RK" = ( /obj/effect/floor_decal/rust, /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -10373,6 +11197,9 @@ /area/offmap/aerostat/inside/firingrange) "RM" = ( /obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "RN" = ( @@ -10390,19 +11217,21 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/arm/se) "RP" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/radiocarbon_spectrometer, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "RU" = ( -/obj/machinery/chem_master, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/structure/sign/poster{ dir = 8; pixel_x = -32 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) "RV" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -10410,7 +11239,6 @@ /area/shuttle/aerostat) "RW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -10418,19 +11246,15 @@ dir = 8; pixel_x = 24 }, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "Sa" = ( -/obj/machinery/atmospherics/unary/heat_exchanger{ - dir = 1 +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, -/obj/structure/window/basic{ - dir = 1 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/machinery/camera/network/research_outpost, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Sb" = ( /obj/structure/cable/heavyduty{ @@ -10460,9 +11284,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, @@ -10473,6 +11294,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 30 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Sp" = ( @@ -10485,7 +11309,12 @@ /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/north) "Sr" = ( -/obj/machinery/atmospherics/binary/pump, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Sv" = ( @@ -10501,10 +11330,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/white, +/obj/machinery/door/airlock/glass_research{ + name = "Toxins Lab" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) +"SC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/window/reinforced/full, +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "SE" = ( -/obj/machinery/atmospherics/binary/pump{ +/obj/machinery/atmospherics/portables_connector{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -10522,12 +11364,26 @@ /obj/effect/map_helper/airlock/atmos/pump_out_internal, /turf/simulated/floor, /area/offmap/aerostat/inside/arm/sw) +"SH" = ( +/obj/machinery/alarm{ + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) +"SI" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 8 + }, +/obj/item/weapon/paper{ + info = "out of order" + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "SJ" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/device/flashlight/lamp, -/obj/machinery/light, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch) "SL" = ( /obj/structure/cable{ @@ -10536,10 +11392,14 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "SN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/suspension_gen, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "SO" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 8 @@ -10554,12 +11414,9 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "SP" = ( -/obj/machinery/vending/tool, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, +/obj/machinery/medical_kiosk, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/telesci) +/area/offmap/aerostat/inside/miscstorage) "SQ" = ( /obj/machinery/atmospherics/unary/heat_exchanger{ dir = 4 @@ -10639,25 +11496,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/telesci) +/area/offmap/aerostat/inside/miscstorage) "Td" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Toxins Lab" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel_ridged, +/obj/machinery/atmospherics/portables_connector, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Te" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "Tg" = ( @@ -10681,10 +11529,8 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "Tn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Tq" = ( @@ -10695,6 +11541,14 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) +"Tt" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "Tv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -10702,6 +11556,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) +"Tx" = ( +/turf/simulated/wall, +/area/offmap/aerostat/inside/miscstorage) +"Tz" = ( +/obj/item/modular_computer/console/preset/research{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/telesci) "TB" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/offmap/aerostat/inside/powercontrol) @@ -10718,6 +11581,10 @@ }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) +"TM" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "TO" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; @@ -10784,13 +11651,15 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/north) "TW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 4 +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access = list(7) }, -/turf/simulated/wall, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "TX" = ( /obj/structure/window/reinforced{ @@ -10814,18 +11683,22 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/toxins) "TZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) -"Ub" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/closet/l3closet/virology, +/obj/machinery/light{ + dir = 4 }, -/obj/machinery/portable_atmospherics/canister/air, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/virology) +"Ub" = ( +/obj/machinery/vending/tool, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/miscstorage) "Ue" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -10838,12 +11711,24 @@ /turf/simulated/shuttle/floor/yellow, /area/shuttle/aerostat) "Uf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) +/obj/structure/closet/wardrobe/virology_white, +/obj/machinery/camera/network/research_outpost{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) +"Ug" = ( +/obj/effect/floor_decal/rust, +/obj/random/maintenance/research, +/obj/random/maintenance/research, +/obj/random/tool, +/obj/random/tool, +/obj/structure/closet, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "Uh" = ( /obj/structure/cable{ icon_state = "4-8" @@ -10851,19 +11736,16 @@ /turf/simulated/wall, /area/offmap/aerostat/inside/telesci) "Ui" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Miscellaneous Lab" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/misclab) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/dark, +/area/offmap/aerostat/inside/lobby) "Uj" = ( -/obj/machinery/artifact_scanpad, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor, /area/offmap/aerostat/inside/xenoarch) "Ul" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -10880,6 +11762,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) +"Uo" = ( +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "Up" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -10903,10 +11788,11 @@ /turf/simulated/floor, /area/offmap/aerostat/inside/arm/se) "Us" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/area/offmap/aerostat/inside/atmos) "Ut" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 @@ -10946,28 +11832,15 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/xenoarch/chamber) "UA" = ( -/obj/machinery/washing_machine, /obj/machinery/alarm{ pixel_y = 26 }, /obj/machinery/camera/network/research_outpost{ dir = 4 }, +/obj/machinery/medical_kiosk, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) -"UB" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) "UC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -10994,14 +11867,21 @@ /obj/structure/cable/heavyduty{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "UH" = ( -/obj/structure/closet/excavation, +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/toxins) "UL" = ( /obj/structure/cable{ icon_state = "2-4" @@ -11011,15 +11891,22 @@ }, /turf/simulated/floor/bluegrid, /area/offmap/aerostat/inside/powercontrol) +"UM" = ( +/obj/structure/bed/chair/office/light, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "UO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/reinforced, +/area/offmap/aerostat/inside/telesci) +"UP" = ( +/obj/machinery/light{ + dir = 1 }, -/obj/structure/sign/painting/public{ - pixel_y = 30 +/obj/structure/closet/crate/bin{ + anchored = 1 }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/firingrange) "US" = ( /obj/machinery/door/airlock/glass_research{ name = "Atmospherics"; @@ -11033,35 +11920,31 @@ /turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/atmos) "UV" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/wall, +/area/offmap/aerostat/inside/arm/ne) "UW" = ( -/turf/simulated/shuttle/wall/voidcraft/green, -/area/offmap/aerostat/inside/genetics) -"UZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, +/turf/simulated/wall, +/area/offmap/aerostat/inside/telesci) +"UZ" = ( /obj/structure/cable{ icon_state = "2-4" }, -/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/northchamb) "Va" = ( @@ -11075,15 +11958,18 @@ pixel_y = 26 }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table/standard, +/obj/machinery/computer/atmoscontrol/laptop{ + monitored_alarm_ids = list("anomaly_testing"); + req_one_access = list(47,24,11) + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Vd" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/grille, -/obj/machinery/atmospherics/pipe/simple/hidden/green, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor, +/obj/machinery/atmospherics/pipe/simple/hidden/green{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Ve" = ( /obj/machinery/atmospherics/portables_connector{ @@ -11098,29 +11984,31 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Vi" = ( -/obj/structure/table/standard, -/obj/item/device/assembly_holder/timer_igniter, -/obj/item/weapon/tool/screwdriver, -/obj/structure/sign/painting/public{ - pixel_x = -30 +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/fountain, +/obj/machinery/portable_atmospherics/canister/empty, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) -"Vk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/offmap/aerostat/inside/xenoarch) "Vl" = ( /obj/machinery/atmospherics/binary/algae_farm/filled{ dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) +"Vo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/offmap/aerostat/inside/lobby) +"Vr" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/offmap/aerostat/inside/southchamb) "Vs" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/yellow{ @@ -11132,13 +12020,16 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "Vt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/suspension_gen, /obj/machinery/camera/network/research_outpost{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "Vu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -11147,11 +12038,11 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "Vx" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "Vz" = ( /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) @@ -11189,6 +12080,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/flora/pottedplant/crystal, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "VJ" = ( @@ -11204,6 +12096,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) +"VL" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "VM" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -11255,16 +12153,22 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/arm/ne) "VU" = ( -/obj/machinery/light{ - dir = 1 +/obj/effect/floor_decal/rust, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/turf/simulated/floor, +/area/offmap/aerostat/inside/xenoarch) "VX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "VY" = ( @@ -11274,16 +12178,11 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "Wb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 8 +/obj/machinery/camera/network/research_outpost{ + dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/portable_atmospherics/canister/empty, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "Wd" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner{ stripe_color = "#00FF00" @@ -11309,20 +12208,30 @@ /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Wh" = ( -/obj/machinery/camera/network/research_outpost{ - dir = 8 +/obj/machinery/power/apc{ + dir = 4; + pixel_x = 28 + }, +/obj/structure/cable{ + icon_state = "0-8" }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/telesci) +/area/offmap/aerostat/inside/miscstorage) "Wi" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) +"Wj" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "Wk" = ( -/obj/machinery/portable_atmospherics/canister/empty, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Wn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -11346,6 +12255,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/flora/pottedplant/subterranean, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/southchamb) "Wt" = ( @@ -11382,9 +12292,6 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "Wz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, @@ -11394,6 +12301,10 @@ /obj/structure/cable{ icon_state = "2-8" }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "WC" = ( @@ -11409,8 +12320,22 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/table/rack, +/obj/item/clothing/suit/space/anomaly/heat, +/obj/item/clothing/head/helmet/space/anomaly/heat, +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/storage/excavation, +/obj/item/weapon/tool/wrench, +/obj/item/weapon/pickaxe, +/obj/item/device/measuring_tape, +/obj/item/weapon/storage/belt/archaeology, +/obj/item/stack/flag/yellow, +/obj/item/clothing/mask/breath, +/obj/machinery/alarm{ + pixel_y = 26 + }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "WF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -11419,11 +12344,11 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/atmos) "WH" = ( -/obj/structure/table/steel_reinforced, /obj/random/maintenance/research, /obj/structure/sign/painting/public{ pixel_x = 30 }, +/obj/structure/table/borosilicate, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "WJ" = ( @@ -11443,20 +12368,27 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/telesci) +/area/offmap/aerostat/inside/miscstorage) +"WP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/blue, +/obj/machinery/medical_kiosk, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "WQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 4 }, -/obj/machinery/power/apc{ - dir = 1; - pixel_y = 24 - }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/structure/cable/heavyduty{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) +"WR" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/book/manual/virology, +/obj/item/device/antibody_scanner, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "WS" = ( /obj/effect/shuttle_landmark{ base_area = /area/offmap/aerostat; @@ -11494,10 +12426,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/table/standard, -/obj/item/weapon/tool/screwdriver, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) +"WY" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "WZ" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 4 @@ -11505,11 +12439,18 @@ /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "Xa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 }, -/turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/obj/effect/floor_decal/rust, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor, +/area/offmap/aerostat/inside/westhall) "Xb" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/yellow{ @@ -11531,9 +12472,19 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/flora/pottedplant/subterranean, -/turf/simulated/floor/tiled/white, +/turf/simulated/wall, /area/offmap/aerostat/inside/xenoarch) +"Xm" = ( +/obj/machinery/power/apc{ + dir = 8; + pixel_x = -22 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "Xo" = ( /obj/effect/floor_decal/industrial/danger{ dir = 1 @@ -11552,14 +12503,17 @@ /turf/simulated/shuttle/floor/yellow, /area/shuttle/aerostat) "Xr" = ( -/obj/structure/window/reinforced, -/obj/machinery/portable_atmospherics/canister/phoron, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 6 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Xt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable{ icon_state = "1-2" }, @@ -11579,10 +12533,12 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/item/modular_computer/console/preset/research, +/obj/structure/table/standard, +/obj/item/device/multitool, +/obj/item/weapon/tool/screwdriver, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) "XA" = ( @@ -11602,13 +12558,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/floor, +/area/offmap/aerostat/inside/arm/ne) "XH" = ( -/obj/structure/table/reinforced, /obj/machinery/recharger/wallcharger{ pixel_x = 4; pixel_y = 20 @@ -11621,12 +12573,13 @@ pixel_x = 4; pixel_y = 36 }, +/obj/item/modular_computer/console, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/firingrange) "XJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/wall, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/genetics) "XK" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -11640,29 +12593,32 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/inside/arm/ne) "XL" = ( -/obj/machinery/door/airlock/glass_research{ - name = "Xenoarchaeology" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/xenoarch) +/turf/simulated/wall, +/area/offmap/aerostat/inside/virology) "XM" = ( /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/airlock/south) +"XN" = ( +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "XO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/closet/crate/bin{ - anchored = 1 +/obj/structure/sign/painting/public{ + pixel_y = 30 }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/telesci) @@ -11676,7 +12632,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/arm/ne) "XQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/meter, @@ -11695,11 +12651,20 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) "XV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 6 +/obj/structure/bed/chair/comfy/black{ + dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/floor/glass/reinforced{ + color = "#eacd7c" + }, +/area/offmap/aerostat/glassgetsitsownarea) +"XW" = ( +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = -6 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "XX" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -11728,20 +12693,21 @@ /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/drillstorage) "Yg" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/obj/machinery/disease2/incubator, +/obj/structure/reagent_dispensers/virusfood{ + pixel_y = 28 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "Yh" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -11772,12 +12738,16 @@ }, /obj/machinery/power/apc{ dir = 8; - name = "east bump"; pixel_x = -22 }, /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/offmap/aerostat/inside/arm/ne) +"Yj" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/black, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Yl" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/light/floortube{ @@ -11809,9 +12779,6 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "Yp" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, /obj/machinery/light{ dir = 1 }, @@ -11834,7 +12801,11 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "Yt" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/machinery/atmospherics/portables_connector, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, +/obj/machinery/camera/network/research_outpost, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Yu" = ( @@ -11848,52 +12819,79 @@ /turf/simulated/floor/plating/virgo2, /area/offmap/aerostat/solars) "Yv" = ( -/obj/structure/closet/crate/bin{ - anchored = 1 - }, +/obj/machinery/autolathe, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/misclab) +/area/offmap/aerostat/inside/miscstorage) "Yw" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "Yx" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/shuttle/wall/voidcraft/green, /area/offmap/aerostat/inside/airlock/west) "YB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/black{ - dir = 9 + dir = 4 + }, +/obj/machinery/atmospherics/binary/pump/on{ + name = "phoron pump" }, /turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) -"YE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) -"YJ" = ( -/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary{ - scrub_id = "science_outpost" +/area/offmap/aerostat/inside/atmos) +"YC" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper_bin{ + pixel_x = 4; + pixel_y = 6 }, +/obj/item/weapon/folder/white, +/obj/item/weapon/pen, /obj/machinery/light{ dir = 4 }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) -"YN" = ( -/obj/effect/floor_decal/industrial/warning{ +/area/offmap/aerostat/inside/xenoarch) +"YE" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/reagent_dispensers/coolanttank, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/xenoarch) +"YH" = ( +/obj/structure/table/reinforced, +/obj/machinery/computer/med_data/laptop{ + dir = 1 + }, +/obj/machinery/camera/network/research_outpost{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) +"YJ" = ( +/obj/machinery/atmospherics/binary/pump{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) +"YL" = ( +/obj/structure/bed/chair/bay, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) +"YN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor, -/area/offmap/aerostat/inside/xenoarch) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/disease2/isolator, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "YS" = ( /obj/machinery/door/blast/regular{ dir = 2; @@ -11919,12 +12917,17 @@ /turf/simulated/shuttle/wall/voidcraft/green/virgo2, /area/offmap/aerostat/inside/arm/se) "YX" = ( -/obj/structure/reagent_dispensers/coolanttank, -/obj/machinery/camera/network/research_outpost{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 }, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/xenoarch) +/area/offmap/aerostat/inside/toxins) "Zb" = ( /obj/structure/cable/heavyduty{ icon_state = "4-8" @@ -11935,11 +12938,10 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) "Zc" = ( -/obj/machinery/light/floortube{ - dir = 4; - pixel_x = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/closet/crate/bin{ + anchored = 1 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/xenoarch) "Ze" = ( @@ -11949,36 +12951,59 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/turf/simulated/wall, +/area/offmap/aerostat/inside/atmos) "Zg" = ( /obj/machinery/camera/network/research_outpost, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) +"Zh" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "Zi" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 1 + }, +/obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Zj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/obj/structure/window/basic{ + dir = 1 + }, +/obj/structure/window/basic{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/heat_exchanger{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 8 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_ridged, /area/offmap/aerostat/inside/toxins) "Zn" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 }, /obj/effect/floor_decal/industrial/warning/cee, +/obj/machinery/atmospherics/pipe/simple/hidden/black{ + dir = 5 + }, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Zo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/green{ - dir = 6 +/obj/structure/cable{ + icon_state = "4-8" }, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/black, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) "Zp" = ( @@ -11995,11 +13020,22 @@ /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/zorrenoffice) "Zu" = ( -/obj/machinery/atmospherics/unary/freezer{ - icon_state = "freezer" +/obj/machinery/light{ + dir = 4 }, +/obj/structure/table/rack, +/obj/item/clothing/suit/space/anomaly/heat, +/obj/item/clothing/head/helmet/space/anomaly/heat, +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/storage/excavation, +/obj/item/weapon/tool/wrench, +/obj/item/weapon/pickaxe, +/obj/item/device/measuring_tape, +/obj/item/weapon/storage/belt/archaeology, +/obj/item/stack/flag/yellow, +/obj/item/clothing/mask/breath, /turf/simulated/floor/tiled/white, -/area/offmap/aerostat/inside/toxins) +/area/offmap/aerostat/inside/xenoarch) "Zv" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ cycle_to_external_air = 1; @@ -12014,12 +13050,8 @@ /area/offmap/aerostat/inside/toxins) "Zw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/closet/wardrobe/genetics_white, -/obj/machinery/camera/network/research_outpost{ - dir = 8 - }, /turf/simulated/floor/tiled, -/area/offmap/aerostat/inside/genetics) +/area/offmap/aerostat/inside/misclab) "Zx" = ( /obj/effect/floor_decal/industrial/warning/dust, /obj/machinery/door/airlock/external{ @@ -12044,6 +13076,18 @@ "ZA" = ( /turf/simulated/floor/tiled, /area/offmap/aerostat/inside/xenoarch) +"ZD" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = -4 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) +"ZE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/blue, +/turf/simulated/wall, +/area/offmap/aerostat/inside/toxins) "ZG" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 @@ -12058,6 +13102,10 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/westhall) +"ZI" = ( +/obj/machinery/dna_scannernew, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/genetics) "ZJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -12099,6 +13147,9 @@ /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/offmap/aerostat/inside/lobby) "ZO" = ( @@ -12109,13 +13160,35 @@ }, /turf/simulated/floor/tiled/techfloor, /area/offmap/aerostat/inside/easthall) +"ZP" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/closet/secure_closet/personal/patient, +/obj/machinery/alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/virology) "ZR" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/offmap/aerostat/inside/northchamb) +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/offmap/aerostat/inside/toxins) "ZS" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/black{ + dir = 1 + }, /obj/machinery/meter, /turf/simulated/floor/tiled/white, /area/offmap/aerostat/inside/toxins) @@ -17611,7 +18684,7 @@ XX Rl aE EN -UW +EN aw aw aw @@ -17752,7 +18825,7 @@ he Yx cI KW -EN +Jo gf Bz aw @@ -17894,8 +18967,8 @@ he FJ lL jL -EN -Bt +Jo +Qz Bz Bz aw @@ -18038,7 +19111,7 @@ Wt qN Jo if -Go +Qz Bz Bz aw @@ -18177,13 +19250,13 @@ PS PS Rr Re -qN -Jo +HS +Ls Lq Xa -Go +ni Bz -UW +Jo aw aw aw @@ -18319,13 +19392,13 @@ oW PS Rr Lt -qN +KA +Jo +ZK +ZK +ZK +ZK Jo -Bu -if -Go -Go -UW Bz aw aw @@ -18463,13 +19536,13 @@ Rr NV Hq Jo -Kv -Kr -Go -Go -Go -Bz -Bz +NP +Yw +wA +Yw +Yw +EA +EA aw aw aw @@ -18605,14 +19678,14 @@ Qd Zg HH FU -Kv +NP yG -Go -Qz -Go -Go -UW -UW +Yw +Yw +Yw +Yw +zH +zH aw aw aw @@ -18747,15 +19820,15 @@ Qd Tr Sl Lt -Kv +NP tU -Go -Go -Go -Go -Go -Bz -Bz +Yw +Yw +Yw +Yw +Yw +EA +EA aw aw aw @@ -18895,10 +19968,10 @@ Ey kR fo Ml -Go -Go -Bz -Bz +Yw +Yw +EA +EA aw aw aw @@ -19031,17 +20104,17 @@ TY ZK nR Lt -Kv -jS +NP +Yw Yw ey -Bh +jw ef -Go -Go -Go -Bz -Bz +Yw +Yw +Yw +EA +EA aw aw aw @@ -19173,18 +20246,18 @@ xM ZK pP yN -Kv -tA -LN +NP +Yw +Yw jj Zw oZ -Oe +Zw qS -Oe -hM -UW -UW +Yw +Yw +zH +zH aw aw aw @@ -19315,19 +20388,19 @@ pX ZK wF Lt -Kv -Kv -Kv -Kv -Kv -Kv -Kv -Kv -Kv -Kv -Kv -gf -UW +NP +Yw +Yw +Yw +Yw +ef +Yw +Yw +Yw +Yw +Yw +FY +zH aw aw aw @@ -19441,7 +20514,7 @@ ac Rr Rr ce -Eu +PX Eu Dh Jp @@ -19457,20 +20530,20 @@ CQ Qd lz Lt -iX -pu -Nl -Nl +NP +Yw +Kz +Yw yX kq -Nl -Nl -Ke -Ke -yX -sz -rq -rq +Yw +Yw +Yw +Kz +Yw +Yw +zH +zH aw aw aw @@ -19588,11 +20661,11 @@ Lj Dh hu Pe -xu -qC -qC -qC -hu +ph +RI +WY +Op +lr Qd ux yO @@ -19600,18 +20673,18 @@ Qd wF Lt iX -fR -Nl -Nl -Nl -Nl -Nl -Nl -Ls -Ls -Nl -jN -Nl +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX +iX oA rq rq @@ -19724,15 +20797,15 @@ ac mN ce Qd +qC +WQ Qd -jM -un Dh Yp CE Qa GX -Yt +Yb Mv yI Qd @@ -19742,20 +20815,20 @@ Qd il co vP -Dl HJ HJ HJ -HJ -HJ -qe -mY -bm UG -jw -bO -bO -bO +Hs +HJ +HJ +HJ +HJ +UG +HJ +HJ +qv +vu vT nN nN @@ -19863,18 +20936,18 @@ aw aw aw Rr -QN +Vi Vi bG -Qd -tP +qC +WQ un Dh mu MH Zi Zj -Zj +dz Ay kO Qd @@ -19885,19 +20958,19 @@ Ek ZH iX Qe -Nl -Nl -Nl -Nl -Nl +MA +MA +MA +MA +MA tJ Nl Nl Nl Nl Nl -Nl -Nl +AR +AR oA uS cU @@ -20008,8 +21081,8 @@ Rr mL ig oK -Qd -IA +qC +WQ un Dh FF @@ -20026,14 +21099,14 @@ Qd Ek ZH iX -Nl +UP Nl Nl Nl Nl Nl fJ -vM +mm Dq ZL TX @@ -20147,23 +21220,23 @@ aw Rr Rr qU -MM -qC +qU +qU io -vR -jM -un +qC +WQ +Eb Dh Gt TF HV -Sa -aF -bR -Br Qd -Zu -DI +Qd +bR +Gt +Qd +Mu +po Qd PR ZH @@ -20287,30 +21360,30 @@ aw aw de ce -hG -xC zu -qC +zu +zu +zu mD Vd Hb nV bW -YJ +Qd Sw -xK Qd Qd -fh -YJ Qd -Jr +Qd +Qd +Qd +qC HU kf ck Md iX -HS +at Nl Nl at @@ -20429,23 +21502,23 @@ aw de de Qd -Qd -Qd -Bc +Ha +Gu +Gu Gu TW -Qd +lT WQ -LR -Qd +MM Qd +Ph JV +NA +vY Qd -Qd -Qd -Qd -Qd -Qd +FK +Gn +oi MM Sv Wn @@ -20453,11 +21526,11 @@ VJ ZV iX DG -Nl +Mf Nl Wi Nl -Nl +Mf FT NJ lI @@ -20569,24 +21642,24 @@ aw aw de wC -xP +aF Qd ol -qC -hB -Yb +ol +ol +ol xO JM gL ud +KD jy -GR xy jy DH +KD +jy jy -DH -GR jy TP DL @@ -20710,26 +21783,26 @@ Qg aw de wC -Xr +uN Hy tv NU Yb -wG -Zo +Yb +Yb Ox -Qd +mi ji ib -ib -ib +LR +Pr nh aI -aI -aI -aI +ou +ZE +WP wr -qC +Zh qC CC Wn @@ -20742,7 +21815,7 @@ Nl Nl Nl Nl -yK +eA NJ lI Ld @@ -20851,8 +21924,8 @@ aw Qg de wC -Gf -Xr +xP +xP mt Qd NH @@ -20860,26 +21933,26 @@ Oz CM hU QV -Qd +oc nb -qC FK -qC +Qd +Qh zb Ca -qC -qC +rz +Qd PP jM hs -qC -QV +uF +zD Wn XT ZH iX Rm -bx +ye ye Ew mA @@ -20898,7 +21971,7 @@ ID ID iX PJ -tR +eW KK KK aw @@ -20992,9 +22065,9 @@ aw aw de wC -ZR -Gf -Xr +Ny +xP +xP ch Qd Qd @@ -21003,18 +22076,18 @@ Qd Ov SU GK +wG OM -OM -nK -OM +GK +GK zV +rU OM -Td OM OM JD -nK -OM +GK +rU kG Ry Yh @@ -21040,8 +22113,8 @@ iX iX iX Nm -eW -eW +bF +CN KK KK Qg @@ -21133,10 +22206,10 @@ aw aw de wC -ju -ZR -Gf -Xr +xP +xP +xP +xP mt Ce cB @@ -21145,14 +22218,14 @@ cB cB GF gD -qC +xg Ly -oc -qC +Qd +FK mc +Gn +xu qC -qC -oc kt QO JT @@ -21183,7 +22256,7 @@ VI ie JS eW -eW +fP wz KK KK @@ -21274,11 +22347,11 @@ aw aw de de -mi -ju -ZR -Gf -Xr +xP +xP +xP +xP +xP lX Ce bK @@ -21286,11 +22359,11 @@ CO Cl PN GF -qC -qC -qC -qC -qC +qf +xs +Gf +Qd +QH mc qC qC @@ -21414,13 +22487,13 @@ iW la la la -BA -KD -sm -Ar -lk -vm -qf +de +ld +vt +vt +vt +uh +ge Pl As bw @@ -21428,14 +22501,14 @@ AL WF XQ bC -qC -qC -zJ -zJ -qC +Ly +xK +Ly +Qd +Sa Ih -xU -xU +qC +rf xU xU Wf @@ -21553,31 +22626,31 @@ aw aw aw kk -Wk +qJ UZ -Wb +vt sN -vt -vt -vt -vt -vt -vt +pH +OL +HK +XV +Cd +Cm wi Ce Ti bP no cC -GF +eR VU -qC +zr Vx -HL +Qd Sr nB lW -qC +Yj qC qC qC @@ -21595,7 +22668,7 @@ Ym Ym Ym Ym -Ym +wl Ym Ym Ym @@ -21610,9 +22683,9 @@ ie QX eW eW -eW -eW -eW +eJ +eJ +eJ eW Bq Eh @@ -21695,14 +22768,14 @@ aw aw aw kk -Wk +ry Te xP xP xP -xP -xP -xP +OL +HK +XV xP xP oJ @@ -21711,18 +22784,18 @@ qi Vl bA QE -GF -qC -qC -JI +fh +rg +Uj JI +Qd +SE +YX qC -og +AC +XW qC qC -qC -qC -Pr BG Az aJ @@ -21752,9 +22825,9 @@ ie QX eW eW -VG -VG -VG +HK +HK +HK eW BP it @@ -21839,13 +22912,13 @@ cO de qj cX -Ng -OL -OL -OL -OL -OL +xP +xP +xP OL +HK +XV +xP hp yu Ce @@ -21853,19 +22926,19 @@ uu Vl cA QE -GF -qC -qC -qC -qC +fi +rH +Uj +GR +Qd qC og qC -zJ +AC +fC qC qC Fi -lT GB aK aQ @@ -21894,9 +22967,9 @@ HN QX eW eW -eW +fP pY -eW +fP eW wQ eW @@ -21981,33 +23054,33 @@ rM um ge bN -bj -VG -VG -VG -VG -VG -VG -VG +xP +xP +xP +xP +xP +xP +xP +xP wg Ce ke Vl yU TR -GF -mu -qC -Bk -nf -Sr -nB -qC +ii +jF +Ae +jF +Qd +Td +Zo +lW Fw nf lh +BT AC -qC DK Mj bZ @@ -22036,9 +23109,9 @@ pA QX eW eW -eW -eW -eW +VG +VG +VG eW Cj tE @@ -22124,13 +23197,13 @@ gv oe gk bj -VG -VG -VG -VG -VG -VG -VG +uV +wb +xP +Ng +ci +xP +lS bq Ce fH @@ -22139,27 +23212,27 @@ Da SW Cc Bk -nf -xU -Ni -qC +Jq +HL +Qd +Td jH OX Hd xf +OA OX -eR -OX +Hd fK UL cP dK dM dN -Mj +aQ kN -Ym -MC +Ff +FD VG VG VG @@ -22175,13 +23248,13 @@ SL Ya Ya pq -uh -pH -er -er -er -er -er +QX +eW +eW +VG +VG +VG +MZ NE er er @@ -22262,35 +23335,35 @@ cn cn fW gN -de -qj +dY +Ce Ze -wb +Ce In -dY -dY +km +km lH +Ce ua -ua -sc -Ny +Ce +rw Ce qh Vl cA QE ez -qC -Fi -Bk -ZS -qC -og -qC -Fi -Fi +sm +Jq +PU +Qd +UH +ZR qC AC +Fi +Fi +qC jT GB aO @@ -22298,7 +23371,7 @@ dh dL dL dO -aR +na GB Ym ZN @@ -22316,16 +23389,16 @@ KI Zs Ya KI -HN -eW -QX -eW -eW +xH +iQ +sy +er +FA gP -eW -eW +FA +Vr OG -eW +tR KK DC Jd @@ -22404,35 +23477,35 @@ aw aw aw aw -kk +hn Us hk BW KP -xP -xP +pZ +DM Fh qZ -qZ -qZ +OO +OO pr fV gX Vl cA QE -ez -hG -vW +ju +vm +Jq PU py +Wk +ZS +xU +ph +ph +ws xU -nB -rg -AC -AC -qC -AC Kj GB aP @@ -22443,7 +23516,7 @@ EQ yk GB zE -Ym +xl Ym Ym Ym @@ -22462,9 +23535,9 @@ ie eW QX eW -VG -VG -VG +HK +HK +HK eW OG pm @@ -22546,35 +23619,35 @@ aw aw aw aw -kk -Us +hn +sc gG -Aa +BW Ii -DM -qJ -Ha -hn -hn -eM +pZ +pZ +pZ +pZ +pZ +pZ cF so ca Vl zF QE -ez -VU -AC -rx +lk +vz +Jq +PU Ju -xU +Xr Pq -xU -Qa -Ju -xU -Wf +qC +Em +cG +qC +qC At GB GB @@ -22585,11 +23658,11 @@ TB GB GB xl +xl Ym Ym Ym -Ym -Ym +wl Ym Ym Ym @@ -22604,12 +23677,12 @@ ie eW QX eW -eW -eW -eW +fP +fP +fP eW OG -eW +EP HQ Qg aw @@ -22706,15 +23779,15 @@ pZ PA fD tL -qC -AC -qC -qC -Bk +Jq +Jq +HO +Ju +Yt KS iV -rx -xu +kS +AC qC qC EV @@ -22727,9 +23800,9 @@ vg eE Ym BF -Ff -Ff -Ff +JX +Ui +sK sK Fs AN @@ -22834,13 +23907,13 @@ aw aw aw aw -de -de +dY +dY re -eO +bL IN -uV -eM +Ak +pZ uq rw bL @@ -22849,19 +23922,19 @@ nx cE KZ WD -SE -qC -qC -qC +Jq +NT +Ju +YJ mc -ld qC +VL AC qC gs yq -oV -oV +mJ +fR Rr Hl fI @@ -22870,10 +23943,10 @@ ky Ym xl Ym -Ym -Ym xe Ym +Ym +Ym xl Ym Ym @@ -22977,13 +24050,13 @@ aw aw aw aw -de -de +dY +dY MO -XV +bL YB -ff -ff +Ak +QE rw Du yv @@ -22991,19 +24064,19 @@ Du Du bV Zu -ii +Jq NT -hJ +Ju OW -mc +Bv lK tu Mg Oz So Tg -oV -oV +jN +AY Rr ak RF @@ -23017,7 +24090,7 @@ IF JQ kC ql -pf +Vo qP ug CT @@ -23120,22 +24193,22 @@ aw aw aw aw -de -de +dY +dY el -XV -YB -HK +QE +QE +QE mU km km km km gR -fQ -fQ -fQ -fQ +vR +Ar +vR +Ni fQ AB Qb @@ -23154,24 +24227,24 @@ VA UC GP vK +UW +vK +vK vK vK -zc -Nk -Ui -Nk Nk +ms Nk Nk XJ -aH -aH -aH -aH -aH +Rb +Rb +Rb +Rb +Rb OG eW -eW +uE KK KK Qg @@ -23263,10 +24336,10 @@ aw aw aw Qg -de -de +dY +dY Ri -xP +QE ff jF aj @@ -23274,14 +24347,14 @@ bM da op Lf -Lf -Lf -Lf +Np +Jq +Ip jF UA Gi tV -Mn +Jq nY QA Mp @@ -23298,21 +24371,21 @@ lc DO Iu tH -Gv +UO Lu -KG -Rb +UO Rb +ly vy iZ cz vd -vd +lP Pa jV -aH +Rb gC -tR +DV KK KK aw @@ -23406,10 +24479,10 @@ aw aw Qg aw -de -de -xP -ff +dY +dY +DD +QE jF au bS @@ -23424,7 +24497,7 @@ Mn kV Jq Jq -Ae +Jq oY fn gx @@ -23435,24 +24508,24 @@ Gr BS Uh Xz -Vz -Vz -Vz -dH -Yn -BB -By -By -By -By -By -By -By -By -By -By -By -aH +zc +zc +zc +Ai +tH +UO +UO +UO +Rb +aA +xR +xR +xR +qt +va +Pa +Pa +Rb Wr KK KK @@ -23549,9 +24622,9 @@ aw Qg aw aw -de -de -ff +dY +dY +QE jF az Ah @@ -23564,13 +24637,13 @@ Ul Dg Ul ML -Ul -Ul +sb +sb sb Cw qQ -ZA -ZA +FZ +SJ SJ jF ak @@ -23580,21 +24653,21 @@ OE Vz Vz Vz -HR -Yn -gK -By -By -By -By -By -By -By -By -By -By -By -aH +Vz +gU +UO +UO +UO +Rb +MB +xR +xR +xR +sj +Pa +Pa +me +Rb KK KK aw @@ -23692,7 +24765,7 @@ Qg aw aw aw -de +dY NN jF bE @@ -23708,12 +24781,12 @@ zI VX Zc ti -UH -QH -Gb -Eb +Jq +Jq +Xg +jF zn -Qh +jF jF qq Zb @@ -23723,19 +24796,19 @@ Vz uj Vz Vz -Yn +gz UO -By -By -By -By +IS +UO +Rb +YL xR -By -By -By -By -By -uk +Wj +xR +qt +Pa +jV +Pa IP KK aw @@ -23848,35 +24921,35 @@ wh QL Ve GW -Ip +jF RP -Jq -Jq +md +OJ LS Jq Jq Og jF -Qs +xv JP Uh iH Vz -De Vz Vz -Yn -gK -By -By -By -By -By -By -By -By -By -By +qK +gU +UO +UO +UO +Rb +YL +xR +xR +xR +Ns +Pa +Pa Ht Ht aw @@ -23990,34 +25063,34 @@ wK ZA wp Ij -fi +jF YE hX hX ga Jq -Jq -YX -jF -xg +mp +GI +zn +CK BS -Uh +jQ HM Vz -Mc Vz Vz -Yn -BX -By -By -By -By -By -By -By -By -By +Tz +gU +UO +UO +UO +Rb +SH +xR +rW +xR +qt +Pa Ht Ht aw @@ -24132,32 +25205,32 @@ DN iY Ab tI -rH -xq -Ul -Ul -fT -Jq -Jq -Og jF -CK +xq +JY +Hh +fT +YC +vQ +mI +jF +JE BS Uh Ol -Vz +rJ ES -Vz -Vz -Yn -gK -By -By -By -By -By -By -By +Kv +tf +gU +UO +ut +UO +Rb +XN +An +SI +ZI Ap Ht Ht @@ -24269,38 +25342,38 @@ kY vJ vJ vJ -HO -hX -hX -hX -hX -vz -RP -Jq -Jq +jF +jF +jF +jF +jF +jF +rP +jF +jF Xg -xs -xs -xs +jF +jF +jF jF Gr BS Uh JZ -Vz -jQ -Vz -Vz Yn -gK -By -By -By -By -Ct -By -By -PO +Yn +Yn +Yn +Yn +Yn +Yn +Yn +Rb +Rb +Rb +Rb +Rb +Ka It aY aY @@ -24411,31 +25484,31 @@ LK KN SN Vt -Ul -Ul -Ul +Ug +Jr +AD sI -Jq -Jq +ik +TM gw -Jq -Jq -LS -Jq -Jq -JR -jF +wT +Tt +hA +Bi +Xm +yQ +jm EX cq Hw SY WN WN -WN +Mc WN PG CV -iB +CV Ji Dv yp @@ -24552,15 +25625,15 @@ zp zp XP fY -fY -fY -fY -fY +vW +Cu +LD +fc Ln mj -mj +tj jZ -gW +xc XF Mb sD @@ -24569,22 +25642,22 @@ xc Oa cm Va -Uh +gl Nw -Vz -Vz -Vz -dH -Yn +De +HR ER -tG -tG -By -gK +ER +DE +ER +ER +RE +xj +xj uk -PO -Ht -Ht +Rf +It +It aY aY aY @@ -24692,39 +25765,39 @@ Up fb fb fb -ry -ry +LK +LK KN -wR -lR -Hn -Uj -LI -Cq -LS -Ow -mM +NL +NL +NL +NL +NL +NL +UV +NL +LY yA -Kn -Cu -Kn -jF +NL +NL +NL +NL yH Po -Uh +RD SP -rJ +cs Wh dH mH -Yn +EW Yv Ub RE -By LT -Ht -Ht +lC +It +It aw aw aw @@ -24836,36 +25909,36 @@ aw aw aw aw -ry -KN -jF -jF -jF -jF -jF -rr -jF -jF +ot +ze +cT +NY +Je +Wb +Di +cM +hw +Pi XL -jF -jF -jF -jF +is +qr +xV +NP Yo Va RD -xt -xt -xt -xt -xt -xt -xt -xt -xt -xt +Tx +Tx +Tx +Tx +Tx +Tx +Tx +Tx +RE +RE Rf -yr +It aw aw aw @@ -24979,19 +26052,19 @@ aw aw aw aw -ry -KN -wq -wq -rk -KU -BM -KU -jF -rF -Vk +ot +ze +AE +Uo +Uo +HE +HA xS -jF +xS +xB +xS +xS +OP oG Wz ZO @@ -25001,7 +26074,7 @@ Jc GT II uD -gi +uK SV gi id @@ -25122,18 +26195,18 @@ aw aw aw aw -Cd -Cd -wq -ys -mz -UB -lq -jF -fA +IO +IO +gb +Uo +Uo +pa +Uo +GO +yd TZ Uf -jF +xV Bm xG dV @@ -25145,7 +26218,7 @@ Nn Nn Nn Nn -Nn +Et Qq Qq aw @@ -25265,28 +26338,28 @@ aw aw aw aw -Cd -Cd -pM -hA -UV -PT -jF -HA -ze -Ph -ry +IO +IO +rC +WR +pa +UM +YH +uf +xV +xV +Dp RM fp ty xt Uw Nn -Yc -Yc Nn Nn Nn +Nn +Et Qq Qq aw @@ -25408,25 +26481,25 @@ aw aw aw aw -Cd -Cd -lq -UB -mz -jF -jF -jF -jF -ry +IO +IO +IA +pa +Uo +Uo +Uo +ZD +ev +ot jA -XA +nG ty lA cf Nn Yc Yc -Nn +vU gy Qq Qq @@ -25551,19 +26624,19 @@ aw aw aw aw -ry -ry +ot +ot Yg YN -bT -lq -AE -lq -ry +qD +cD +Uo +EC +ot zx -XA +tr ty -lA +hQ cf Nn Yc @@ -25694,14 +26767,14 @@ aw aw aw aw -Cd -Cd -NL -LY -AD -le +IO +IO +ot +fX +SC +KM lb -ry +ot Va XA ty @@ -25837,20 +26910,20 @@ aw aw aw aw -Cd -ry -ys -lq -EF -lq -ry +IO +ot +ZP +ME +Uo +PK +ot Rp XA ty -hQ -cf -Nn +cQ +fr Nn +vU yr Qq aw @@ -25980,12 +27053,12 @@ aw aw aw aw -ry -Cd -sW -MK -lD -ry +ot +IO +tn +Uo +JR +ot AI oM mX @@ -26123,11 +27196,11 @@ aw aw aw aw -Cd -Cd -ys -lq -ry +IO +IO +Uo +Uo +ot lZ Ma ek @@ -26266,14 +27339,14 @@ aw aw aw aw -Cd -Cd -sW -tY +IO +IO +zz +ot iy Nh tY -zr +Nn Qq Qq aw @@ -26409,9 +27482,9 @@ aw aw aw aw -Cd -KN -tY +IO +ze +ot Bo Bo rT @@ -26553,7 +27626,7 @@ aw aw aw Db -tY +ot eb ec ka @@ -26695,7 +27768,7 @@ aw aw aw aw -jJ +Db dP oU BK diff --git a/maps/expedition_vr/beach/_beach.dm b/maps/expedition_vr/beach/_beach.dm index 8bbc1765b7..f63be85625 100644 --- a/maps/expedition_vr/beach/_beach.dm +++ b/maps/expedition_vr/beach/_beach.dm @@ -85,7 +85,7 @@ //guard = 40 //They'll stay within this range (not defining this disables them staying nearby and they will wander the map (and through step teleports)) mobs_to_pick_from = list( /mob/living/simple_mob/vore/fennec = 300, - /mob/living/simple_mob/animal/passive/snake = 100, + /mob/living/simple_mob/animal/passive/snake/python = 100, /mob/living/simple_mob/vore/alienanimals/teppi = 10, /mob/living/simple_mob/vore/alienanimals/teppi/baby = 1 ) diff --git a/maps/expedition_vr/beach/submaps/BlastMine1.dmm b/maps/expedition_vr/beach/submaps/BlastMine1.dmm new file mode 100644 index 0000000000..957517f964 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/BlastMine1.dmm @@ -0,0 +1,248 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/cave, +/area/submap/cave/BlastMine1) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"c" = ( +/obj/structure/sign/warning/bomb_range, +/turf/simulated/wall/sandstone, +/area/submap/cave/BlastMine1) +"d" = ( +/obj/structure/table/rack, +/obj/item/weapon/syndie/c4explosive, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"e" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"f" = ( +/mob/living/simple_mob/animal/sif/savik, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"g" = ( +/obj/structure/table/rack, +/obj/item/clothing/head/bomb_hood, +/obj/item/clothing/suit/bomb_suit, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"h" = ( +/obj/item/device/gps/internal/poi{ + gps_tag = "Unidentified Signal" + }, +/turf/simulated/wall/sandstone, +/area/submap/cave/BlastMine1) +"i" = ( +/mob/living/simple_mob/animal/sif/diyaab, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"j" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/flame/lighter/zippo/c4detonator{ + detonator_mode = 1 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"k" = ( +/obj/structure/table/rack, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"l" = ( +/obj/machinery/floodlight, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"m" = ( +/turf/simulated/wall/sandstone, +/area/submap/cave/BlastMine1) +"n" = ( +/obj/structure/girder/displaced, +/obj/structure/sign/warning/bomb_range, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"o" = ( +/obj/structure/table, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"p" = ( +/obj/effect/decal/remains/human, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/BlastMine1) +"q" = ( +/obj/structure/sign/warning/bomb_range, +/turf/simulated/wall/sandstone{ + damage = 20 + }, +/area/submap/cave/BlastMine1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +b +b +b +a +a +b +b +"} +(2,1,1) = {" +a +a +a +a +b +b +b +b +b +b +a +b +a +b +a +"} +(3,1,1) = {" +a +b +c +d +d +d +h +d +k +k +n +b +o +b +a +"} +(4,1,1) = {" +b +b +b +b +b +b +b +i +b +b +b +b +p +b +b +"} +(5,1,1) = {" +b +b +b +b +b +f +b +b +i +b +b +b +b +b +b +"} +(6,1,1) = {" +b +b +b +b +e +b +b +b +l +b +b +b +b +b +b +"} +(7,1,1) = {" +a +a +b +b +c +g +b +g +m +b +b +b +q +b +a +"} +(8,1,1) = {" +a +a +a +b +b +b +b +j +a +b +b +b +b +b +a +"} +(9,1,1) = {" +a +a +a +b +b +b +b +a +a +b +b +b +b +b +a +"} +(10,1,1) = {" +a +a +a +b +b +b +a +a +a +a +b +b +b +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/CaveTrench.dmm b/maps/expedition_vr/beach/submaps/CaveTrench.dmm new file mode 100644 index 0000000000..93a0674844 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/CaveTrench.dmm @@ -0,0 +1,1736 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/template_noop, +/area/submap/Cavelake) +"c" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/Cavelake) +"d" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"e" = ( +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"f" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Cavelake) +"g" = ( +/mob/living/simple_mob/animal/sif/hooligan_crab, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"h" = ( +/turf/simulated/floor/water, +/area/submap/Cavelake) +"i" = ( +/mob/living/simple_mob/animal/passive/fish/perch, +/turf/simulated/floor/water, +/area/submap/Cavelake) +"j" = ( +/obj/machinery/crystal, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"k" = ( +/mob/living/simple_mob/animal/passive/fish/trout, +/turf/simulated/floor/water, +/area/submap/Cavelake) +"l" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"m" = ( +/obj/random/mob/sif, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"n" = ( +/obj/item/clothing/mask/snorkel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"o" = ( +/obj/effect/decal/remains/mouse, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +b +b +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +"} +(3,1,1) = {" +a +b +b +b +c +c +c +c +c +c +c +c +d +d +d +d +d +c +c +c +c +d +d +d +f +f +d +d +d +d +d +d +c +c +b +b +b +b +b +a +"} +(4,1,1) = {" +a +b +b +c +c +c +c +c +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +f +f +d +d +d +d +d +d +c +c +b +b +b +b +a +"} +(5,1,1) = {" +a +b +c +c +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +f +f +d +g +d +d +d +d +c +b +b +b +b +a +"} +(6,1,1) = {" +a +c +c +c +d +d +d +d +d +d +d +d +d +d +c +c +j +d +d +d +d +d +d +f +h +h +h +f +f +d +o +d +d +d +c +c +b +b +b +a +"} +(7,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +c +c +c +c +d +d +d +d +d +f +f +h +h +h +h +f +d +d +d +d +d +d +c +b +b +b +a +"} +(8,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +c +c +c +c +c +d +d +d +d +f +h +h +h +h +h +f +d +d +d +d +d +d +c +b +b +b +a +"} +(9,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +c +c +c +c +c +d +d +d +d +f +h +k +h +h +h +h +f +d +d +d +d +d +c +c +b +b +a +"} +(10,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +j +c +c +c +l +d +d +d +d +f +h +h +h +h +h +h +f +d +d +d +d +d +c +c +b +b +a +"} +(11,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +d +d +c +c +m +d +d +d +n +f +h +h +h +h +h +h +f +d +d +d +d +c +c +c +b +b +a +"} +(12,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +h +h +k +h +f +f +d +d +d +c +c +c +b +b +a +"} +(13,1,1) = {" +a +b +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +h +h +h +h +h +f +d +d +d +c +c +c +b +b +a +"} +(14,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +h +h +h +h +h +f +d +d +d +c +c +c +b +b +a +"} +(15,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +i +h +h +h +h +f +d +d +d +d +d +c +b +b +a +"} +(16,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +h +h +h +h +h +f +d +d +d +d +d +c +b +b +a +"} +(17,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +f +h +h +h +h +h +h +f +d +d +d +d +d +c +b +b +a +"} +(18,1,1) = {" +a +c +c +d +d +d +d +d +g +d +d +d +d +d +d +d +d +d +d +d +d +d +f +f +f +f +f +f +h +h +f +d +d +d +d +d +c +b +b +a +"} +(19,1,1) = {" +a +c +c +d +d +d +d +d +d +d +f +f +f +f +d +d +d +d +d +d +d +d +d +d +d +d +d +f +f +h +f +d +d +d +d +c +c +b +b +a +"} +(20,1,1) = {" +a +c +c +d +d +d +d +d +f +f +h +h +f +f +f +f +f +d +d +d +d +d +d +d +d +d +d +d +f +f +f +d +d +d +d +c +b +b +b +a +"} +(21,1,1) = {" +a +b +b +b +d +d +d +d +f +h +h +h +h +h +f +f +f +f +f +f +f +d +d +d +d +d +d +d +d +d +d +d +d +d +d +c +b +b +b +a +"} +(22,1,1) = {" +a +b +b +b +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +f +f +f +f +f +f +d +d +d +d +d +d +d +d +d +c +b +b +b +a +"} +(23,1,1) = {" +a +b +b +b +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +h +h +h +f +f +d +d +d +d +d +d +d +c +b +b +b +a +"} +(24,1,1) = {" +a +b +b +b +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +d +c +b +b +b +a +"} +(25,1,1) = {" +a +b +b +b +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +d +c +c +b +b +a +"} +(26,1,1) = {" +a +b +c +b +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +f +d +d +d +d +d +c +c +b +b +a +"} +(27,1,1) = {" +a +b +c +b +d +d +d +f +h +h +h +h +i +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +f +d +d +d +d +c +c +b +b +b +a +"} +(28,1,1) = {" +a +b +c +c +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +i +h +h +h +h +h +h +f +d +d +d +d +d +c +c +b +b +b +a +"} +(29,1,1) = {" +a +b +c +c +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +c +c +b +b +b +a +"} +(30,1,1) = {" +a +b +c +c +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +b +b +b +b +b +a +"} +(31,1,1) = {" +a +b +c +c +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +f +d +d +d +d +d +b +b +b +b +b +a +"} +(32,1,1) = {" +a +b +c +c +d +d +d +d +f +f +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +d +b +b +b +b +b +a +"} +(33,1,1) = {" +a +b +c +c +d +d +d +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +h +h +f +f +f +d +d +d +d +d +d +d +b +b +b +b +a +"} +(34,1,1) = {" +a +b +c +c +d +d +d +d +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +d +d +d +d +b +b +b +b +a +"} +(35,1,1) = {" +a +b +c +c +e +d +d +d +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +f +f +d +d +d +d +d +d +d +d +d +c +b +b +b +a +"} +(36,1,1) = {" +a +b +c +c +c +c +d +d +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +c +c +c +c +c +c +c +b +b +b +b +a +"} +(37,1,1) = {" +a +b +b +c +c +c +c +c +c +c +c +c +f +h +h +h +k +h +h +h +h +h +h +f +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +"} +(38,1,1) = {" +a +b +b +b +b +b +b +b +b +b +c +c +f +f +f +f +f +f +f +f +f +f +f +f +c +c +b +c +c +c +c +b +b +b +b +b +b +b +b +a +"} +(39,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/Cavelake.dmm b/maps/expedition_vr/beach/submaps/Cavelake.dmm new file mode 100644 index 0000000000..93a0674844 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/Cavelake.dmm @@ -0,0 +1,1736 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/template_noop, +/area/submap/Cavelake) +"c" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/Cavelake) +"d" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"e" = ( +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"f" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Cavelake) +"g" = ( +/mob/living/simple_mob/animal/sif/hooligan_crab, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"h" = ( +/turf/simulated/floor/water, +/area/submap/Cavelake) +"i" = ( +/mob/living/simple_mob/animal/passive/fish/perch, +/turf/simulated/floor/water, +/area/submap/Cavelake) +"j" = ( +/obj/machinery/crystal, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"k" = ( +/mob/living/simple_mob/animal/passive/fish/trout, +/turf/simulated/floor/water, +/area/submap/Cavelake) +"l" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"m" = ( +/obj/random/mob/sif, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"n" = ( +/obj/item/clothing/mask/snorkel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) +"o" = ( +/obj/effect/decal/remains/mouse, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Cavelake) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +b +b +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +"} +(3,1,1) = {" +a +b +b +b +c +c +c +c +c +c +c +c +d +d +d +d +d +c +c +c +c +d +d +d +f +f +d +d +d +d +d +d +c +c +b +b +b +b +b +a +"} +(4,1,1) = {" +a +b +b +c +c +c +c +c +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +f +f +d +d +d +d +d +d +c +c +b +b +b +b +a +"} +(5,1,1) = {" +a +b +c +c +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +f +f +d +g +d +d +d +d +c +b +b +b +b +a +"} +(6,1,1) = {" +a +c +c +c +d +d +d +d +d +d +d +d +d +d +c +c +j +d +d +d +d +d +d +f +h +h +h +f +f +d +o +d +d +d +c +c +b +b +b +a +"} +(7,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +c +c +c +c +d +d +d +d +d +f +f +h +h +h +h +f +d +d +d +d +d +d +c +b +b +b +a +"} +(8,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +c +c +c +c +c +d +d +d +d +f +h +h +h +h +h +f +d +d +d +d +d +d +c +b +b +b +a +"} +(9,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +c +c +c +c +c +d +d +d +d +f +h +k +h +h +h +h +f +d +d +d +d +d +c +c +b +b +a +"} +(10,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +j +c +c +c +l +d +d +d +d +f +h +h +h +h +h +h +f +d +d +d +d +d +c +c +b +b +a +"} +(11,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +d +d +c +c +m +d +d +d +n +f +h +h +h +h +h +h +f +d +d +d +d +c +c +c +b +b +a +"} +(12,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +h +h +k +h +f +f +d +d +d +c +c +c +b +b +a +"} +(13,1,1) = {" +a +b +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +h +h +h +h +h +f +d +d +d +c +c +c +b +b +a +"} +(14,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +h +h +h +h +h +f +d +d +d +c +c +c +b +b +a +"} +(15,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +i +h +h +h +h +f +d +d +d +d +d +c +b +b +a +"} +(16,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +h +h +h +h +h +h +h +f +d +d +d +d +d +c +b +b +a +"} +(17,1,1) = {" +a +c +c +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +d +f +f +h +h +h +h +h +h +f +d +d +d +d +d +c +b +b +a +"} +(18,1,1) = {" +a +c +c +d +d +d +d +d +g +d +d +d +d +d +d +d +d +d +d +d +d +d +f +f +f +f +f +f +h +h +f +d +d +d +d +d +c +b +b +a +"} +(19,1,1) = {" +a +c +c +d +d +d +d +d +d +d +f +f +f +f +d +d +d +d +d +d +d +d +d +d +d +d +d +f +f +h +f +d +d +d +d +c +c +b +b +a +"} +(20,1,1) = {" +a +c +c +d +d +d +d +d +f +f +h +h +f +f +f +f +f +d +d +d +d +d +d +d +d +d +d +d +f +f +f +d +d +d +d +c +b +b +b +a +"} +(21,1,1) = {" +a +b +b +b +d +d +d +d +f +h +h +h +h +h +f +f +f +f +f +f +f +d +d +d +d +d +d +d +d +d +d +d +d +d +d +c +b +b +b +a +"} +(22,1,1) = {" +a +b +b +b +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +f +f +f +f +f +f +d +d +d +d +d +d +d +d +d +c +b +b +b +a +"} +(23,1,1) = {" +a +b +b +b +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +h +h +h +f +f +d +d +d +d +d +d +d +c +b +b +b +a +"} +(24,1,1) = {" +a +b +b +b +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +d +c +b +b +b +a +"} +(25,1,1) = {" +a +b +b +b +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +d +c +c +b +b +a +"} +(26,1,1) = {" +a +b +c +b +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +f +d +d +d +d +d +c +c +b +b +a +"} +(27,1,1) = {" +a +b +c +b +d +d +d +f +h +h +h +h +i +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +f +d +d +d +d +c +c +b +b +b +a +"} +(28,1,1) = {" +a +b +c +c +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +i +h +h +h +h +h +h +f +d +d +d +d +d +c +c +b +b +b +a +"} +(29,1,1) = {" +a +b +c +c +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +c +c +b +b +b +a +"} +(30,1,1) = {" +a +b +c +c +d +d +d +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +b +b +b +b +b +a +"} +(31,1,1) = {" +a +b +c +c +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +f +d +d +d +d +d +b +b +b +b +b +a +"} +(32,1,1) = {" +a +b +c +c +d +d +d +d +f +f +f +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +d +b +b +b +b +b +a +"} +(33,1,1) = {" +a +b +c +c +d +d +d +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +h +h +f +f +f +d +d +d +d +d +d +d +b +b +b +b +a +"} +(34,1,1) = {" +a +b +c +c +d +d +d +d +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +d +d +d +d +d +d +b +b +b +b +a +"} +(35,1,1) = {" +a +b +c +c +e +d +d +d +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +f +f +d +d +d +d +d +d +d +d +d +c +b +b +b +a +"} +(36,1,1) = {" +a +b +c +c +c +c +d +d +d +d +d +f +f +h +h +h +h +h +h +h +h +h +h +h +f +d +d +d +c +c +c +c +c +c +c +b +b +b +b +a +"} +(37,1,1) = {" +a +b +b +c +c +c +c +c +c +c +c +c +f +h +h +h +k +h +h +h +h +h +h +f +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +"} +(38,1,1) = {" +a +b +b +b +b +b +b +b +b +b +c +c +f +f +f +f +f +f +f +f +f +f +f +f +c +c +b +c +c +c +c +b +b +b +b +b +b +b +b +a +"} +(39,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/Cliff1.dmm b/maps/expedition_vr/beach/submaps/Cliff1.dmm new file mode 100644 index 0000000000..f34c92b82c --- /dev/null +++ b/maps/expedition_vr/beach/submaps/Cliff1.dmm @@ -0,0 +1,414 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"c" = ( +/obj/item/weapon/ore, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) +"d" = ( +/obj/random/outcrop, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) +"e" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) +"f" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 5 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) +"g" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 9 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) +"h" = ( +/obj/structure/cliff/automatic, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) +"i" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 9 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) +"j" = ( +/obj/random/humanoidremains{ + spawn_nothing_percentage = 70 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) +"k" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/ore_cliff) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +b +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +b +k +k +k +a +a +a +a +"} +(4,1,1) = {" +a +a +b +c +e +c +j +a +a +a +"} +(5,1,1) = {" +a +a +b +k +f +e +k +a +a +a +"} +(6,1,1) = {" +a +a +a +k +c +h +k +b +a +a +"} +(7,1,1) = {" +a +a +b +b +k +h +k +k +a +a +"} +(8,1,1) = {" +a +a +b +d +k +f +e +c +c +a +"} +(9,1,1) = {" +a +a +b +b +k +k +h +k +k +a +"} +(10,1,1) = {" +a +a +b +c +b +k +f +e +k +a +"} +(11,1,1) = {" +a +a +b +b +b +k +k +h +k +a +"} +(12,1,1) = {" +a +a +b +b +d +k +c +h +j +a +"} +(13,1,1) = {" +a +a +b +b +b +k +k +h +k +a +"} +(14,1,1) = {" +a +a +a +b +b +k +g +i +k +a +"} +(15,1,1) = {" +a +a +a +b +c +k +h +k +c +a +"} +(16,1,1) = {" +a +a +b +b +b +k +h +k +b +a +"} +(17,1,1) = {" +a +a +b +d +b +k +h +k +b +a +"} +(18,1,1) = {" +a +a +b +b +b +c +h +k +c +a +"} +(19,1,1) = {" +a +a +b +b +k +g +i +k +b +a +"} +(20,1,1) = {" +a +a +b +c +k +h +k +k +b +a +"} +(21,1,1) = {" +a +a +b +d +k +h +k +c +b +a +"} +(22,1,1) = {" +a +a +b +b +c +h +k +b +a +a +"} +(23,1,1) = {" +a +a +b +b +g +i +c +b +a +a +"} +(24,1,1) = {" +a +a +a +k +h +k +j +b +a +a +"} +(25,1,1) = {" +a +a +a +k +h +k +b +b +a +a +"} +(26,1,1) = {" +a +a +a +c +h +k +b +a +a +a +"} +(27,1,1) = {" +a +a +b +k +i +c +b +a +a +a +"} +(28,1,1) = {" +a +a +b +k +k +k +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/CrashedMedShuttle1.dmm b/maps/expedition_vr/beach/submaps/CrashedMedShuttle1.dmm new file mode 100644 index 0000000000..8b980b9988 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/CrashedMedShuttle1.dmm @@ -0,0 +1,1047 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"ab" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"ac" = ( +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"ad" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"ae" = ( +/obj/structure/sign/greencross{ + desc = "White cross in a green field, you can get medical aid here."; + name = "First-Aid" + }, +/turf/simulated/shuttle/wall/no_join, +/area/submap/CrashedMedShuttle) +"af" = ( +/obj/structure/grille, +/obj/structure/shuttle/window, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"ag" = ( +/turf/simulated/shuttle/wall, +/area/submap/CrashedMedShuttle) +"ah" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"ai" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"aj" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/obj/structure/sign/warning/airlock{ + pixel_x = 32 + }, +/obj/effect/spider/stickyweb, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"ak" = ( +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"al" = ( +/obj/item/weapon/storage/toolbox/mechanical, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table/standard, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"am" = ( +/obj/structure/table/standard, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"an" = ( +/obj/structure/window/reinforced, +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/loot_pile/surface/bones, +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"ao" = ( +/obj/item/weapon/circuitboard/broken, +/obj/structure/door_assembly/door_assembly_ext, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"ap" = ( +/obj/structure/door_assembly/door_assembly_ext, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"aq" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"ar" = ( +/obj/structure/closet/crate/medical, +/obj/random/medical, +/obj/random/medical, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"as" = ( +/obj/structure/table/standard, +/obj/machinery/cell_charger, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"at" = ( +/obj/item/weapon/material/shard, +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks, +/area/submap/CrashedMedShuttle) +"au" = ( +/obj/structure/closet/secure_closet/personal/patient, +/obj/effect/spider/stickyweb, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"av" = ( +/obj/random/mob/spider/mutant, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aw" = ( +/obj/machinery/door/airlock/glass, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"ax" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"ay" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"az" = ( +/obj/effect/decal/cleanable/blood/gibs/robot, +/obj/item/weapon/firstaid_arm_assembly, +/mob/living/simple_mob/animal/giant_spider/frost, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aA" = ( +/obj/item/stack/rods, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"aB" = ( +/obj/structure/lattice, +/obj/item/stack/rods, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"aC" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/item/weapon/firstaid_arm_assembly, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aD" = ( +/obj/structure/closet/secure_closet/personal/patient, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aE" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aF" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aG" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aH" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/structure/ghost_pod/manual/lost_drone/dogborg, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aI" = ( +/obj/structure/table/standard, +/obj/effect/spider/stickyweb, +/obj/machinery/light, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aJ" = ( +/obj/structure/table/standard, +/obj/effect/spider/stickyweb, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aK" = ( +/obj/structure/table/standard, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/effect/spider/stickyweb, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aL" = ( +/obj/structure/grille/broken, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/item/stack/rods, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"aM" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"aN" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"aO" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/effect/spider/stickyweb, +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aP" = ( +/obj/effect/decal/cleanable/blood/gibs/robot, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aQ" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aR" = ( +/turf/simulated/shuttle/wall/no_join, +/area/submap/CrashedMedShuttle) +"aS" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/loot_pile/surface/bones, +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"aT" = ( +/obj/machinery/light, +/obj/structure/table/standard, +/obj/effect/spider/stickyweb, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aU" = ( +/obj/structure/table/standard, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/random/medical, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"aV" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"aW" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"aX" = ( +/obj/machinery/computer, +/turf/simulated/shuttle/floor/yellow, +/area/submap/CrashedMedShuttle) +"aY" = ( +/obj/structure/prop/blackbox/crashed_med_shuttle, +/turf/simulated/shuttle/floor/yellow, +/area/submap/CrashedMedShuttle) +"aZ" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"ba" = ( +/obj/random/mob/spider/mutant, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"bb" = ( +/obj/effect/spider/cocoon, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"bc" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"bd" = ( +/obj/item/stack/rods, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"be" = ( +/obj/effect/spider/stickyweb, +/obj/structure/girder/displaced, +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"bf" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -32 + }, +/obj/structure/lattice, +/obj/item/device/gps/internal/poi, +/obj/structure/flora/tree/sif, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"bg" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/structure/loot_pile/surface/bones, +/obj/effect/decal/cleanable/blood/drip, +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"bh" = ( +/obj/structure/grille/broken, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"bi" = ( +/obj/effect/decal/mecha_wreckage/odysseus, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"bj" = ( +/obj/item/weapon/material/shard, +/obj/effect/spider/stickyweb, +/obj/item/weapon/beartrap{ + anchored = 1; + deployed = 1; + icon_state = "beartrap1" + }, +/obj/random/trash, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"bk" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/CrashedMedShuttle) +"bl" = ( +/obj/effect/spider/stickyweb, +/obj/item/weapon/material/shard, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bm" = ( +/obj/random/medical, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bn" = ( +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/floor/outdoors/rocks, +/area/submap/CrashedMedShuttle) +"bo" = ( +/obj/effect/spider/cocoon, +/obj/structure/lattice, +/turf/simulated/floor/outdoors/rocks, +/area/submap/CrashedMedShuttle) +"bp" = ( +/obj/structure/prop/fake_ai/dead/crashed_med_shuttle, +/turf/simulated/shuttle/floor/yellow, +/area/submap/CrashedMedShuttle) +"bq" = ( +/obj/structure/flora/tree/sif, +/turf/simulated/floor/outdoors/rocks, +/area/submap/CrashedMedShuttle) +"br" = ( +/obj/structure/grille/broken, +/obj/item/weapon/material/shard, +/turf/simulated/floor/outdoors/rocks, +/area/submap/CrashedMedShuttle) +"bs" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/spider/stickyweb, +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"bt" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"bu" = ( +/obj/effect/decal/remains/tajaran, +/obj/item/weapon/surgical/circular_saw, +/turf/simulated/floor/outdoors/rocks, +/area/submap/CrashedMedShuttle) +"bv" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/effect/spider/stickyweb, +/turf/simulated/floor/outdoors/rocks, +/area/submap/CrashedMedShuttle) +"bw" = ( +/obj/item/weapon/material/shard, +/obj/structure/loot_pile/maint/technical, +/obj/structure/lattice, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"bx" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/shuttle/floor/purple, +/area/submap/CrashedMedShuttle) +"by" = ( +/obj/item/weapon/circuitboard/broken, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bz" = ( +/obj/structure/girder, +/turf/template_noop, +/area/submap/CrashedMedShuttle) +"bA" = ( +/obj/structure/girder/displaced, +/turf/template_noop, +/area/submap/CrashedMedShuttle) +"bB" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "propulsion_r"; + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks, +/area/submap/CrashedMedShuttle) +"bC" = ( +/obj/structure/shuttle/engine/heater{ + icon_state = "heater"; + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CrashedMedShuttle) +"bD" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/firstaid/adv, +/turf/simulated/shuttle/floor/purple, +/area/submap/CrashedMedShuttle) +"bE" = ( +/obj/structure/table/standard, +/turf/simulated/shuttle/floor/purple, +/area/submap/CrashedMedShuttle) +"bF" = ( +/obj/random/medical/pillbottle, +/mob/living/simple_mob/animal/giant_spider/webslinger, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bG" = ( +/obj/structure/table/standard, +/obj/item/device/defib_kit/loaded, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bH" = ( +/obj/structure/table/standard, +/obj/item/bodybag/cryobag, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bI" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/box/bodybags, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bJ" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bK" = ( +/obj/structure/table/standard, +/obj/item/weapon/surgical/retractor, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bL" = ( +/obj/item/weapon/material/shard, +/obj/structure/grille, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"bM" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/structure/loot_pile/maint/technical, +/turf/simulated/shuttle/floor/purple, +/area/submap/CrashedMedShuttle) +"bN" = ( +/obj/effect/decal/cleanable/blood/gibs/robot, +/obj/effect/spider/cocoon, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bO" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/obj/structure/closet/secure_closet/medical_wall/anesthetics{ + pixel_x = 32 + }, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bP" = ( +/obj/machinery/light{ + dir = 8; + icon_state = "tube1"; + pixel_y = 0 + }, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bQ" = ( +/obj/effect/spider/cocoon, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bR" = ( +/obj/effect/decal/cleanable/blood/splatter, +/obj/structure/loot_pile/surface/bones, +/obj/item/weapon/surgical/surgicaldrill, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bS" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/structure/grille, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"bT" = ( +/obj/structure/table/standard, +/obj/item/device/reagent_scanner/adv, +/turf/simulated/shuttle/floor/purple, +/area/submap/CrashedMedShuttle) +"bU" = ( +/obj/machinery/iv_drip, +/obj/item/weapon/reagent_containers/blood/empty, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bV" = ( +/mob/living/simple_mob/animal/giant_spider/carrier, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bW" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/box/masks, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bX" = ( +/obj/structure/table/standard, +/obj/random/firstaid, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bY" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/backpack/medic, +/obj/random/medical/lite, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"bZ" = ( +/obj/structure/table/standard, +/obj/effect/spider/stickyweb, +/obj/random/medical, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"ca" = ( +/obj/structure/girder, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"cb" = ( +/obj/structure/frame, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"cc" = ( +/obj/structure/table/standard, +/obj/structure/sign/periodic{ + pixel_y = -32 + }, +/obj/item/weapon/surgical/bonesetter, +/obj/item/weapon/surgical/scalpel, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"cd" = ( +/obj/machinery/optable, +/obj/effect/decal/cleanable/blood/splatter, +/obj/structure/loot_pile/surface/bones, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"ce" = ( +/obj/structure/table/standard, +/obj/item/weapon/surgical/bonegel, +/obj/item/weapon/surgical/FixOVein, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"cf" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "admin_shuttle"; + pixel_x = -25; + pixel_y = 0; + req_one_access = list(101); + tag_door = "admin_shuttle_hatch" + }, +/obj/random/mob/spider/mutant, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) +"cg" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/belt/medical/emt, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"ch" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/box/syringes, +/obj/effect/spider/stickyweb, +/obj/machinery/light, +/turf/simulated/shuttle/floor/white, +/area/submap/CrashedMedShuttle) +"ci" = ( +/obj/machinery/door/airlock/external{ + frequency = 1380; + icon_state = "door_locked"; + id_tag = "admin_shuttle_hatch"; + locked = 1; + name = "Shuttle Hatch"; + req_access = null + }, +/turf/simulated/shuttle/plating, +/area/submap/CrashedMedShuttle) + +(1,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aA +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +aa +aa +aa +aa +ab +ab +aa +aa +aa +aa +"} +(3,1,1) = {" +aa +aa +aa +aa +aa +ab +aa +aa +aa +aa +ab +bB +ag +ab +aa +aa +aa +"} +(4,1,1) = {" +aa +aa +ab +aa +aa +aa +aa +aa +bc +ab +bv +bC +ag +ag +ab +ab +aa +"} +(5,1,1) = {" +aa +aa +ab +aa +ah +aA +aM +ab +bd +bj +bw +bD +bM +ag +ag +ag +ab +"} +(6,1,1) = {" +aa +aa +aa +aa +aa +ab +aN +ab +be +bk +bx +bE +bx +bT +cb +ag +ab +"} +(7,1,1) = {" +aa +ab +aa +aa +ab +aB +ac +aS +ag +ak +ak +bF +bN +bU +cc +ag +ab +"} +(8,1,1) = {" +aa +aa +ah +ab +at +aC +aO +aT +ag +bl +ak +ak +ak +bV +cd +ag +ab +"} +(9,1,1) = {" +aa +aa +ab +an +au +aD +aP +aU +ag +bm +ak +ak +bO +bW +ce +ag +aa +"} +(10,1,1) = {" +aa +ab +ai +ag +ag +af +aw +af +ag +af +by +af +ag +ag +ag +ae +ab +"} +(11,1,1) = {" +aa +ac +ad +ao +av +ak +ak +aV +bf +bn +ak +aQ +bP +ad +cf +ci +ab +"} +(12,1,1) = {" +aa +ad +aj +ap +ak +aE +aQ +aW +ab +bo +ak +av +bQ +ao +aj +ci +aa +"} +(13,1,1) = {" +aa +ae +ag +ag +aw +ag +aR +aX +ab +bp +ag +ag +by +ag +ag +ae +aa +"} +(14,1,1) = {" +aa +af +ak +aq +ax +aF +ag +aY +bg +bq +bz +bG +ak +bX +cg +af +aa +"} +(15,1,1) = {" +aa +ag +al +ak +ay +aG +ag +af +bh +br +bz +bH +ak +ak +ch +ag +ab +"} +(16,1,1) = {" +aa +ag +am +ak +av +aH +ag +ab +aZ +bs +bA +bI +ak +bY +am +ag +ab +"} +(17,1,1) = {" +aa +ag +ag +ar +ak +aI +ag +aZ +aV +bt +ag +bJ +av +am +ag +ca +aa +"} +(18,1,1) = {" +aa +aa +ag +as +az +aJ +ag +ba +bi +bu +ag +ak +bR +bZ +ca +ab +aa +"} +(19,1,1) = {" +aa +aa +ag +ag +ak +aK +ag +bb +ab +ab +ag +bK +am +ca +ca +ab +aa +"} +(20,1,1) = {" +aa +aa +aa +ag +af +aL +ag +ab +ab +aa +ag +bL +bS +ca +ab +ab +aa +"} +(21,1,1) = {" +aa +ab +aa +aa +ab +ab +ab +aa +aa +aa +aa +ab +ab +aa +aa +aa +aa +"} +(22,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/maps/expedition_vr/beach/submaps/Geyser1.dmm b/maps/expedition_vr/beach/submaps/Geyser1.dmm new file mode 100644 index 0000000000..931eec23d2 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/Geyser1.dmm @@ -0,0 +1,105 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_1) +"c" = ( +/obj/random/turf/lava, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_1) +"d" = ( +/obj/random/outcrop, +/obj/random/turf/lava, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_1) +"e" = ( +/obj/random/outcrop, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_1) +"f" = ( +/obj/effect/map_effect/interval/effect_emitter/steam, +/obj/effect/map_effect/interval/effect_emitter/smoke/mist{ + interval_upper_bound = 600 + }, +/obj/effect/map_effect/interval/effect_emitter/smoke/bad{ + interval_lower_bound = 100; + interval_upper_bound = 3000 + }, +/obj/effect/map_effect/interval/screen_shaker{ + interval_upper_bound = 600 + }, +/turf/simulated/floor/water/deep{ + outdoors = 0 + }, +/area/submap/geyser_1) +"g" = ( +/obj/random/turf/lava, +/obj/random/outcrop, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_1) + +(1,1,1) = {" +a +c +c +e +c +c +a +"} +(2,1,1) = {" +c +c +c +b +c +c +c +"} +(3,1,1) = {" +c +c +e +b +b +g +c +"} +(4,1,1) = {" +b +b +b +f +b +b +b +"} +(5,1,1) = {" +d +c +b +b +e +c +c +"} +(6,1,1) = {" +c +c +c +b +c +c +c +"} +(7,1,1) = {" +a +c +c +b +d +c +a +"} diff --git a/maps/expedition_vr/beach/submaps/Geyser2.dmm b/maps/expedition_vr/beach/submaps/Geyser2.dmm new file mode 100644 index 0000000000..22015c5fed --- /dev/null +++ b/maps/expedition_vr/beach/submaps/Geyser2.dmm @@ -0,0 +1,144 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/random/turf/lava, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"c" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"d" = ( +/obj/structure/fence/corner{ + icon_state = "corner"; + dir = 9 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"e" = ( +/obj/structure/fence{ + icon_state = "straight"; + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"f" = ( +/obj/structure/fence/corner{ + icon_state = "corner"; + dir = 5 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"g" = ( +/obj/structure/fence/cut/large, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"h" = ( +/mob/living/simple_mob/mechanical/viscerator, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"i" = ( +/obj/structure/fence, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"j" = ( +/obj/structure/fence/corner{ + icon_state = "corner"; + dir = 10 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"k" = ( +/obj/structure/fence/door/locked, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"l" = ( +/obj/structure/fence/corner{ + icon_state = "corner"; + dir = 6 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_2) +"m" = ( +/obj/effect/map_effect/interval/effect_emitter/steam, +/obj/effect/map_effect/interval/effect_emitter/smoke/mist{ + interval_upper_bound = 600 + }, +/obj/effect/map_effect/interval/effect_emitter/smoke/bad{ + interval_lower_bound = 100; + interval_upper_bound = 3000 + }, +/obj/effect/map_effect/interval/screen_shaker{ + interval_upper_bound = 600 + }, +/obj/random/humanoidremains, +/obj/random/medical/lite, +/turf/simulated/floor/water/deep{ + outdoors = 0 + }, +/area/submap/geyser_2) + +(1,1,1) = {" +a +b +b +c +b +b +a +"} +(2,1,1) = {" +b +b +b +h +b +b +b +"} +(3,1,1) = {" +b +b +d +g +j +b +b +"} +(4,1,1) = {" +c +h +e +m +k +h +c +"} +(5,1,1) = {" +b +b +f +i +l +b +b +"} +(6,1,1) = {" +b +b +b +h +b +b +b +"} +(7,1,1) = {" +a +b +b +c +b +b +a +"} diff --git a/maps/expedition_vr/beach/submaps/Geyser3.dmm b/maps/expedition_vr/beach/submaps/Geyser3.dmm new file mode 100644 index 0000000000..a94320c290 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/Geyser3.dmm @@ -0,0 +1,174 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 9 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"c" = ( +/obj/structure/cliff/automatic, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"d" = ( +/obj/random/turf/lava, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"e" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 5 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"f" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 9 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"g" = ( +/turf/simulated/floor/lava, +/area/submap/geyser_3) +"h" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"i" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"j" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"k" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"l" = ( +/obj/effect/map_effect/interval/effect_emitter/steam, +/obj/effect/map_effect/interval/effect_emitter/smoke/bad{ + interval_lower_bound = 100; + interval_upper_bound = 3000 + }, +/obj/effect/map_effect/interval/screen_shaker{ + interval_upper_bound = 600 + }, +/obj/effect/map_effect/interval/effect_emitter/smoke/fire{ + interval_upper_bound = 1200 + }, +/turf/simulated/floor/lava, +/area/submap/geyser_3) +"m" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 10 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"n" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 10 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"o" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 6 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"p" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 6 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"q" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 2 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) +"r" = ( +/obj/random/multiple/minevault, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/geyser_3) + +(1,1,1) = {" +a +b +j +j +j +m +a +"} +(2,1,1) = {" +b +f +g +g +g +n +m +"} +(3,1,1) = {" +c +g +g +g +g +g +q +"} +(4,1,1) = {" +d +h +r +l +g +g +q +"} +(5,1,1) = {" +c +g +g +g +g +g +q +"} +(6,1,1) = {" +e +i +g +g +g +o +p +"} +(7,1,1) = {" +a +e +k +k +k +p +a +"} diff --git a/maps/expedition_vr/beach/submaps/IceCave1A.dmm b/maps/expedition_vr/beach/submaps/IceCave1A.dmm new file mode 100644 index 0000000000..a4c7d1836a --- /dev/null +++ b/maps/expedition_vr/beach/submaps/IceCave1A.dmm @@ -0,0 +1,1240 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/solidrock{ + block_tele = 0 + }, +/area/submap/cave/IceCave1A) +"b" = ( +/turf/template_noop, +/area/submap/cave/IceCave1A) +"c" = ( +/turf/simulated/floor/outdoors/ice{ + outdoors = 0 + }, +/area/submap/cave/IceCave1A) +"d" = ( +/obj/machinery/crystal/ice, +/turf/simulated/floor/outdoors/ice{ + outdoors = 0 + }, +/area/submap/cave/IceCave1A) +"e" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1A) +"f" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1A) +"g" = ( +/obj/machinery/crystal/ice, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1A) +"h" = ( +/obj/random/firstaid, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1A) +"i" = ( +/obj/random/ammo, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1A) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +f +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +"} +(3,1,1) = {" +a +a +c +c +c +c +d +c +c +c +c +c +c +c +a +a +g +g +a +a +a +a +a +a +a +a +f +f +"} +(4,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +a +a +g +f +g +a +a +a +a +g +a +a +f +f +"} +(5,1,1) = {" +a +a +c +c +c +c +c +c +c +c +d +c +c +c +a +a +g +f +g +f +f +a +g +g +a +a +f +f +"} +(6,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +a +a +f +f +f +f +f +f +f +a +a +a +f +f +"} +(7,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +d +c +c +d +g +f +f +a +a +g +f +f +f +f +g +f +f +"} +(8,1,1) = {" +a +a +d +c +c +c +c +c +c +c +c +c +c +c +d +g +f +f +a +a +a +g +f +f +f +f +f +f +"} +(9,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +d +c +d +g +f +f +a +a +a +a +a +f +f +f +f +a +"} +(10,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +f +f +f +a +a +a +a +a +a +g +a +a +a +"} +(11,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +f +f +f +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +c +c +c +c +c +c +c +d +c +c +c +c +d +f +f +f +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +c +c +c +d +c +c +c +c +c +c +c +c +d +g +f +f +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +d +f +f +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +d +c +c +c +c +c +c +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +c +c +c +c +d +c +c +c +c +d +c +c +f +d +c +c +c +c +c +c +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +d +d +a +a +a +a +f +f +a +a +a +a +f +d +a +a +a +a +c +c +d +d +a +a +a +a +"} +(18,1,1) = {" +a +a +d +d +a +a +a +a +f +f +a +a +a +a +f +g +a +a +a +a +c +c +d +d +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +f +g +a +a +g +f +f +g +a +a +a +a +c +c +c +c +a +a +a +a +"} +(20,1,1) = {" +b +a +a +a +a +a +a +a +f +g +a +a +g +f +f +g +a +a +a +a +c +c +c +c +a +a +a +a +"} +(21,1,1) = {" +b +b +b +a +a +a +a +a +f +f +a +a +f +f +g +g +a +a +a +a +d +d +f +f +a +a +a +a +"} +(22,1,1) = {" +b +b +b +b +a +a +a +a +f +f +a +a +f +f +f +g +a +a +a +a +d +d +f +f +a +a +a +a +"} +(23,1,1) = {" +b +b +b +b +a +a +c +c +d +c +d +d +g +f +f +g +a +a +a +a +a +a +g +f +f +g +a +a +"} +(24,1,1) = {" +b +b +b +b +a +a +c +c +c +c +d +d +d +g +f +f +a +a +g +f +f +a +f +f +f +g +a +a +"} +(25,1,1) = {" +b +b +b +b +a +a +c +c +c +d +a +a +a +a +f +f +f +g +f +f +f +g +f +f +f +g +a +a +"} +(26,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +g +g +a +f +g +f +g +f +f +f +f +f +f +g +g +a +a +"} +(27,1,1) = {" +b +b +b +b +a +a +d +c +c +c +a +e +f +a +f +f +f +g +f +f +f +a +a +a +a +a +a +a +"} +(28,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +f +f +f +f +f +g +g +f +f +f +a +a +a +a +a +a +a +"} +(29,1,1) = {" +b +b +b +b +a +a +c +c +c +d +a +f +f +a +a +a +a +a +f +f +g +a +a +b +b +b +b +b +"} +(30,1,1) = {" +b +b +b +a +a +a +g +f +g +g +a +f +f +f +f +f +g +f +f +a +a +a +a +b +b +b +b +b +"} +(31,1,1) = {" +b +a +a +a +a +a +g +f +g +g +a +f +f +g +f +f +f +f +f +a +a +a +a +b +b +b +b +b +"} +(32,1,1) = {" +a +a +a +a +a +f +f +f +g +g +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +"} +(33,1,1) = {" +a +a +a +g +f +f +f +f +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +"} +(34,1,1) = {" +a +a +e +f +f +f +f +g +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(35,1,1) = {" +a +a +f +f +f +f +f +e +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(36,1,1) = {" +a +a +g +f +f +f +f +f +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(37,1,1) = {" +a +a +g +g +f +f +f +g +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(38,1,1) = {" +a +a +a +h +i +e +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} diff --git a/maps/expedition_vr/beach/submaps/IceCave1B.dmm b/maps/expedition_vr/beach/submaps/IceCave1B.dmm new file mode 100644 index 0000000000..fb804e4f7e --- /dev/null +++ b/maps/expedition_vr/beach/submaps/IceCave1B.dmm @@ -0,0 +1,1240 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/solidrock{ + block_tele = 0 + }, +/area/submap/cave/IceCave1B) +"b" = ( +/turf/template_noop, +/area/submap/cave/IceCave1B) +"c" = ( +/turf/simulated/floor/outdoors/ice{ + outdoors = 0 + }, +/area/submap/cave/IceCave1B) +"d" = ( +/obj/machinery/crystal/ice, +/turf/simulated/floor/outdoors/ice{ + outdoors = 0 + }, +/area/submap/cave/IceCave1B) +"e" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1B) +"f" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1B) +"g" = ( +/obj/machinery/crystal/ice, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1B) +"h" = ( +/obj/random/firstaid, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1B) +"i" = ( +/obj/random/ammo, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1B) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +f +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +"} +(3,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +a +a +g +g +a +a +a +a +a +a +a +a +f +f +"} +(4,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +d +a +a +g +f +g +a +a +a +a +g +a +a +f +f +"} +(5,1,1) = {" +a +a +c +d +c +c +d +c +c +c +c +c +c +c +a +a +g +f +g +f +f +a +g +g +a +a +f +f +"} +(6,1,1) = {" +a +a +c +c +c +c +c +c +c +d +c +c +c +c +a +a +f +f +f +f +f +f +f +a +a +a +f +f +"} +(7,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +g +f +f +a +a +g +f +f +f +f +g +f +f +"} +(8,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +d +c +c +d +g +f +f +a +a +a +g +f +f +f +f +f +f +"} +(9,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +g +f +f +a +a +a +a +a +f +f +f +f +a +"} +(10,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +f +f +f +a +a +a +a +a +a +g +a +a +a +"} +(11,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +f +f +f +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +c +c +d +c +c +c +c +c +c +c +d +c +d +f +f +f +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +g +f +f +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +d +f +f +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +d +c +c +c +c +c +c +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +c +c +c +c +c +d +c +c +d +c +c +c +f +d +c +c +c +c +c +c +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +d +d +a +a +a +a +f +f +a +a +a +a +f +d +a +a +a +a +c +c +d +d +a +a +a +a +"} +(18,1,1) = {" +a +a +d +d +a +a +a +a +f +f +a +a +a +a +f +g +a +a +a +a +c +c +d +d +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +f +g +a +a +g +f +f +g +a +a +a +a +c +c +c +c +a +a +a +a +"} +(20,1,1) = {" +b +a +a +a +a +a +a +a +f +g +a +a +g +f +f +g +a +a +a +a +c +c +c +c +a +a +a +a +"} +(21,1,1) = {" +b +b +b +a +a +a +a +a +f +f +a +a +f +f +g +g +a +a +a +a +d +d +f +f +a +a +a +a +"} +(22,1,1) = {" +b +b +b +b +a +a +a +a +f +f +a +a +f +f +f +g +a +a +a +a +d +d +f +f +a +a +a +a +"} +(23,1,1) = {" +b +b +b +b +a +a +c +c +d +c +d +d +g +f +f +g +a +a +a +a +a +a +g +f +f +g +a +a +"} +(24,1,1) = {" +b +b +b +b +a +a +c +c +c +c +d +d +d +g +f +f +a +a +g +f +f +a +f +f +f +g +a +a +"} +(25,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +a +a +a +f +f +f +g +f +f +f +g +f +f +f +g +a +a +"} +(26,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +g +g +a +f +g +f +g +f +f +f +f +f +f +g +g +a +a +"} +(27,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +e +f +a +f +f +f +g +f +f +f +a +a +a +a +a +a +a +"} +(28,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +f +f +f +f +f +g +g +f +f +f +a +a +a +a +a +a +a +"} +(29,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +f +f +a +a +a +a +a +f +f +g +a +a +b +b +b +b +b +"} +(30,1,1) = {" +b +b +b +a +a +a +g +f +g +g +a +f +f +f +f +f +g +f +f +a +a +a +a +b +b +b +b +b +"} +(31,1,1) = {" +b +a +a +a +a +a +g +f +g +g +a +f +f +g +f +f +f +f +f +a +a +a +a +b +b +b +b +b +"} +(32,1,1) = {" +a +a +a +a +a +f +f +f +g +g +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +"} +(33,1,1) = {" +a +a +a +g +f +f +f +f +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +"} +(34,1,1) = {" +a +a +e +f +f +f +f +g +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(35,1,1) = {" +a +a +f +f +f +f +f +e +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(36,1,1) = {" +a +a +g +f +f +f +f +f +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(37,1,1) = {" +a +a +g +g +f +f +f +g +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(38,1,1) = {" +a +a +a +h +i +e +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} diff --git a/maps/expedition_vr/beach/submaps/IceCave1C.dmm b/maps/expedition_vr/beach/submaps/IceCave1C.dmm new file mode 100644 index 0000000000..b41b34781b --- /dev/null +++ b/maps/expedition_vr/beach/submaps/IceCave1C.dmm @@ -0,0 +1,1240 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/solidrock{ + block_tele = 0 + }, +/area/submap/cave/IceCave1C) +"b" = ( +/turf/template_noop, +/area/submap/cave/IceCave1C) +"c" = ( +/turf/simulated/floor/outdoors/ice{ + outdoors = 0 + }, +/area/submap/cave/IceCave1C) +"d" = ( +/obj/machinery/crystal/ice, +/turf/simulated/floor/outdoors/ice{ + outdoors = 0 + }, +/area/submap/cave/IceCave1C) +"e" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1C) +"f" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1C) +"g" = ( +/obj/machinery/crystal/ice, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1C) +"h" = ( +/obj/random/firstaid, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1C) +"i" = ( +/obj/random/ammo, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/IceCave1C) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +f +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +"} +(3,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +d +c +a +a +g +g +a +a +a +a +a +a +a +a +f +f +"} +(4,1,1) = {" +a +a +c +d +c +c +c +c +c +c +c +c +c +c +a +a +g +f +g +a +a +a +a +g +a +a +f +f +"} +(5,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +d +c +c +a +a +g +f +g +f +f +a +g +g +a +a +f +f +"} +(6,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +a +a +f +f +f +f +f +f +f +a +a +a +f +f +"} +(7,1,1) = {" +a +a +c +c +c +c +c +d +c +c +c +c +c +c +d +g +f +f +a +a +g +f +f +f +f +g +f +f +"} +(8,1,1) = {" +a +a +c +c +c +c +c +c +c +d +c +c +c +c +d +g +f +f +a +a +a +g +f +f +f +f +f +f +"} +(9,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +g +f +f +a +a +a +a +a +f +f +f +f +a +"} +(10,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +f +f +f +a +a +a +a +a +a +g +a +a +a +"} +(11,1,1) = {" +a +a +c +c +c +c +c +c +c +c +d +c +c +c +d +f +f +f +a +a +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +f +f +f +a +a +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +d +g +f +f +a +a +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +c +c +c +c +d +c +c +c +c +c +c +c +d +d +f +f +a +a +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +d +d +d +c +c +c +c +c +c +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +c +c +d +c +c +c +c +c +c +c +c +c +f +d +c +c +c +c +c +c +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +d +d +a +a +a +a +f +f +a +a +a +a +f +d +a +a +a +a +c +c +d +d +a +a +a +a +"} +(18,1,1) = {" +a +a +d +d +a +a +a +a +f +f +a +a +a +a +f +g +a +a +a +a +c +c +d +d +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +f +g +a +a +g +f +f +g +a +a +a +a +c +c +c +c +a +a +a +a +"} +(20,1,1) = {" +b +a +a +a +a +a +a +a +f +g +a +a +g +f +f +g +a +a +a +a +c +c +c +c +a +a +a +a +"} +(21,1,1) = {" +b +b +b +a +a +a +a +a +f +f +a +a +f +f +g +g +a +a +a +a +d +d +f +f +a +a +a +a +"} +(22,1,1) = {" +b +b +b +b +a +a +a +a +g +f +a +a +f +f +f +g +a +a +a +a +d +d +f +f +a +a +a +a +"} +(23,1,1) = {" +b +b +b +b +a +a +d +c +c +c +d +d +g +f +f +g +a +a +a +a +a +a +g +f +f +g +a +a +"} +(24,1,1) = {" +b +b +b +b +a +a +c +c +d +c +d +d +d +g +f +f +a +a +g +f +f +a +f +f +f +g +a +a +"} +(25,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +a +a +a +f +f +f +g +f +f +f +g +f +f +f +g +a +a +"} +(26,1,1) = {" +b +b +b +b +a +a +c +c +c +c +a +g +g +a +f +g +f +g +f +f +f +f +f +f +g +g +a +a +"} +(27,1,1) = {" +b +b +b +b +a +a +c +c +c +d +a +e +f +a +f +f +f +g +f +f +f +a +a +a +a +a +a +a +"} +(28,1,1) = {" +b +b +b +b +a +a +c +d +c +d +a +f +f +f +f +f +g +g +f +f +f +a +a +a +a +a +a +a +"} +(29,1,1) = {" +b +b +b +b +a +a +d +d +c +d +a +f +f +a +a +a +a +a +f +f +g +a +a +b +b +b +b +b +"} +(30,1,1) = {" +b +b +b +a +a +a +g +g +f +g +a +f +f +f +f +f +g +f +f +a +a +a +a +b +b +b +b +b +"} +(31,1,1) = {" +b +a +a +a +a +a +f +g +f +g +a +f +f +g +f +f +f +f +f +a +a +a +a +b +b +b +b +b +"} +(32,1,1) = {" +a +a +a +a +a +f +f +f +f +g +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +"} +(33,1,1) = {" +a +a +a +g +f +f +f +f +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +"} +(34,1,1) = {" +a +a +e +f +f +f +f +g +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(35,1,1) = {" +a +a +f +f +f +f +f +e +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(36,1,1) = {" +a +a +g +f +f +f +f +f +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(37,1,1) = {" +a +a +g +g +f +f +f +g +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(38,1,1) = {" +a +a +a +h +i +e +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +"} diff --git a/maps/expedition_vr/beach/submaps/Mineshaft1.dmm b/maps/expedition_vr/beach/submaps/Mineshaft1.dmm new file mode 100644 index 0000000000..45cfbc7b2a --- /dev/null +++ b/maps/expedition_vr/beach/submaps/Mineshaft1.dmm @@ -0,0 +1,903 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/cave/AMine1) +"c" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/AMine1) +"d" = ( +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/AMine1) +"e" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/AMine1) +"f" = ( +/turf/simulated/wall, +/area/submap/cave/AMine1) +"g" = ( +/obj/machinery/space_heater, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"h" = ( +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"i" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"j" = ( +/obj/structure/table/standard, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"k" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/machinery/light{ + icon_state = "tube1"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"l" = ( +/obj/structure/table/standard, +/obj/structure/bedsheetbin, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"m" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"n" = ( +/obj/item/weapon/ore/gold, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/AMine1) +"o" = ( +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/AMine1) +"p" = ( +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/obj/item/weapon/ore/gold, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/AMine1) +"q" = ( +/obj/structure/table/standard, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"r" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"s" = ( +/obj/structure/window/reinforced/full, +/turf/simulated/wall, +/area/submap/cave/AMine1) +"t" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"u" = ( +/obj/structure/table/standard, +/obj/machinery/cell_charger, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"v" = ( +/obj/structure/table/standard, +/obj/item/weapon/cell/high, +/obj/item/weapon/cell/high, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"w" = ( +/obj/structure/loot_pile/maint/trash, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"x" = ( +/turf/simulated/floor, +/area/submap/cave/AMine1) +"y" = ( +/obj/machinery/power/apc{ + operating = 0; + pixel_x = 31 + }, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"z" = ( +/obj/structure/ore_box, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/AMine1) +"A" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/AMine1) +"B" = ( +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"C" = ( +/obj/structure/closet/crate/engineering, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"D" = ( +/obj/machinery/light, +/obj/machinery/space_heater, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"E" = ( +/obj/machinery/space_heater, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"F" = ( +/obj/structure/closet/secure_closet/engineering_welding, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"G" = ( +/obj/structure/table/rack, +/obj/item/weapon/pickaxe/drill, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"H" = ( +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"I" = ( +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"J" = ( +/obj/machinery/washing_machine, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"K" = ( +/obj/structure/ore_box, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/AMine1) +"L" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"M" = ( +/obj/item/weapon/stool, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"N" = ( +/obj/machinery/light/small{ + brightness_color = "#DA0205"; + brightness_power = 1; + brightness_range = 5; + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/AMine1) +"O" = ( +/obj/machinery/light/small{ + dir = 4; + pixel_y = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/AMine1) +"P" = ( +/obj/structure/table/standard, +/obj/item/pizzabox, +/turf/simulated/floor/tiled, +/area/submap/cave/AMine1) +"Q" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"R" = ( +/obj/machinery/light{ + icon_state = "tube1"; + dir = 1 + }, +/turf/simulated/floor, +/area/submap/cave/AMine1) +"S" = ( +/obj/machinery/light/small, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/AMine1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(3,1,1) = {" +a +b +b +b +b +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(4,1,1) = {" +a +b +b +b +b +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +b +a +"} +(5,1,1) = {" +a +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +a +"} +(6,1,1) = {" +a +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +N +c +b +b +b +b +b +b +a +"} +(7,1,1) = {" +a +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +"} +(8,1,1) = {" +a +b +b +b +b +b +n +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +"} +(9,1,1) = {" +a +b +b +b +b +b +o +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +a +"} +(10,1,1) = {" +a +b +b +b +b +b +p +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +a +"} +(11,1,1) = {" +a +b +b +b +b +b +b +b +b +b +c +c +c +c +c +c +c +c +c +c +c +b +b +b +a +"} +(12,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +z +c +c +c +c +c +c +c +c +c +c +b +b +a +"} +(13,1,1) = {" +a +b +c +b +b +b +b +b +b +b +b +A +c +c +c +d +O +d +d +d +c +c +c +c +a +"} +(14,1,1) = {" +a +b +d +d +d +d +d +d +d +d +d +d +d +d +K +d +f +Q +f +d +c +c +c +c +a +"} +(15,1,1) = {" +a +c +d +f +f +f +f +s +s +s +s +s +f +f +f +f +f +R +f +d +c +c +c +c +a +"} +(16,1,1) = {" +a +c +e +f +g +h +h +h +h +h +h +h +g +G +G +f +f +Q +f +d +c +c +c +c +a +"} +(17,1,1) = {" +a +c +d +f +h +h +h +t +h +h +h +h +t +h +h +h +h +h +f +d +c +c +c +c +a +"} +(18,1,1) = {" +a +c +d +f +f +m +f +f +f +m +f +f +f +f +f +f +f +Q +f +d +c +S +b +b +a +"} +(19,1,1) = {" +a +c +d +f +i +h +i +f +u +x +x +B +f +g +h +L +h +h +f +d +c +c +b +b +a +"} +(20,1,1) = {" +a +c +d +f +j +h +q +f +v +x +x +C +f +H +h +M +j +M +f +d +c +b +b +b +a +"} +(21,1,1) = {" +a +c +d +f +k +h +r +f +v +x +x +D +f +I +h +M +j +M +f +d +c +b +b +b +a +"} +(22,1,1) = {" +a +c +e +f +l +h +j +f +w +x +x +E +f +h +h +M +P +M +f +d +b +b +b +b +a +"} +(23,1,1) = {" +a +c +d +f +i +h +i +f +x +x +y +F +f +J +h +t +h +h +f +b +b +b +b +b +a +"} +(24,1,1) = {" +a +c +d +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +b +b +b +b +b +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/Rockb1.dmm b/maps/expedition_vr/beach/submaps/Rockb1.dmm new file mode 100644 index 0000000000..7290e089cd --- /dev/null +++ b/maps/expedition_vr/beach/submaps/Rockb1.dmm @@ -0,0 +1,790 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/template_noop, +/area/submap/Rockb1) +"c" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Rockb1) +"d" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/Rockb1) +"e" = ( +/turf/simulated/wall/r_wall, +/area/submap/Rockb1) +"f" = ( +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/lino, +/area/submap/Rockb1) +"g" = ( +/obj/structure/closet/cabinet, +/obj/item/weapon/gun/projectile/pistol, +/obj/item/ammo_magazine/m9mm/compact, +/turf/simulated/floor/lino, +/area/submap/Rockb1) +"h" = ( +/obj/structure/bookcase, +/turf/simulated/floor/lino, +/area/submap/Rockb1) +"i" = ( +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"j" = ( +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"k" = ( +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"l" = ( +/obj/item/seeds/ambrosiadeusseed, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"m" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"n" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/material/shard, +/turf/simulated/floor/plating, +/area/submap/Rockb1) +"o" = ( +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/plating, +/area/submap/Rockb1) +"p" = ( +/obj/structure/bed, +/turf/simulated/floor/lino, +/area/submap/Rockb1) +"q" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/lino, +/area/submap/Rockb1) +"r" = ( +/turf/simulated/floor/lino, +/area/submap/Rockb1) +"s" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"t" = ( +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"u" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"v" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/stack/rods, +/turf/simulated/floor/plating, +/area/submap/Rockb1) +"w" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"x" = ( +/obj/machinery/light/small{ + brightness_color = "#DA0205"; + brightness_power = 1; + brightness_range = 5 + }, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"y" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"z" = ( +/obj/machinery/light/small{ + brightness_color = "#DA0205"; + brightness_power = 1; + brightness_range = 5 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"A" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"B" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"C" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"D" = ( +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + operating = 0; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"E" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"F" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/hydro, +/area/submap/Rockb1) +"G" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/hydro, +/area/submap/Rockb1) +"H" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/green, +/turf/simulated/floor/plating, +/area/submap/Rockb1) +"I" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/terminal{ + dir = 8 + }, +/obj/machinery/power/port_gen/pacman, +/turf/simulated/floor/plating, +/area/submap/Rockb1) +"J" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/excavation, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"K" = ( +/obj/structure/table/standard, +/obj/item/weapon/pickaxe/drill, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"L" = ( +/obj/structure/table/standard, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/steel, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"M" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/toolbox/electrical, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"N" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/toolbox/mechanical, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"O" = ( +/obj/machinery/door/airlock/hatch, +/turf/simulated/floor/tiled, +/area/submap/Rockb1) +"P" = ( +/turf/simulated/floor/plating, +/area/submap/Rockb1) +"Q" = ( +/obj/machinery/light/small{ + brightness_color = "#DA0205"; + brightness_power = 1; + brightness_range = 5 + }, +/turf/simulated/floor/plating, +/area/submap/Rockb1) +"R" = ( +/obj/effect/decal/cleanable/greenglow, +/turf/simulated/floor/plating, +/area/submap/Rockb1) +"S" = ( +/obj/structure/loot_pile/maint/trash, +/turf/simulated/floor/plating, +/area/submap/Rockb1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +b +b +b +b +b +b +b +b +c +b +b +b +b +b +b +b +b +b +a +"} +(3,1,1) = {" +a +b +b +c +c +c +c +c +c +c +d +d +d +c +c +c +c +b +b +a +"} +(4,1,1) = {" +a +b +c +c +c +d +d +d +d +d +d +d +d +d +c +c +c +c +b +a +"} +(5,1,1) = {" +a +c +c +c +d +d +d +d +d +d +d +d +d +d +d +d +c +c +b +a +"} +(6,1,1) = {" +a +b +c +d +d +e +e +e +e +e +e +e +e +e +d +d +c +c +b +a +"} +(7,1,1) = {" +a +b +c +d +d +e +f +p +e +m +w +A +H +e +d +d +c +c +b +a +"} +(8,1,1) = {" +a +b +c +d +d +e +g +q +e +t +e +B +I +e +d +d +c +c +b +a +"} +(9,1,1) = {" +a +b +c +d +d +e +h +r +w +x +e +C +J +e +d +d +c +c +b +a +"} +(10,1,1) = {" +a +b +c +d +d +e +e +e +e +m +e +D +K +e +d +d +d +c +b +a +"} +(11,1,1) = {" +a +b +d +d +d +e +i +s +m +m +e +e +e +e +e +e +d +c +b +a +"} +(12,1,1) = {" +a +b +d +d +d +e +j +t +t +t +e +t +t +O +P +e +d +c +b +a +"} +(13,1,1) = {" +a +b +d +d +d +e +k +m +t +t +e +E +L +e +Q +e +d +c +b +a +"} +(14,1,1) = {" +a +b +d +d +d +e +e +e +e +t +e +m +M +e +R +e +d +c +b +a +"} +(15,1,1) = {" +a +b +d +d +d +e +l +t +w +t +w +t +N +e +S +e +d +c +c +a +"} +(16,1,1) = {" +a +b +d +d +d +e +m +u +e +t +e +w +e +e +e +e +d +c +c +a +"} +(17,1,1) = {" +a +b +c +d +d +e +n +m +e +x +e +F +e +d +d +d +d +c +c +a +"} +(18,1,1) = {" +a +b +c +d +d +e +o +v +e +y +e +G +e +d +d +c +d +c +c +a +"} +(19,1,1) = {" +a +b +c +d +d +e +e +e +e +z +e +e +e +d +d +c +d +c +b +a +"} +(20,1,1) = {" +a +b +c +c +d +d +d +d +e +y +e +d +d +d +c +c +c +c +b +a +"} +(21,1,1) = {" +a +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +a +"} +(22,1,1) = {" +a +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +a +"} +(23,1,1) = {" +a +b +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +a +"} +(24,1,1) = {" +a +b +b +b +b +c +c +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/Scave1.dmm b/maps/expedition_vr/beach/submaps/Scave1.dmm new file mode 100644 index 0000000000..4aba16fdce --- /dev/null +++ b/maps/expedition_vr/beach/submaps/Scave1.dmm @@ -0,0 +1,942 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"c" = ( +/obj/effect/spider/stickyweb, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"d" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"e" = ( +/obj/effect/spider/spiderling/frost, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"f" = ( +/obj/item/weapon/spacecash/c100, +/obj/item/weapon/spacecash/c100, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"g" = ( +/obj/random/mob/spider/mutant, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"h" = ( +/obj/item/weapon/spacecash/c100, +/obj/item/weapon/spacecash/c100, +/obj/item/weapon/spacecash/c100, +/obj/effect/decal/remains, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"i" = ( +/obj/random/mob/spider, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"j" = ( +/obj/item/weapon/grenade/spawnergrenade/spider, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"k" = ( +/obj/random/toolbox, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"l" = ( +/obj/effect/decal/mecha_wreckage/ripley, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"m" = ( +/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"n" = ( +/obj/item/device/flashlight, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"o" = ( +/mob/living/simple_mob/animal/giant_spider/frost, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"p" = ( +/obj/effect/spider/stickyweb, +/obj/effect/spider/stickyweb, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) +"q" = ( +/obj/effect/decal/remains, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/Scave1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +b +b +b +b +d +d +b +b +b +b +b +b +b +b +d +n +d +d +d +q +b +b +b +a +a +"} +(4,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +d +d +d +d +d +b +b +b +a +a +"} +(5,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +d +p +b +b +b +b +a +a +"} +(6,1,1) = {" +a +b +b +b +b +b +f +h +b +b +b +b +b +b +b +b +b +b +b +p +p +b +b +b +b +b +a +"} +(7,1,1) = {" +a +b +b +b +b +d +d +f +b +b +b +b +b +b +b +b +b +b +b +d +c +b +b +b +b +b +a +"} +(8,1,1) = {" +a +a +b +b +b +e +d +b +b +b +c +c +b +b +b +b +b +b +b +d +d +b +b +b +b +b +a +"} +(9,1,1) = {" +a +a +a +b +c +d +d +b +b +d +d +d +g +d +d +d +d +d +d +e +d +b +b +b +b +b +a +"} +(10,1,1) = {" +a +a +a +b +b +d +d +i +d +d +d +d +d +d +c +d +d +d +d +d +d +d +b +b +b +a +a +"} +(11,1,1) = {" +a +a +b +b +b +b +c +d +d +d +d +c +c +d +d +d +d +b +d +d +g +d +c +b +b +b +a +"} +(12,1,1) = {" +a +a +b +b +b +b +b +d +c +b +b +b +b +b +b +b +b +b +b +d +d +d +d +b +b +b +a +"} +(13,1,1) = {" +a +a +b +b +b +b +b +d +d +b +b +b +b +b +b +b +b +b +b +b +d +d +d +b +b +b +a +"} +(14,1,1) = {" +a +a +b +b +b +c +d +d +d +b +b +b +b +b +b +b +b +b +b +b +c +d +d +b +b +b +a +"} +(15,1,1) = {" +a +a +b +b +b +c +e +d +d +k +b +b +b +b +b +b +b +b +b +b +b +d +c +b +b +b +a +"} +(16,1,1) = {" +a +a +a +b +b +c +d +d +d +c +b +b +b +b +b +b +b +b +b +b +c +d +d +b +b +b +a +"} +(17,1,1) = {" +a +a +a +b +b +b +b +b +d +d +b +b +b +b +b +b +b +b +b +b +d +d +d +b +b +b +a +"} +(18,1,1) = {" +a +a +a +b +b +b +b +c +d +d +c +b +b +l +m +c +b +b +b +b +d +d +d +g +b +a +a +"} +(19,1,1) = {" +a +a +a +b +b +b +b +c +d +d +d +d +d +d +d +d +c +b +b +b +d +d +d +b +b +a +a +"} +(20,1,1) = {" +a +a +a +b +b +b +b +e +d +d +d +i +d +d +d +d +c +o +b +b +d +d +d +b +b +b +a +"} +(21,1,1) = {" +a +a +a +b +b +b +b +d +d +d +d +d +d +d +g +d +d +c +b +d +d +c +c +b +b +b +a +"} +(22,1,1) = {" +a +a +a +b +b +d +d +d +d +d +d +d +d +d +d +d +d +d +d +e +c +b +b +b +b +b +a +"} +(23,1,1) = {" +a +a +b +b +b +d +g +d +d +b +c +c +c +c +c +c +d +d +d +d +b +b +b +b +b +b +a +"} +(24,1,1) = {" +a +a +b +b +b +d +d +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(25,1,1) = {" +a +a +b +b +d +e +d +d +j +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +"} +(26,1,1) = {" +a +a +b +b +b +d +d +e +g +b +b +b +b +b +b +b +b +b +d +d +d +d +b +b +b +a +a +"} +(27,1,1) = {" +a +a +b +b +b +d +d +d +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm b/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm new file mode 100644 index 0000000000..e38e20010f --- /dev/null +++ b/maps/expedition_vr/beach/submaps/SupplyDrop1.dmm @@ -0,0 +1,177 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/cave, +/area/submap/cave/SupplyDrop1) +"b" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/SupplyDrop1) +"d" = ( +/turf/simulated/wall/titanium, +/area/submap/cave/SupplyDrop1) +"e" = ( +/obj/structure/droppod_door{ + dir = 1 + }, +/turf/simulated/wall/titanium, +/area/submap/cave/SupplyDrop1) +"f" = ( +/turf/simulated/floor/reinforced, +/area/submap/cave/SupplyDrop1) +"g" = ( +/obj/structure/droppod_door{ + dir = 8 + }, +/turf/simulated/wall/titanium, +/area/submap/cave/SupplyDrop1) +"h" = ( +/obj/structure/closet/crate, +/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/weapon/gun/energy/stunrevolver, +/obj/item/weapon/storage/box/flare, +/obj/item/stack/marker_beacon/ten, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/trash/tastybread, +/obj/item/trash/tastybread, +/obj/item/trash/sosjerky, +/obj/item/trash/sosjerky, +/obj/item/trash/liquidfood, +/obj/item/trash/liquidfood, +/obj/item/weapon/flame/lighter/random, +/obj/item/device/gps, +/turf/simulated/floor/reinforced, +/area/submap/cave/SupplyDrop1) +"i" = ( +/obj/structure/droppod_door{ + dir = 4 + }, +/turf/simulated/wall/titanium, +/area/submap/cave/SupplyDrop1) +"j" = ( +/obj/structure/droppod_door, +/turf/simulated/wall/titanium, +/area/submap/cave/SupplyDrop1) + +(1,1,1) = {" +a +a +a +a +c +c +b +b +b +b +"} +(2,1,1) = {" +a +a +c +c +c +c +c +b +b +b +"} +(3,1,1) = {" +b +c +c +c +c +c +c +c +a +c +"} +(4,1,1) = {" +b +c +c +c +d +g +d +a +a +c +"} +(5,1,1) = {" +b +c +c +d +d +f +d +d +a +c +"} +(6,1,1) = {" +c +a +c +e +f +h +f +j +c +c +"} +(7,1,1) = {" +c +a +a +d +d +f +d +d +c +c +"} +(8,1,1) = {" +c +c +c +c +d +i +d +c +c +c +"} +(9,1,1) = {" +c +c +c +c +c +c +a +a +a +c +"} +(10,1,1) = {" +b +b +b +b +c +c +c +c +c +c +"} diff --git a/maps/expedition_vr/beach/submaps/SwordCave.dmm b/maps/expedition_vr/beach/submaps/SwordCave.dmm new file mode 100644 index 0000000000..f14417c782 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/SwordCave.dmm @@ -0,0 +1,1808 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/mineral/cave, +/area/submap/cave/swordcave) +"c" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/swordcave) +"d" = ( +/obj/machinery/crystal, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/swordcave) +"e" = ( +/turf/simulated/floor/water, +/area/submap/cave/swordcave) +"f" = ( +/turf/simulated/floor/water/deep, +/area/submap/cave/swordcave) +"g" = ( +/obj/structure/ghost_pod/manual/cursedblade, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/swordcave) +"h" = ( +/mob/living/simple_mob/faithless/cult, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/swordcave) +"i" = ( +/obj/item/device/gps/explorer/on, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/swordcave) +"j" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/swordcave) +"k" = ( +/mob/living/simple_mob/animal/space/bats, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/swordcave) +"l" = ( +/mob/living/simple_mob/animal/space/bats/cult, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/swordcave) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +c +c +c +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +b +b +b +b +c +c +c +c +c +c +c +c +c +d +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +b +b +b +c +c +d +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +b +b +b +c +c +c +c +c +c +c +c +c +c +c +l +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +a +a +a +a +"} +(9,1,1) = {" +b +b +b +b +c +c +c +c +c +c +c +d +c +c +c +c +c +c +d +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +a +a +a +a +"} +(10,1,1) = {" +b +b +b +c +c +c +c +c +c +e +e +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +b +a +a +a +"} +(11,1,1) = {" +b +b +c +c +c +c +c +e +e +e +e +e +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +a +a +a +"} +(12,1,1) = {" +b +b +c +c +c +c +e +e +e +f +f +f +f +e +e +c +c +c +c +c +c +c +l +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +a +a +"} +(13,1,1) = {" +b +b +c +c +c +e +e +f +f +f +f +f +f +f +e +e +c +c +c +c +c +c +c +c +c +c +d +c +c +c +l +c +c +c +c +b +b +b +b +a +a +"} +(14,1,1) = {" +b +b +c +c +e +e +e +e +e +e +e +e +f +f +f +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +a +a +"} +(15,1,1) = {" +b +b +c +c +e +e +f +e +e +e +e +e +e +f +f +f +e +e +c +c +c +l +c +c +c +c +c +c +c +c +c +c +c +d +c +c +b +b +b +a +a +"} +(16,1,1) = {" +b +b +c +c +e +e +f +e +c +c +e +c +e +e +f +f +f +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +a +a +"} +(17,1,1) = {" +b +c +c +c +e +e +f +e +c +c +c +c +e +e +e +f +f +f +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +a +a +"} +(18,1,1) = {" +b +c +c +c +e +e +f +e +c +c +c +i +c +e +e +f +f +f +f +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +a +a +"} +(19,1,1) = {" +b +c +c +c +e +e +f +e +e +c +g +j +c +c +e +e +f +e +e +e +c +c +c +c +c +c +c +l +c +c +d +c +c +c +c +c +b +b +b +a +a +"} +(20,1,1) = {" +b +d +c +c +e +e +f +e +e +c +c +c +c +c +e +e +f +e +e +c +c +c +c +c +c +d +c +c +c +c +c +c +c +c +c +c +c +b +b +a +a +"} +(21,1,1) = {" +b +c +c +c +e +e +f +f +e +e +c +d +c +c +e +e +f +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +l +c +c +c +b +a +a +"} +(22,1,1) = {" +b +c +c +c +e +e +f +e +e +c +c +c +c +c +e +e +f +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +a +a +"} +(23,1,1) = {" +b +c +c +c +e +e +f +e +e +c +c +c +c +c +e +e +f +e +e +d +c +c +c +l +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +a +"} +(24,1,1) = {" +b +c +c +c +e +e +f +e +e +c +h +c +c +e +e +f +f +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +"} +(25,1,1) = {" +b +b +c +c +e +e +f +e +e +c +c +c +e +e +f +f +f +f +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +"} +(26,1,1) = {" +b +b +c +c +e +e +f +e +e +e +c +c +e +e +f +f +f +f +e +e +c +c +c +c +c +c +c +c +c +d +c +c +c +c +c +c +c +c +c +d +c +"} +(27,1,1) = {" +b +b +c +c +c +e +e +e +f +e +e +e +e +f +f +f +f +f +e +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +l +c +c +c +c +c +c +"} +(28,1,1) = {" +b +b +c +c +c +c +e +e +f +f +e +e +f +f +f +f +e +e +e +c +c +c +l +c +c +c +c +d +c +c +c +c +c +c +c +c +c +c +c +c +c +"} +(29,1,1) = {" +b +b +c +c +c +c +e +e +f +f +f +f +e +e +e +e +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +c +c +c +c +c +"} +(30,1,1) = {" +b +b +c +c +c +c +c +e +e +f +f +e +e +e +e +e +c +c +k +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +c +c +c +a +"} +(31,1,1) = {" +b +b +c +c +c +c +c +c +e +e +e +e +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +c +a +a +"} +(32,1,1) = {" +b +b +b +c +c +c +c +c +c +e +e +c +c +c +c +c +c +c +c +c +d +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +a +a +a +"} +(33,1,1) = {" +b +b +b +d +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +l +c +c +c +c +c +b +b +b +b +b +b +b +a +a +a +a +a +"} +(34,1,1) = {" +b +b +b +b +c +c +c +c +c +c +c +d +c +c +c +c +d +c +c +c +l +c +c +c +c +c +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +"} +(35,1,1) = {" +b +b +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +"} +(36,1,1) = {" +a +b +b +b +b +b +b +b +b +b +b +b +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +"} +(37,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +"} +(38,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(39,1,1) = {" +a +a +a +a +b +b +b +b +a +a +a +a +a +b +b +b +b +b +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(41,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/crashed_ufo.dmm b/maps/expedition_vr/beach/submaps/crashed_ufo.dmm new file mode 100644 index 0000000000..4ba1a0d87d --- /dev/null +++ b/maps/expedition_vr/beach/submaps/crashed_ufo.dmm @@ -0,0 +1,1645 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/template_noop) +"ab" = ( +/turf/simulated/shuttle/floor/alienplating/external, +/area/submap/cave/crashed_ufo) +"ac" = ( +/turf/simulated/shuttle/wall/alien, +/area/submap/cave/crashed_ufo) +"ad" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"ae" = ( +/obj/structure/closet/alien, +/obj/item/prop/alien/junk, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"af" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"ag" = ( +/obj/machinery/door/airlock/alien/locked, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"ah" = ( +/obj/effect/decal/remains/xeno, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"ai" = ( +/obj/machinery/porta_turret/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aj" = ( +/obj/structure/loot_pile/surface/alien/engineering, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"ak" = ( +/obj/structure/prop/alien/computer, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"al" = ( +/obj/item/weapon/tool/wrench/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"am" = ( +/obj/structure/bed/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"an" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"ao" = ( +/obj/structure/table/alien, +/obj/item/clothing/head/helmet/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"ap" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aq" = ( +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"ar" = ( +/obj/structure/table/alien, +/obj/item/weapon/paper/alien{ + icon_state = "alienpaper_words"; + info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"as" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/submap/cave/crashed_ufo) +"at" = ( +/obj/structure/prop/alien/computer, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"au" = ( +/obj/structure/table/alien, +/obj/item/prop/alien/junk, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"av" = ( +/obj/structure/table/alien, +/obj/item/weapon/paper/alien{ + icon_state = "alienpaper_words"; + info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aw" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"ax" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"ay" = ( +/obj/structure/prop/alien/computer{ + icon_state = "console-c"; + dir = 4 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"az" = ( +/obj/machinery/door/airlock/alien/locked{ + welded = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aA" = ( +/obj/structure/bed/alien, +/obj/effect/decal/remains/xeno, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aB" = ( +/obj/item/weapon/tool/screwdriver/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aC" = ( +/obj/item/weapon/tool/wirecutters/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aD" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aE" = ( +/obj/item/device/multitool/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aF" = ( +/obj/structure/prop/alien/computer/camera/flipped{ + icon_state = "camera_flipped"; + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aG" = ( +/obj/structure/prop/alien/computer/camera{ + icon_state = "camera"; + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aH" = ( +/obj/machinery/porta_turret/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aI" = ( +/obj/machinery/door/airlock/alien/locked{ + p_open = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aJ" = ( +/obj/effect/decal/remains/robot, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aK" = ( +/obj/item/weapon/tool/crowbar/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aL" = ( +/obj/item/stack/cable_coil/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aM" = ( +/obj/structure/table/alien, +/obj/item/prop/alien/junk, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aN" = ( +/obj/structure/table/alien, +/obj/item/weapon/paper/alien{ + icon_state = "alienpaper_words"; + info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" + }, +/obj/item/device/gps/internal/poi, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aO" = ( +/obj/structure/prop/alien/computer{ + icon_state = "console-c"; + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aP" = ( +/obj/structure/table/alien, +/obj/item/clothing/accessory/medal/dungeon/alien_ufo, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aQ" = ( +/obj/structure/table/alien, +/obj/item/weapon/weldingtool/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aR" = ( +/obj/structure/bed/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aS" = ( +/obj/structure/prop/alien/computer/camera, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aT" = ( +/obj/structure/closet/alien, +/obj/item/weapon/paper/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aU" = ( +/obj/structure/bed/alien, +/obj/effect/decal/remains/xeno, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aV" = ( +/obj/structure/loot_pile/surface/alien/end, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"aW" = ( +/obj/structure/table/alien, +/obj/item/weapon/surgical/circular_saw/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aX" = ( +/obj/structure/table/alien, +/obj/item/weapon/surgical/FixOVein/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aY" = ( +/obj/structure/table/alien, +/obj/item/weapon/surgical/scalpel/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"aZ" = ( +/obj/item/weapon/surgical/hemostat/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"ba" = ( +/obj/machinery/door/airlock/alien/locked, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"bb" = ( +/obj/effect/decal/remains/lizard, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"bc" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"bd" = ( +/obj/structure/table/alien, +/obj/item/weapon/surgical/bone_clamp/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"be" = ( +/obj/structure/loot_pile/surface/alien/medical, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bf" = ( +/obj/structure/closet/alien, +/obj/item/prop/alien/junk, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"bg" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bh" = ( +/obj/effect/decal/remains/mouse, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo) +"bi" = ( +/obj/structure/closet/alien, +/obj/item/prop/alien/junk, +/obj/item/prop/alien/junk, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bj" = ( +/obj/machinery/porta_turret/alien/destroyed{ + icon_state = "destroyed_target_prism"; + dir = 6 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bk" = ( +/obj/item/weapon/cell/device/weapon/empty, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bl" = ( +/obj/machinery/porta_turret/alien/destroyed{ + icon_state = "destroyed_target_prism"; + dir = 10 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bm" = ( +/obj/item/weapon/gun/energy/retro/empty, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bn" = ( +/obj/item/device/gps{ + gps_tag = "COMDOM1" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bo" = ( +/obj/item/weapon/reagent_containers/hypospray/autoinjector/used, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bp" = ( +/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/burn, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bq" = ( +/obj/effect/decal/remains/human{ + desc = "They look like human remains. Based on the equipment you saw nearby when you walked in, they were some kind of command person, and a poor one at that." + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"br" = ( +/obj/item/clothing/gloves/yellow, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bs" = ( +/obj/item/weapon/storage/belt/utility/full, +/obj/item/device/multitool, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bt" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bu" = ( +/obj/item/clothing/suit/storage/hooded/wintercoat/captain, +/obj/item/clothing/shoes/boots/winter/command, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo) +"bv" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) + +(1,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(3,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ac +ac +ac +ac +ac +ac +ac +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(4,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ac +ac +ac +ac +ad +ad +ae +ae +ad +ac +ac +ac +ac +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +"} +(5,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ac +ac +ac +af +ag +af +af +af +af +af +af +af +ag +af +ac +ac +ac +ab +ab +aa +aa +aa +aa +aa +aa +aa +"} +(6,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ab +ac +ac +af +af +af +ac +af +af +af +aL +af +af +af +ac +af +af +af +ac +ac +ab +ab +aa +aa +aa +aa +aa +aa +"} +(7,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ac +ac +af +af +ac +ac +ac +ac +ai +af +af +af +ai +ac +ac +ac +ac +af +af +ac +ac +ab +ab +aa +aa +aa +aa +aa +"} +(8,1,1) = {" +aa +aa +aa +aa +ab +ab +ac +ac +af +af +ac +ac +aj +ay +ac +ac +af +af +af +ac +ac +aX +av +ac +ac +af +af +ac +ac +ab +ab +aa +aa +aa +aa +"} +(9,1,1) = {" +aa +aa +aa +ab +ab +ac +ac +af +af +ac +ac +ai +af +af +an +ac +ac +af +ac +ac +aq +aq +aq +bc +ac +ac +af +af +ac +ac +ab +ab +aa +aa +aa +"} +(10,1,1) = {" +aa +aa +aa +ab +ac +ac +af +af +ac +ac +ap +af +af +aq +an +aD +as +ag +as +at +aq +aU +aq +bd +ac +ac +ac +af +af +ac +ac +ab +aa +aa +aa +"} +(11,1,1) = {" +aa +aa +ab +ab +ac +af +af +ac +ac +ap +af +af +aq +aq +aq +aE +as +af +as +ac +ac +as +ba +as +ac +ac +ac +ac +af +af +ac +ab +ab +bv +bv +"} +(12,1,1) = {" +aa +aa +ab +ac +ac +af +ac +ac +ai +af +af +aq +aq +aq +aB +ah +aI +af +ag +aq +aq +ac +aq +ai +as +be +bg +ac +ac +af +ac +ac +ab +bv +bv +"} +(13,1,1) = {" +aa +aa +ab +ac +af +af +ac +aj +af +af +aq +aq +aq +af +aC +aj +as +af +as +aR +aq +aq +aq +aq +ag +af +af +bi +ac +af +af +ac +ab +bv +bv +"} +(14,1,1) = {" +aa +ab +ab +ac +ag +ac +ac +ak +af +aq +aq +aq +af +af +ad +ac +ac +ac +ac +ac +aU +aq +aq +ac +as +af +af +be +ac +as +ag +as +ab +ab +bv +"} +(15,1,1) = {" +aa +ab +ac +ac +af +af +ac +ac +an +an +aq +af +af +ad +ac +ac +aq +ai +aO +ac +ac +aR +aq +aq +ac +af +be +ac +ac +af +af +ac +ac +ab +bv +"} +(16,1,1) = {" +aa +ab +ac +ad +af +af +ai +ac +ac +ar +af +af +aj +ac +ac +aF +aq +aq +aq +aq +ac +ac +aU +aq +ac +be +ac +ac +bj +af +bk +af +as +ab +bv +"} +(17,1,1) = {" +aa +ab +ac +ad +af +af +af +af +ac +as +as +ag +as +as +at +aq +aq +aM +aP +aq +ai +ac +as +ag +as +as +ac +af +bk +af +af +as +as +as +bv +"} +(18,1,1) = {" +aa +ab +ac +ae +ah +af +af +af +af +ag +af +af +af +az +af +af +aJ +aN +ah +aq +aV +ac +af +af +af +ag +af +af +af +bm +af +bt +af +bt +bv +"} +(19,1,1) = {" +aa +ab +ac +ad +af +af +af +al +ac +as +as +ag +as +as +at +aq +aq +ar +aQ +aq +ai +ac +as +ag +as +as +ac +af +af +bn +bq +as +as +as +bv +"} +(20,1,1) = {" +aa +ab +ac +ad +af +af +ai +ac +ac +ac +ai +af +aw +ac +ac +aG +aq +aq +aq +aq +ac +ac +aF +aq +aq +bf +ac +ac +bl +bo +br +bu +ac +ab +bv +"} +(21,1,1) = {" +aa +ab +ac +ac +af +af +ac +ac +ao +ac +aq +af +af +aw +ac +ac +aq +ai +ax +ac +ac +aY +aq +aq +aq +ac +ac +ac +ac +bp +bs +ac +ac +ab +bv +"} +(22,1,1) = {" +aa +ab +ab +ac +ag +ac +ac +am +af +ag +aq +aq +af +af +aw +ac +ac +ac +ac +ac +aW +aH +aq +aq +as +ac +aq +ac +ac +as +ag +as +ab +ab +bv +"} +(23,1,1) = {" +aa +aa +ab +ac +af +af +ac +ah +ah +ac +at +aq +aq +af +af +aw +as +af +as +aS +aq +aq +aq +aq +ba +aq +bh +aq +ac +af +af +ac +ab +bv +bv +"} +(24,1,1) = {" +aa +aa +ab +ac +ac +af +ac +ac +ae +ac +au +aq +aq +aq +af +af +ag +af +ag +aq +aq +aq +aq +aq +as +ac +aq +ac +ac +af +ac +ac +ab +bv +bv +"} +(25,1,1) = {" +aa +aa +ab +ab +ac +af +af +ac +ac +ac +au +av +ax +aq +aq +aH +as +af +as +aq +aq +as +ba +as +ac +ac +ac +ac +af +af +ac +ab +ab +bv +bv +"} +(26,1,1) = {" +aa +aa +aa +ab +ac +ac +af +af +ac +ac +ac +ac +ac +ag +ac +ac +as +ag +as +aT +ac +ac +aq +ac +ac +ac +ac +af +af +ac +ac +ab +aa +aa +aa +"} +(27,1,1) = {" +aa +aa +aa +ab +ab +ac +ac +af +af +ac +ac +ae +af +af +aD +ac +ac +af +ac +ac +ac +aZ +bb +aq +ac +ac +af +af +ac +ac +ab +ab +aa +aa +aa +"} +(28,1,1) = {" +aa +aa +aa +aa +ab +ab +ac +ac +af +af +ac +ac +ah +aA +ac +ac +af +af +ah +ac +ac +ac +aq +ac +ac +af +af +ac +ac +ab +ab +aa +aa +aa +aa +"} +(29,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ac +ac +af +af +ac +ac +ac +ac +ai +af +af +af +ai +ac +ac +ac +ac +af +af +ac +ac +ab +ab +aa +aa +aa +aa +aa +"} +(30,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ab +ac +ac +af +af +af +ac +af +af +af +af +af +af +af +ac +af +af +af +ac +ac +ab +ab +aa +aa +aa +aa +aa +aa +"} +(31,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ab +ab +ac +ac +ac +af +ag +af +af +aK +af +af +af +af +ag +af +ac +ac +ac +ab +ab +aa +aa +aa +aa +aa +aa +aa +"} +(32,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ac +ac +ac +ac +ae +ad +ad +ae +ad +ac +ac +ac +ac +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +"} +(33,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ac +ac +ac +ac +ac +ac +ac +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(34,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(35,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/maps/expedition_vr/beach/submaps/crashed_ufo_frigate.dmm b/maps/expedition_vr/beach/submaps/crashed_ufo_frigate.dmm new file mode 100644 index 0000000000..a2f60e1ef6 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/crashed_ufo_frigate.dmm @@ -0,0 +1,2132 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/template_noop) +"ab" = ( +/turf/simulated/shuttle/wall/alien, +/area/submap/cave/crashed_ufo_frigate) +"ac" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"ad" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"af" = ( +/mob/living/simple_mob/animal/space/alien/drone, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"ag" = ( +/obj/machinery/porta_turret/alien{ + faction = "xeno" + }, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"ah" = ( +/obj/structure/table/alien, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"ai" = ( +/obj/machinery/artifact, +/obj/effect/alien/weeds/node, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aj" = ( +/obj/random/outcrop, +/turf/simulated/floor/outdoors/ice, +/area/template_noop) +"ak" = ( +/obj/machinery/porta_turret/alien{ + faction = "xeno" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"al" = ( +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"am" = ( +/obj/structure/window/phoronreinforced, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"ao" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"ap" = ( +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"aq" = ( +/obj/structure/prop/alien/pod/open, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"ar" = ( +/obj/effect/alien/weeds/node, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"as" = ( +/obj/structure/prop/alien/pod/open, +/obj/random/tech_supply/component, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"at" = ( +/obj/machinery/door/airlock/alien/locked, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"au" = ( +/obj/machinery/door/airlock/alien/locked, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"av" = ( +/obj/structure/loot_pile/surface/alien/engineering, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"aw" = ( +/obj/structure/prop/alien/pod/open, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"ax" = ( +/turf/simulated/floor/outdoors/ice, +/area/template_noop) +"ay" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"az" = ( +/obj/item/prop/alien/junk, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aA" = ( +/obj/effect/alien/weeds/node, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aB" = ( +/obj/structure/loot_pile/surface/alien/medical, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aC" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"aD" = ( +/obj/structure/table/alien, +/obj/random/tech_supply/component, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"aE" = ( +/obj/structure/prop/alien/pod/open, +/obj/random/tech_supply/component, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"aF" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aG" = ( +/obj/machinery/vr_sleeper/alien/random_replicant, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aH" = ( +/obj/structure/prop/alien/pod, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aI" = ( +/obj/structure/loot_pile/surface/alien/engineering, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aJ" = ( +/obj/machinery/door/airlock/alien/locked, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aK" = ( +/obj/structure/table/alien, +/obj/random/tech_supply/component, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aL" = ( +/obj/structure/table/alien, +/obj/item/clothing/under/psysuit, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aM" = ( +/obj/structure/prop/alien/computer/camera, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aN" = ( +/obj/structure/prop/alien/computer/camera/flipped, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aO" = ( +/obj/structure/simple_door/resin, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aP" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aQ" = ( +/obj/effect/alien/weeds/node, +/mob/living/simple_mob/animal/space/alien/drone, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aR" = ( +/obj/effect/alien/weeds/node, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"aS" = ( +/obj/structure/table/alien, +/obj/random/tool/alien, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"aT" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"aU" = ( +/obj/machinery/replicator, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aV" = ( +/obj/structure/closet/alien, +/obj/random/unidentified_medicine/drug_den, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aW" = ( +/obj/effect/decal/remains/xeno, +/obj/item/clothing/under/psysuit, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aX" = ( +/obj/structure/prop/alien/computer/camera/flipped{ + icon_state = "camera_flipped"; + dir = 4 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aY" = ( +/obj/structure/prop/alien/computer/camera{ + icon_state = "camera"; + dir = 8 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"aZ" = ( +/obj/machinery/porta_turret/alien/destroyed, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"ba" = ( +/obj/structure/closet/alien, +/obj/random/unidentified_medicine/scientific, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bb" = ( +/obj/structure/closet/alien, +/obj/random/unidentified_medicine/nanites, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"bc" = ( +/obj/structure/closet/alien, +/obj/random/unidentified_medicine/fresh_medicine, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bd" = ( +/obj/structure/closet/alien, +/obj/random/unidentified_medicine/viral, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"be" = ( +/obj/machinery/door/blast/puzzle, +/obj/machinery/door/airlock/alien/locked, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bf" = ( +/obj/structure/table/alien, +/obj/item/weapon/paper/alien{ + icon_state = "alienpaper_words"; + info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bg" = ( +/obj/structure/prop/lock/projectile, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"bh" = ( +/obj/structure/closet/alien, +/obj/random/unidentified_medicine/old_medicine, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"bi" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bj" = ( +/obj/effect/decal/remains/xeno, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bk" = ( +/mob/living/simple_mob/animal/space/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bl" = ( +/obj/effect/decal/remains/xeno, +/obj/item/clothing/under/psysuit, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"bm" = ( +/obj/structure/table/alien, +/obj/item/weapon/paper/alien, +/obj/item/weapon/paper/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bn" = ( +/obj/structure/foamedmetal, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bo" = ( +/obj/machinery/porta_turret/alien{ + faction = "xeno" + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bp" = ( +/obj/structure/foamedmetal, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bq" = ( +/obj/machinery/implantchair, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"br" = ( +/obj/structure/prop/alien/computer{ + icon_state = "console-c"; + dir = 8 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bs" = ( +/obj/effect/alien/weeds/node, +/mob/living/simple_mob/animal/space/alien/sentinel/praetorian, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bt" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bu" = ( +/obj/structure/loot_pile/surface/drone, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bv" = ( +/obj/item/weapon/surgical/bone_clamp/alien, +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bw" = ( +/obj/structure/prop/alien/computer, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bx" = ( +/obj/effect/decal/remains/xeno, +/obj/item/clothing/accessory/medal/dungeon/alien_ufo{ + desc = "It vaguely like a star. It looks like something an alien admiral might've worn. Probably."; + name = "alien admiral's medal" + }, +/obj/item/weapon/telecube/precursor/mated/zone, +/obj/item/clothing/head/helmet/alien/tank, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"by" = ( +/obj/structure/loot_pile/mecha/gygax/dark, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bz" = ( +/obj/structure/mopbucket, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bA" = ( +/obj/item/brokenbug, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"bB" = ( +/mob/living/simple_mob/animal/space/alien/sentinel, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bC" = ( +/obj/structure/prop/alien/computer/camera/flipped{ + icon_state = "camera_flipped"; + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bD" = ( +/obj/structure/prop/alien/computer/camera{ + icon_state = "camera"; + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bE" = ( +/obj/structure/loot_pile/maint/boxfort, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bF" = ( +/obj/structure/prop/blackbox/xenofrigate, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bG" = ( +/obj/random/outcrop, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"bH" = ( +/obj/structure/loot_pile/maint/junk, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bI" = ( +/obj/structure/table/alien, +/obj/structure/loot_pile/surface/alien/medical, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bJ" = ( +/obj/structure/window/phoronreinforced{ + icon_state = "phoronrwindow"; + dir = 8 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bK" = ( +/obj/structure/table/alien, +/obj/item/prop/alien/junk, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bL" = ( +/obj/structure/table/alien, +/obj/item/weapon/paper/alien{ + icon_state = "alienpaper_words"; + info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" + }, +/obj/item/device/gps/internal/poi, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bM" = ( +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bN" = ( +/obj/structure/table/alien, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/item/weapon/paper/alien{ + icon_state = "alienpaper_words"; + info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bO" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bP" = ( +/obj/structure/table/alien, +/obj/item/weapon/weldingtool/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bQ" = ( +/obj/structure/table/alien, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/item/weapon/paper/alien{ + icon_state = "alienpaper_words"; + info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" + }, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bR" = ( +/obj/structure/table/alien, +/obj/structure/foamedmetal, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bS" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bT" = ( +/obj/structure/window/phoronreinforced{ + icon_state = "phoronrwindow"; + dir = 8 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/shuttle/floor/alienplating, +/area/submap/cave/crashed_ufo_frigate) +"bU" = ( +/obj/structure/window/phoronreinforced, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"bV" = ( +/obj/structure/table/alien, +/obj/structure/window/phoronreinforced, +/obj/item/weapon/paper/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bW" = ( +/obj/structure/table/alien, +/obj/structure/window/phoronreinforced{ + dir = 4 + }, +/obj/structure/window/phoronreinforced, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bX" = ( +/mob/living/simple_mob/animal/space/alien, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"bY" = ( +/obj/structure/foamedmetal, +/obj/machinery/door/airlock/alien/locked, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"bZ" = ( +/obj/structure/foamedmetal, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"ca" = ( +/obj/structure/table/alien, +/obj/item/weapon/paper/alien{ + icon_state = "alienpaper_words"; + info = "\[i]This tablet has a large collection of symbols that you've never seen before outside this ship. You have no hope of figuring out what any of the mean...\[/i]" + }, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"cb" = ( +/obj/structure/prop/alien/power, +/obj/structure/foamedmetal, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"cc" = ( +/obj/structure/loot_pile/surface/alien/end, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"cd" = ( +/obj/item/prop/alien/junk, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"ce" = ( +/obj/random/tech_supply/component, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"cf" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/outdoors/ice, +/area/submap/cave/crashed_ufo_frigate) +"cg" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alien, +/area/submap/cave/crashed_ufo_frigate) +"ch" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/submap/cave/crashed_ufo_frigate) + +(1,1,1) = {" +aa +aa +ad +aa +aa +aa +aa +aa +ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +ad +ad +ad +ax +ax +aa +aa +aa +ax +ax +ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +aa +bG +ax +aa +aa +ad +ax +bG +ad +ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ad +aa +aa +aa +ad +bG +ax +aa +aa +ad +ad +ad +aa +aa +aa +aa +"} +(3,1,1) = {" +aa +ax +ad +ax +aa +ad +ad +ax +ax +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +ad +ax +ax +aa +aa +ax +ad +ad +aa +aa +aa +"} +(4,1,1) = {" +ax +ax +ad +ad +ad +ad +ax +aa +aa +aa +aa +ab +ab +ab +ab +ab +aV +ac +ba +al +bh +al +al +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aj +ax +ad +bG +aa +aa +"} +(5,1,1) = {" +bG +ad +ad +ad +bG +ad +aa +aa +aa +ab +ab +ab +aM +aF +aF +aF +ac +ap +ap +ap +al +bn +bn +aF +aF +aF +bI +ab +ab +ab +aa +aa +aa +aa +ax +ad +ax +aa +aa +"} +(6,1,1) = {" +aa +ax +ad +ad +ad +aa +aa +ab +ab +ab +ak +ab +aN +ac +ac +al +ap +ap +ap +ab +ab +bo +bn +bn +ap +ap +aF +aF +bI +ab +ab +ab +aa +aa +bG +ad +ax +ax +aa +"} +(7,1,1) = {" +aa +ax +ax +ad +aa +aa +ab +ab +ac +ac +ac +ab +ab +ak +al +al +ap +ap +ac +ab +bi +bp +bn +ap +bB +ap +ap +ap +bR +aF +bI +ab +ab +aa +aa +ad +ad +ax +aa +"} +(8,1,1) = {" +aa +bG +ax +aa +aa +ab +ab +ao +ac +ac +ac +aF +ab +ac +al +ap +ap +ap +al +ab +aw +ac +br +bv +ac +al +ap +bn +bn +ac +aF +ab +ab +ab +aa +aa +bG +ad +aa +"} +(9,1,1) = {" +aa +aa +aa +aa +ab +ab +ao +ac +al +aF +aK +aF +ab +ch +ap +ap +ap +ac +bb +ab +ab +ab +ab +ab +aY +al +bp +bn +ap +ap +ap +ch +bZ +ab +ab +aa +aa +ad +aa +"} +(10,1,1) = {" +aa +aa +aa +ab +ab +ao +ac +al +al +ap +ap +ap +al +au +al +ap +ac +ac +al +ab +bi +bi +bi +ab +ab +al +al +ac +ap +ap +ap +bY +bZ +cb +ab +ab +aa +aa +aa +"} +(11,1,1) = {" +aa +aa +ab +ab +ao +ac +ay +al +ap +ap +ap +al +al +ch +ab +ac +ac +ac +bc +ab +ap +ap +bs +aF +ab +al +al +ac +bS +bS +ap +ch +bn +bZ +bZ +ab +ab +aa +aa +"} +(12,1,1) = {" +aa +aa +ab +ac +ac +ac +ap +ap +ap +ac +ac +al +ac +ao +ab +ab +ak +ac +ac +ab +aF +bq +ap +aF +ab +ab +ab +ab +ab +ab +bS +ab +ap +ap +ap +aP +ab +aa +aa +"} +(13,1,1) = {" +aa +ab +ab +al +ac +ap +ap +ap +ac +ac +ac +ac +ac +ac +aT +ab +ab +ab +bd +ab +ab +ch +at +ch +ab +ab +ac +ag +al +ab +ab +ab +ac +ap +ap +ac +ab +ab +aa +"} +(14,1,1) = {" +aa +ab +ag +al +al +ap +ap +ah +aF +aF +ac +ac +ac +ac +al +al +ab +ab +ab +ab +ap +ap +ap +ap +ap +ap +al +al +al +al +al +ab +ab +al +cd +ap +ac +ab +aa +"} +(15,1,1) = {" +aa +ab +ah +ah +ap +ap +al +aD +ab +ab +ab +aJ +ab +ab +ab +aT +ab +ab +ac +ap +ap +al +al +al +ap +ap +ap +ap +ap +aR +ap +bf +ab +ab +al +ap +ap +ab +aa +"} +(16,1,1) = {" +ab +ab +ab +ah +ap +ap +al +ab +ab +aG +ab +ac +ab +ac +ab +ab +ab +aX +ac +ap +aR +al +ag +ab +ab +ab +bJ +bJ +bT +ap +ap +bO +aF +ab +al +al +ap +ab +ab +"} +(17,1,1) = {" +ab +ac +ab +ab +ch +at +ch +ab +aG +ac +aJ +ac +aO +aQ +ac +ab +ac +ac +ap +ap +bj +al +ab +ab +bC +ap +ap +bO +ap +ap +ap +ap +ah +ab +ab +al +ap +ak +ab +"} +(18,1,1) = {" +ab +ac +ac +am +al +al +az +ab +ab +aG +ab +ak +ab +ac +ab +ab +ac +aF +al +ap +bk +aF +ab +bw +ap +ap +bK +aF +aR +ap +ap +ap +al +cc +ab +ch +cg +ch +ab +"} +(19,1,1) = {" +ab +ac +ai +am +al +ap +ac +az +ab +ab +ab +ab +ab +ab +ab +ak +aW +aF +al +ap +ac +aF +ab +bx +ap +aR +bL +ap +ap +bX +ap +ap +ag +ab +ab +ap +ap +aH +ab +"} +(20,1,1) = {" +ab +af +ac +am +al +ap +aA +ab +ab +aH +aw +aL +aL +aL +ab +ab +aA +ah +al +ap +ac +aF +ab +bw +ap +ap +bf +bP +ap +al +ap +ap +ar +cc +ab +ch +cg +ch +ab +"} +(21,1,1) = {" +ab +ac +ab +ab +ch +au +ch +ab +aH +al +ac +ac +ac +ac +aw +ab +ac +al +ap +ap +ac +ac +ab +ab +bD +ap +ap +bO +al +al +ap +ap +ca +ab +ab +ce +ap +ak +ab +"} +(22,1,1) = {" +ab +ab +ab +ac +ap +ap +aA +ab +ab +al +ac +aL +aL +aL +ab +ab +ab +aY +ap +ap +ap +ac +ak +ab +ab +ab +bM +bM +bU +al +ap +bO +aF +ab +ac +ap +al +ab +ab +"} +(23,1,1) = {" +aa +ab +ac +ac +ap +ap +aB +ab +ab +aJ +ch +ab +ab +ab +ab +aU +ab +ab +ap +ap +ar +ap +ap +ap +ap +ap +ap +ap +ap +aR +ap +bf +ab +ab +ap +ap +al +ab +aa +"} +(24,1,1) = {" +aa +ab +ak +ac +aq +ap +ap +aw +ab +ac +ab +ab +ab +ab +aM +ac +ac +ab +ap +ap +bl +al +ap +ap +ap +ap +ap +ap +ap +ac +ac +ab +ab +ac +ap +al +al +ab +aa +"} +(25,1,1) = {" +aa +ab +ab +ac +ar +av +ap +ap +aI +ac +ac +ab +ab +ab +aF +aF +ac +ch +be +ch +ab +ab +ab +ab +ab +ab +ac +ak +ac +ab +ab +ab +ac +ap +ap +cf +ab +ab +aa +"} +(26,1,1) = {" +aa +aa +ab +ao +ac +al +aC +ap +ap +ac +aA +ac +ab +ak +ac +ac +ap +aR +ap +aF +bm +bf +bt +by +bE +ab +ab +ab +ab +ab +ac +ab +ap +ap +ap +aP +ab +aa +aa +"} +(27,1,1) = {" +aa +aa +ab +ab +as +ac +ac +aE +ap +ap +ap +ap +ch +ap +ap +ap +ap +ap +ac +ac +ac +ac +aA +ac +bF +ab +ac +ac +ac +ac +ap +ch +ap +ap +ac +ab +ab +aa +aa +"} +(28,1,1) = {" +aa +aa +aa +ab +ab +aw +ac +ac +aq +ap +ap +ap +at +aR +ap +ap +ap +ac +ac +bf +aF +bm +bu +bz +bH +ab +ak +ac +bV +ap +ap +at +ap +aP +ab +ab +aa +aa +bG +"} +(29,1,1) = {" +aa +aj +aa +aa +ab +ab +aw +ac +aA +ac +ac +ab +ch +ab +ab +at +ab +ab +aI +ab +ab +ab +ab +ab +ab +ab +bN +bQ +bW +ap +ap +ch +ac +ab +ab +aa +aa +ad +ad +"} +(30,1,1) = {" +aa +ax +ad +aa +aa +ab +ab +aB +ac +ac +ab +ab +aF +aS +ah +ac +av +ab +ab +ab +ac +ac +al +al +al +al +ap +ap +ap +ac +ac +ab +ab +ab +aa +aa +aa +ad +aa +"} +(31,1,1) = {" +aa +ad +ax +ad +aa +aa +ab +ab +ak +ab +ab +aI +al +al +al +ac +ab +ab +al +bg +ac +ap +ap +al +al +ap +ap +ap +ac +ak +ac +ab +ab +aa +aa +aa +ad +ax +aa +"} +(32,1,1) = {" +aa +aa +ad +bG +aa +aa +aa +ab +ab +ab +aI +ac +ac +ac +ac +ab +ab +aZ +al +ac +ap +ap +ap +ap +ap +ap +al +al +al +ab +ab +ab +aa +aa +aa +bG +ad +ax +aa +"} +(33,1,1) = {" +aa +aa +ad +ad +ad +aa +aa +aa +aa +ab +ab +ab +aP +aP +aP +ab +ac +ac +ac +ap +ap +ap +al +ac +ac +al +al +ab +ab +ab +aa +aa +aa +aa +ax +ad +ad +bG +aa +"} +(34,1,1) = {" +aa +ad +ax +ad +ad +ad +ax +ax +aj +aa +aa +ab +ab +ab +ab +ab +ac +ac +ap +ap +ap +al +al +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +ad +ax +ad +ad +aa +aa +"} +(35,1,1) = {" +aa +ax +ax +aa +ad +ad +ad +ad +ax +ax +aa +aa +aa +ad +ad +ab +ab +ab +ch +at +ch +ab +ab +ab +ad +ad +aa +aa +aa +aa +aa +aa +ad +ad +ad +ad +ad +aa +aa +"} +(36,1,1) = {" +aa +aj +aa +aa +ax +ad +ad +aa +aa +aa +aa +aa +aa +ax +ad +ad +ad +ad +aZ +ac +aZ +ad +ad +ad +ax +aa +aa +aa +aa +aa +aa +ad +ad +ad +ad +ax +ax +aa +aa +"} +(37,1,1) = {" +aa +aa +aa +aa +ax +ax +ad +aa +aa +aa +aa +aa +aa +aa +aa +ax +ax +ad +ad +ad +ad +ad +ad +ad +aa +aa +aa +aa +aa +aa +ad +bG +ad +ad +ad +ax +bG +aa +aa +"} +(38,1,1) = {" +aa +aa +aa +aa +ad +aj +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ad +ad +bA +ad +ax +ax +aa +aa +aa +aa +aa +aa +aa +ad +ad +ad +aa +ad +ad +aa +aa +aa +"} +(39,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm b/maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm new file mode 100644 index 0000000000..ddc3096293 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm @@ -0,0 +1,1139 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/submap/crashedcontainmentshuttle) +"ab" = ( +/obj/structure/grille, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"ac" = ( +/obj/random/landmine, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"ad" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"ae" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"af" = ( +/turf/simulated/shuttle/wall/dark/hard_corner, +/area/submap/crashedcontainmentshuttle) +"ag" = ( +/turf/simulated/shuttle/wall/dark, +/area/submap/crashedcontainmentshuttle) +"ah" = ( +/obj/structure/lattice, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"ai" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/crashedcontainmentshuttle) +"aj" = ( +/obj/item/weapon/material/shard, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"ak" = ( +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"al" = ( +/obj/item/stack/rods, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"am" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"an" = ( +/obj/item/stack/rods, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"ao" = ( +/obj/structure/door_assembly/door_assembly_ext, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"ap" = ( +/obj/structure/door_assembly/door_assembly_ext{ + anchored = 1 + }, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"aq" = ( +/obj/structure/grille, +/obj/item/weapon/material/shard, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"ar" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"as" = ( +/obj/structure/grille{ + density = 0; + icon_state = "brokengrille" + }, +/obj/structure/lattice, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"at" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"au" = ( +/obj/item/weapon/circuitboard/broken, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"av" = ( +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"aw" = ( +/obj/structure/closet/crate{ + name = "landmines crate"; + opened = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"ax" = ( +/obj/random/landmine, +/obj/random/landmine, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"ay" = ( +/obj/effect/decal/mecha_wreckage/gygax{ + anchored = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"az" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aA" = ( +/obj/item/clothing/suit/space/cult, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"aB" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+006 + }, +/turf/template_noop, +/area/submap/crashedcontainmentshuttle) +"aC" = ( +/obj/effect/decal/remains/robot, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"aD" = ( +/obj/random/landmine, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aE" = ( +/obj/effect/gibspawner/generic, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aF" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aG" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aH" = ( +/obj/random/landmine, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"aI" = ( +/obj/effect/decal/remains/human, +/obj/effect/gibspawner/human, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"aJ" = ( +/obj/item/clothing/head/helmet/space/cult, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"aK" = ( +/obj/item/weapon/material/knife/ritual, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"aL" = ( +/obj/structure/closet/medical_wall, +/turf/simulated/shuttle/wall/dark, +/area/submap/crashedcontainmentshuttle) +"aM" = ( +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"aN" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"aO" = ( +/obj/structure/door_assembly/door_assembly_highsecurity{ + anchored = 1 + }, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aP" = ( +/obj/structure/closet/walllocker/emerglocker/east, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aQ" = ( +/obj/effect/decal/remains/human, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"aR" = ( +/obj/structure/grille, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"aS" = ( +/obj/item/weapon/circuitboard/broken, +/obj/effect/decal/remains/human, +/obj/item/weapon/gun/energy/laser, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aT" = ( +/obj/item/device/gps/internal/poi, +/turf/simulated/shuttle/floor/red, +/area/submap/crashedcontainmentshuttle) +"aU" = ( +/turf/simulated/shuttle/floor/red, +/area/submap/crashedcontainmentshuttle) +"aV" = ( +/obj/random/landmine, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"aW" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"aX" = ( +/obj/structure/frame/computer, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"aY" = ( +/obj/structure/frame, +/obj/item/weapon/circuitboard/broken, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"aZ" = ( +/obj/effect/decal/cleanable/vomit, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"ba" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/shuttle/floor/red, +/area/submap/crashedcontainmentshuttle) +"bb" = ( +/obj/item/weapon/material/knife/ritual, +/obj/effect/decal/cleanable/blood, +/turf/simulated/shuttle/floor/red, +/area/submap/crashedcontainmentshuttle) +"bc" = ( +/obj/item/weapon/circuitboard/broken, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"bd" = ( +/obj/item/weapon/circuitboard/broken, +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"be" = ( +/turf/simulated/shuttle/wall/dark/no_join, +/area/submap/crashedcontainmentshuttle) +"bf" = ( +/obj/effect/decal/remains/robot, +/turf/simulated/shuttle/floor/red, +/area/submap/crashedcontainmentshuttle) +"bg" = ( +/obj/effect/decal/cleanable/blood, +/obj/random/landmine, +/turf/simulated/shuttle/floor/red, +/area/submap/crashedcontainmentshuttle) +"bh" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/head/helmet/space/cult, +/obj/effect/decal/cleanable/blood, +/turf/simulated/shuttle/floor/red, +/area/submap/crashedcontainmentshuttle) +"bi" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"bj" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"bk" = ( +/obj/machinery/computer, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"bl" = ( +/obj/structure/grille{ + density = 0; + icon_state = "brokengrille" + }, +/obj/item/stack/rods, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"bm" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/obj/effect/decal/remains/human, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"bn" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"bo" = ( +/obj/structure/extinguisher_cabinet, +/turf/simulated/shuttle/wall/dark, +/area/submap/crashedcontainmentshuttle) +"bp" = ( +/obj/item/stack/rods, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"bq" = ( +/obj/structure/door_assembly, +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"br" = ( +/obj/structure/table/steel_reinforced, +/turf/simulated/shuttle/floor/yellow, +/area/submap/crashedcontainmentshuttle) +"bs" = ( +/obj/item/weapon/material/shard, +/turf/template_noop, +/area/submap/crashedcontainmentshuttle) +"bt" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"bu" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"bv" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"bw" = ( +/obj/structure/closet/walllocker/emerglocker/north, +/obj/structure/frame, +/obj/item/weapon/circuitboard/broken, +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"bx" = ( +/obj/structure/ghost_pod/manual/lost_drone/dogborg, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"by" = ( +/obj/structure/frame, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) +"bz" = ( +/obj/item/frame/mirror, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/shuttle/wall/dark, +/area/submap/crashedcontainmentshuttle) +"bA" = ( +/obj/structure/sink{ + icon_state = "sink"; + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip, +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"bB" = ( +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"bC" = ( +/obj/effect/decal/cleanable/vomit, +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"bD" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/effect/gibspawner/generic, +/obj/effect/decal/remains/human, +/obj/item/weapon/card/id/syndicate{ + age = "\\42"; + blood_type = "\\O+"; + desc = "A strange ID card."; + dna_hash = "\[REDACTED]"; + fingerprint_hash = "\\------"; + name = "Aaron Presley's ID Card(Delivery Service) "; + registered_name = "Aaron Presley"; + sex = "\\Male" + }, +/turf/simulated/shuttle/floor/white, +/area/submap/crashedcontainmentshuttle) +"bE" = ( +/obj/structure/shuttle/engine/heater{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+006 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"bF" = ( +/obj/structure/door_assembly/door_assembly_ext{ + anchored = 1 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"bG" = ( +/obj/structure/grille{ + density = 0; + icon_state = "brokengrille" + }, +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/obj/item/stack/rods, +/turf/simulated/floor/plating, +/area/submap/crashedcontainmentshuttle) +"bH" = ( +/obj/effect/gibspawner/generic, +/turf/template_noop, +/area/submap/crashedcontainmentshuttle) +"bI" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/turf/template_noop, +/area/submap/crashedcontainmentshuttle) +"bJ" = ( +/obj/effect/decal/cleanable/blood/drip, +/turf/template_noop, +/area/submap/crashedcontainmentshuttle) +"bK" = ( +/obj/structure/shuttle/engine/propulsion{ + icon_state = "burst_r" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"bL" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/random/landmine, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"bM" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"bN" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/remains/human, +/obj/item/weapon/flame/lighter/random, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/crashedcontainmentshuttle) +"bO" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/turf/simulated/shuttle/floor/black, +/area/submap/crashedcontainmentshuttle) + +(1,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +ag +ai +aa +ai +ai +ai +ak +ai +ai +aa +ag +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +aa +aa +aa +aa +am +at +aA +aa +aa +ak +ai +be +ai +ai +aa +ag +ai +aa +aa +au +bK +aa +aa +aa +"} +(3,1,1) = {" +aa +aa +aa +af +ag +aa +au +aa +aI +aa +at +ak +at +aa +ak +aa +aa +aa +au +aa +aa +aa +aa +ak +aa +"} +(4,1,1) = {" +aa +aa +aa +ag +aa +aa +aa +aB +aJ +aa +aB +aa +aB +aa +aa +aa +aa +ai +bE +aa +aa +bH +aa +ak +ak +"} +(5,1,1) = {" +aa +aa +aa +aa +aa +an +ak +ag +aK +ah +ag +ag +ag +aa +bp +aa +bs +ag +aa +ai +aa +aa +aa +aa +aa +"} +(6,1,1) = {" +aa +aa +aa +aa +ak +ao +av +aa +ah +ak +ak +aY +az +aa +ah +av +ah +bx +ag +ai +ag +ar +aa +aa +aa +"} +(7,1,1) = {" +aa +aa +aa +aa +aa +ap +aa +ak +ah +an +ak +ak +ak +bn +aD +ak +ak +ak +bF +aa +aa +aa +ak +aa +aa +"} +(8,1,1) = {" +aa +aa +ab +aa +aa +aq +ak +ak +ah +ak +ak +aZ +aF +aE +ak +ak +az +ak +ah +av +aa +aa +bc +ag +ai +"} +(9,1,1) = {" +aa +aa +aa +aa +aa +ag +ak +aC +ak +ak +aS +ak +ak +ak +ak +ai +ai +ak +av +aa +ak +aa +aa +ai +ai +"} +(10,1,1) = {" +aa +aa +aa +aa +aa +ag +ac +ah +ak +ak +ak +aF +aF +ak +ai +ai +ai +ak +bG +aa +aa +aa +aa +bO +aa +"} +(11,1,1) = {" +aa +aa +aa +aa +ac +ar +au +aD +ak +ag +ag +ag +ad +ad +ai +ai +aF +ak +ad +ah +aa +bL +bI +bI +aa +"} +(12,1,1) = {" +aa +aa +ac +aa +ah +as +aw +ax +aD +ag +aT +ba +bf +ag +ak +ak +ak +by +ad +ah +bI +bI +bM +bI +aa +"} +(13,1,1) = {" +aa +aa +ad +ah +ai +ag +ax +aD +ak +aO +aU +aU +bg +ag +ak +ag +aL +bz +ad +ai +aa +bJ +bN +bI +bI +"} +(14,1,1) = {" +aa +aa +aa +aa +ai +ag +ay +aE +ak +ag +aU +bb +bh +ag +ak +ad +bt +bA +ag +ai +bJ +aa +bI +aa +aa +"} +(15,1,1) = {" +aa +aa +aa +ai +ai +ad +ak +aF +an +ad +ag +ag +ad +bo +ak +ag +bu +bB +ag +ai +aa +bI +bI +ac +aa +"} +(16,1,1) = {" +aa +aa +aa +ai +ak +ad +ak +ak +ak +ak +ak +bc +ak +ak +ak +bq +bv +bC +aq +ah +aa +bH +aa +aa +aa +"} +(17,1,1) = {" +aa +aa +aa +aa +ai +ag +az +aG +aG +aP +ak +ak +aF +ak +ak +ag +bw +bD +ad +ai +aa +aa +aa +aa +aa +"} +(18,1,1) = {" +aa +aa +aa +aj +aa +af +ag +ag +aL +ag +ak +aO +bi +aR +ag +ag +ag +ad +af +ai +aa +aa +aa +aa +aa +"} +(19,1,1) = {" +aa +aa +aa +aa +aa +aa +af +ad +aM +aQ +aV +aV +aM +aM +aM +aN +ag +af +ai +aa +aa +aa +aa +aa +aa +"} +(20,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aH +aN +aM +aW +bd +bj +aW +aM +br +ag +ai +ai +aa +aa +aa +aa +aa +aa +"} +(21,1,1) = {" +aa +aa +ae +aa +al +aa +aa +aa +ad +aM +aX +aX +bk +aX +aM +ag +af +ai +aa +aa +aa +aa +aa +aa +aa +"} +(22,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aR +aq +av +bl +av +aR +ag +ai +aa +bH +aa +aa +aa +aa +aa +aa +"} +(23,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(24,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +al +aa +aa +aa +bm +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(25,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/maps/expedition_vr/beach/submaps/crystal1.dmm b/maps/expedition_vr/beach/submaps/crystal1.dmm new file mode 100644 index 0000000000..6ccbd2e56e --- /dev/null +++ b/maps/expedition_vr/beach/submaps/crystal1.dmm @@ -0,0 +1,96 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/cave/crystal1) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal1) +"c" = ( +/obj/machinery/crystal, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal1) +"d" = ( +/obj/item/weapon/ore/diamond, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +c +c +a +a +c +b +a +"} +(3,1,1) = {" +a +c +d +c +c +b +b +a +"} +(4,1,1) = {" +b +b +b +b +b +b +b +b +"} +(5,1,1) = {" +b +b +b +b +b +b +b +b +"} +(6,1,1) = {" +a +c +d +b +b +b +b +b +"} +(7,1,1) = {" +a +a +c +d +b +b +c +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/crystal2.dmm b/maps/expedition_vr/beach/submaps/crystal2.dmm new file mode 100644 index 0000000000..d5ef5a4a00 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/crystal2.dmm @@ -0,0 +1,271 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/cave/crystal2) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal2) +"c" = ( +/obj/machinery/crystal, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal2) +"d" = ( +/obj/item/weapon/ore/diamond, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal2) + +(1,1,1) = {" +a +a +a +a +a +a +b +b +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +b +b +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +c +b +b +b +a +a +c +c +a +a +"} +(4,1,1) = {" +a +a +a +a +a +b +b +b +b +b +b +b +c +a +a +"} +(5,1,1) = {" +a +a +a +a +c +b +b +b +b +b +b +b +a +a +a +"} +(6,1,1) = {" +a +a +c +b +b +b +d +b +c +c +b +b +b +b +b +"} +(7,1,1) = {" +a +a +b +b +b +b +b +c +a +a +c +b +b +b +b +"} +(8,1,1) = {" +b +b +b +b +b +b +a +a +a +a +a +b +b +d +b +"} +(9,1,1) = {" +b +b +b +b +b +b +c +a +a +c +c +b +b +b +b +"} +(10,1,1) = {" +b +b +b +b +d +b +b +c +c +b +b +b +a +a +a +"} +(11,1,1) = {" +a +a +c +b +b +b +b +b +b +b +b +b +a +a +a +"} +(12,1,1) = {" +a +a +a +c +b +b +b +b +b +b +b +c +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +c +b +b +d +b +c +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +c +b +b +b +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +a +b +b +b +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/crystal3.dmm b/maps/expedition_vr/beach/submaps/crystal3.dmm new file mode 100644 index 0000000000..b8fad2723c --- /dev/null +++ b/maps/expedition_vr/beach/submaps/crystal3.dmm @@ -0,0 +1,399 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/cave/crystal3) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal3) +"c" = ( +/turf/template_noop, +/area/template_noop) +"d" = ( +/obj/machinery/crystal, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal3) +"e" = ( +/obj/item/weapon/ore/diamond, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/crystal3) + +(1,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +c +c +"} +(2,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +c +c +"} +(3,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +c +c +"} +(4,1,1) = {" +a +a +b +b +d +a +a +a +a +a +a +a +a +d +b +b +a +a +"} +(5,1,1) = {" +a +a +b +b +a +a +a +a +a +a +a +a +a +a +d +b +b +a +"} +(6,1,1) = {" +a +b +b +b +a +a +a +a +d +d +d +a +a +a +a +b +b +a +"} +(7,1,1) = {" +a +b +b +a +a +a +a +d +b +b +b +d +a +a +a +b +b +a +"} +(8,1,1) = {" +b +b +b +a +a +a +d +e +b +d +b +e +d +a +a +b +b +a +"} +(9,1,1) = {" +b +b +b +a +a +a +d +b +d +e +d +b +d +a +a +b +b +b +"} +(10,1,1) = {" +b +b +b +a +a +a +d +b +e +e +d +b +d +a +a +b +b +b +"} +(11,1,1) = {" +a +b +b +a +a +a +a +d +d +d +b +b +d +a +a +b +b +b +"} +(12,1,1) = {" +a +b +b +d +a +a +a +a +b +b +b +b +b +a +a +b +b +b +"} +(13,1,1) = {" +a +b +b +b +a +a +b +d +b +b +b +d +a +a +a +b +b +a +"} +(14,1,1) = {" +a +a +b +b +a +a +b +b +b +d +b +b +a +a +d +b +b +a +"} +(15,1,1) = {" +a +a +b +b +b +b +d +b +b +b +b +b +d +a +b +b +a +a +"} +(16,1,1) = {" +c +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +a +c +"} +(17,1,1) = {" +c +c +a +b +b +b +b +b +b +b +b +b +b +b +b +b +a +c +"} +(18,1,1) = {" +c +c +a +a +a +a +a +a +a +d +b +b +b +b +a +a +a +c +"} +(19,1,1) = {" +c +c +c +c +c +c +c +c +a +a +b +b +b +a +a +a +a +c +"} diff --git a/maps/expedition_vr/beach/submaps/deadBeacon.dmm b/maps/expedition_vr/beach/submaps/deadBeacon.dmm new file mode 100644 index 0000000000..0b01461d31 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/deadBeacon.dmm @@ -0,0 +1,656 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/deadBeacon) +"c" = ( +/obj/structure/loot_pile/maint/junk, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/deadBeacon) +"d" = ( +/turf/simulated/wall/r_wall, +/area/submap/cave/deadBeacon) +"e" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"f" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"g" = ( +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"h" = ( +/turf/simulated/floor/plating{ + icon_state = "asteroidplating2" + }, +/area/submap/cave/deadBeacon) +"i" = ( +/obj/structure/grille/broken, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"j" = ( +/obj/structure/table/steel, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"k" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"l" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"m" = ( +/obj/structure/table/steel, +/obj/item/weapon/circuitboard/comm_server, +/obj/machinery/light{ + dir = 8; + status = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"n" = ( +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"o" = ( +/obj/item/weapon/paper/crumpled{ + info = "Sampatti Relay Sif-833
Decryption Key for 12-04-2488:
849B0022FBA920C244
Eyes Only.
The insider who knows all the secrets can bring down Lanka."; + name = "Dusty Note" + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"p" = ( +/obj/structure/door_assembly/door_assembly_ext, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"q" = ( +/obj/item/stack/rods, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"r" = ( +/obj/machinery/telecomms/relay{ + active_power_usage = 1; + broadcasting = 0; + panel_open = 1 + }, +/obj/structure/cable{ + icon_state = "0-2"; + pixel_y = 1; + d2 = 2 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"s" = ( +/obj/machinery/telecomms/broadcaster{ + light_power = 0; + on = 0 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"t" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"u" = ( +/obj/machinery/telecomms/receiver{ + light_power = 0; + on = 0 + }, +/obj/structure/cable, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"v" = ( +/obj/item/weapon/circuitboard/broken, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"w" = ( +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"x" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"y" = ( +/obj/effect/decal/remains/robot, +/obj/effect/decal/cleanable/blood/oil, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"z" = ( +/obj/item/stack/cable_coil{ + amount = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"A" = ( +/obj/item/weapon/circuitboard/broken, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/deadBeacon) +"B" = ( +/obj/structure/grille/broken, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"C" = ( +/obj/structure/loot_pile/maint/junk, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"D" = ( +/obj/item/trash/cigbutt, +/obj/item/weapon/tool/wrench, +/obj/machinery/light, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"E" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"F" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"G" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"H" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/deadBeacon) +"I" = ( +/obj/machinery/access_button/airlock_interior{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/submap/cave/deadBeacon) +"J" = ( +/obj/structure/grille/broken, +/obj/item/stack/rods, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"K" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/submap/cave/deadBeacon) +"L" = ( +/obj/structure/sign/warning/secure_area, +/turf/simulated/wall/r_wall, +/area/submap/cave/deadBeacon) +"M" = ( +/obj/structure/sign/warning/high_voltage, +/turf/simulated/wall/r_wall, +/area/submap/cave/deadBeacon) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +b +b +b +A +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +h +n +n +h +b +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +b +d +h +d +p +g +d +B +d +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +b +e +j +m +q +n +g +C +i +b +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +f +k +n +n +n +y +D +d +d +L +b +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +b +g +g +o +r +u +n +n +H +g +H +b +a +a +a +a +a +a +"} +(11,1,1) = {" +a +b +b +g +g +g +s +v +n +n +H +n +H +b +a +a +a +a +a +a +"} +(12,1,1) = {" +a +b +c +h +l +g +g +w +z +E +I +K +M +A +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +b +i +h +g +q +n +k +F +J +b +a +a +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +d +i +g +t +x +x +G +d +b +a +a +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +b +b +b +a +b +b +b +a +a +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/deadly_rabbit_vr.dmm b/maps/expedition_vr/beach/submaps/deadly_rabbit_vr.dmm new file mode 100644 index 0000000000..e039d91233 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/deadly_rabbit_vr.dmm @@ -0,0 +1,581 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/loot_pile/surface/bones, +/obj/effect/decal/cleanable/blood, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"e" = ( +/mob/living/simple_mob/vore/rabbit/killer, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"g" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"h" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/template_noop) +"m" = ( +/obj/item/weapon/bone/skull, +/obj/effect/decal/cleanable/blood, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"n" = ( +/obj/item/clothing/suit/storage/hooded/knight/galahad, +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/shoes/knight, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"q" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/bone, +/obj/item/weapon/bone/skull, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"r" = ( +/obj/item/weapon/bone, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"s" = ( +/obj/item/weapon/bone/ribs, +/obj/effect/decal/cleanable/blood, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"t" = ( +/obj/effect/gibspawner/human, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"u" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/bone/skull, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"v" = ( +/obj/item/weapon/grenade/explosive/frag, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"y" = ( +/obj/item/weapon/bone, +/obj/item/weapon/bone/ribs, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"A" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/bone, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"C" = ( +/obj/item/clothing/suit/storage/hooded/knight/lancelot, +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/shoes/knight, +/obj/item/clothing/shoes/knight/black, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"E" = ( +/obj/item/clothing/suit/armor/combat/crusader/bedevere, +/obj/item/clothing/head/helmet/combat/bedevere, +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/shoes/knight/black, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"F" = ( +/obj/item/weapon/bone, +/obj/item/weapon/bone/skull, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"I" = ( +/obj/item/clothing/suit/storage/hooded/knight/robin, +/obj/effect/decal/cleanable/blood/splatter, +/obj/item/clothing/shoes/knight, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"J" = ( +/obj/effect/decal/cleanable/blood, +/obj/item/weapon/bone/ribs, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"K" = ( +/obj/item/clothing/suit/armor/combat/crusader, +/obj/item/clothing/head/helmet/combat/crusader, +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/shoes/knight, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"L" = ( +/obj/structure/barricade/cutout/fukken_xeno, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"P" = ( +/obj/item/weapon/bone/skull, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"Q" = ( +/obj/item/weapon/bone, +/obj/structure/loot_pile/surface/bones, +/obj/effect/decal/cleanable/blood, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"T" = ( +/obj/structure/barricade, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"U" = ( +/obj/item/weapon/bone/ribs, +/obj/item/clothing/suit/storage/hooded/knight, +/obj/item/weapon/bone/skull, +/obj/effect/decal/cleanable/blood, +/obj/item/clothing/shoes/knight/black, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"V" = ( +/obj/item/weapon/bone, +/obj/effect/decal/cleanable/blood, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"Y" = ( +/obj/effect/decal/cleanable/blood, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +h +h +h +h +h +h +h +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +h +h +h +h +h +h +h +h +h +h +h +h +h +h +g +a +a +a +a +a +"} +(4,1,1) = {" +h +h +h +h +h +h +h +h +h +h +h +h +h +h +b +g +a +a +a +a +"} +(5,1,1) = {" +h +h +h +h +g +g +m +g +g +g +g +h +h +h +h +h +h +m +g +g +"} +(6,1,1) = {" +h +h +h +g +g +s +I +t +g +n +m +h +h +h +h +h +h +q +u +g +"} +(7,1,1) = {" +h +h +h +g +g +g +V +g +g +t +g +g +g +g +g +g +T +T +A +g +"} +(8,1,1) = {" +h +h +h +g +g +g +g +g +U +g +g +g +g +g +g +g +T +h +F +g +"} +(9,1,1) = {" +h +h +h +g +g +g +g +g +g +g +g +b +h +h +v +g +h +h +h +Q +"} +(10,1,1) = {" +h +h +h +g +g +h +h +g +g +g +h +h +h +h +h +h +h +h +h +h +"} +(11,1,1) = {" +h +h +h +e +g +h +h +g +g +V +h +h +h +h +h +h +h +h +h +h +"} +(12,1,1) = {" +h +h +h +g +g +g +g +g +g +g +g +g +h +h +v +T +h +h +h +r +"} +(13,1,1) = {" +h +h +h +t +g +g +m +g +g +g +g +g +g +g +g +T +Y +h +P +g +"} +(14,1,1) = {" +h +h +h +m +E +t +K +g +g +g +g +g +g +g +V +T +T +J +r +r +"} +(15,1,1) = {" +h +h +h +g +g +g +g +g +C +g +g +h +h +h +h +h +h +b +y +P +"} +(16,1,1) = {" +h +h +h +h +g +b +g +t +m +g +g +h +h +h +h +h +h +m +r +r +"} +(17,1,1) = {" +h +h +h +h +h +h +h +h +h +h +h +h +h +h +L +g +a +a +a +a +"} +(18,1,1) = {" +h +h +h +h +h +h +h +h +h +h +h +h +h +h +g +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +h +h +h +h +h +h +h +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/deadspy.dmm b/maps/expedition_vr/beach/submaps/deadspy.dmm new file mode 100644 index 0000000000..e362c401e6 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/deadspy.dmm @@ -0,0 +1,181 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/decal/remains/xeno, +/obj/item/clothing/mask/gas, +/obj/item/clothing/suit/fire/firefighter, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"c" = ( +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel, +/obj/effect/decal/cleanable/molten_item, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"d" = ( +/obj/item/weapon/flamethrower, +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"e" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"f" = ( +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"g" = ( +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel, +/obj/effect/decal/cleanable/ash, +/obj/random/landmine, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"h" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/random/landmine, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"i" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/molten_item, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"j" = ( +/obj/item/weapon/material/butterfly, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"k" = ( +/obj/effect/decal/remains/human, +/obj/item/weapon/tool/wrench, +/obj/item/clothing/head/hardhat, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"l" = ( +/obj/item/weapon/flame/lighter/zippo, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"m" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/mask/balaclava, +/obj/item/clothing/under/suit_jacket/really_black, +/obj/effect/decal/cleanable/ash, +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/ash, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"n" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/ash, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"o" = ( +/obj/machinery/porta_turret/poi{ + desc = "Looking at this heavy caliber, tripod-mounted, little ol' number makes you want to square-dance."; + lethal = 0; + name = "sentry turret" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"p" = ( +/obj/item/weapon/deadringer, +/obj/effect/decal/cleanable/liquid_fuel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"q" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/effect/decal/cleanable/liquid_fuel, +/obj/random/landmine, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"r" = ( +/obj/effect/decal/cleanable/liquid_fuel, +/obj/item/weapon/storage/fancy/cigarettes/professionals, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"s" = ( +/obj/item/weapon/card/emag_broken, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"t" = ( +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel, +/obj/random/landmine, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"u" = ( +/obj/effect/decal/cleanable/liquid_fuel/flamethrower_fuel, +/obj/effect/decal/cleanable/ash, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/deadspy) +"v" = ( +/turf/simulated/mineral/cave, +/area/submap/deadspy) + +(1,1,1) = {" +a +b +b +b +v +v +v +"} +(2,1,1) = {" +b +c +f +f +f +t +v +"} +(3,1,1) = {" +b +d +h +l +p +f +b +"} +(4,1,1) = {" +b +e +i +m +q +u +b +"} +(5,1,1) = {" +b +f +j +n +r +f +b +"} +(6,1,1) = {" +v +g +f +f +f +f +v +"} +(7,1,1) = {" +v +b +k +o +s +b +b +"} diff --git a/maps/expedition_vr/beach/submaps/digsite.dmm b/maps/expedition_vr/beach/submaps/digsite.dmm new file mode 100644 index 0000000000..1ec8bcde48 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/digsite.dmm @@ -0,0 +1,618 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/submap/cave/digsite) +"c" = ( +/turf/simulated/wall/sandstone, +/area/submap/cave/digsite) +"d" = ( +/obj/structure/boulder, +/turf/simulated/floor/plating/external, +/area/submap/cave/digsite) +"e" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"f" = ( +/turf/simulated/floor/tiled/kafel_full/yellow, +/area/submap/cave/digsite) +"g" = ( +/turf/simulated/floor/plating/external, +/area/submap/cave/digsite) +"h" = ( +/obj/item/weapon/ore, +/turf/simulated/floor/plating/external, +/area/submap/cave/digsite) +"i" = ( +/obj/structure/bed/alien, +/turf/simulated/floor/tiled/kafel_full/yellow, +/area/submap/cave/digsite) +"j" = ( +/obj/structure/cult/talisman, +/turf/simulated/floor/tiled/kafel_full/yellow, +/area/submap/cave/digsite) +"k" = ( +/obj/machinery/artifact, +/obj/structure/anomaly_container, +/turf/simulated/floor/tiled/kafel_full/yellow, +/area/submap/cave/digsite) +"l" = ( +/obj/structure/simple_door/sandstone, +/turf/simulated/floor/tiled/kafel_full/yellow, +/area/submap/cave/digsite) +"m" = ( +/obj/structure/loot_pile/surface/alien, +/turf/simulated/floor/tiled/kafel_full/yellow, +/area/submap/cave/digsite) +"n" = ( +/mob/living/simple_mob/animal/passive/tindalos, +/turf/simulated/floor/tiled/kafel_full/yellow, +/area/submap/cave/digsite) +"o" = ( +/obj/structure/closet/crate/secure/loot, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"p" = ( +/obj/item/weapon/ore, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"q" = ( +/obj/effect/floor_decal/asteroid, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"r" = ( +/obj/structure/anomaly_container, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"s" = ( +/turf/simulated/wall, +/area/submap/cave/digsite) +"t" = ( +/obj/item/frame/apc, +/obj/item/weapon/module/power_control, +/turf/simulated/floor/plating/external, +/area/submap/cave/digsite) +"u" = ( +/obj/structure/table/steel, +/obj/machinery/cell_charger, +/obj/random/powercell, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"v" = ( +/obj/structure/table/steel, +/obj/item/weapon/storage/excavation, +/obj/item/device/measuring_tape, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"w" = ( +/obj/machinery/power/port_gen/pacman/super, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating/external, +/area/submap/cave/digsite) +"x" = ( +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating/external, +/area/submap/cave/digsite) +"y" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"z" = ( +/obj/structure/table/steel, +/obj/item/weapon/folder, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"A" = ( +/obj/structure/table/rack, +/obj/item/weapon/pickaxe, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"B" = ( +/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"C" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/floor/plating/external, +/area/submap/cave/digsite) +"D" = ( +/obj/structure/table/steel, +/obj/random/tech_supply, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"E" = ( +/obj/structure/table/rack, +/obj/item/weapon/shovel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"F" = ( +/obj/structure/boulder, +/obj/effect/decal/mecha_wreckage/ripley, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"G" = ( +/obj/structure/boulder, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"H" = ( +/obj/structure/loot_pile/maint/junk, +/turf/simulated/floor/plating/external, +/area/submap/cave/digsite) +"I" = ( +/obj/structure/table/steel, +/obj/item/weapon/tool/wrench, +/obj/item/weapon/storage/box/samplebags, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"J" = ( +/obj/structure/table/steel, +/obj/item/stack/flag/yellow, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"K" = ( +/obj/random/toolbox, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"L" = ( +/obj/structure/closet/crate, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"M" = ( +/obj/machinery/floodlight, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) +"N" = ( +/obj/structure/ore_box, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/digsite) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +e +a +a +a +"} +(3,1,1) = {" +a +a +b +c +c +c +c +c +b +b +b +b +b +b +b +e +e +e +a +a +"} +(4,1,1) = {" +a +b +c +c +f +f +f +c +c +b +b +b +b +b +b +e +e +e +a +a +"} +(5,1,1) = {" +a +b +c +f +f +k +f +f +c +b +b +b +b +b +b +G +K +e +a +a +"} +(6,1,1) = {" +a +b +c +f +f +f +f +f +c +b +b +b +s +w +C +H +e +e +e +a +"} +(7,1,1) = {" +a +b +c +c +c +l +c +c +c +o +b +b +t +x +g +g +e +e +e +a +"} +(8,1,1) = {" +a +b +c +f +f +f +f +f +c +e +e +p +e +e +e +e +e +e +e +a +"} +(9,1,1) = {" +a +b +c +f +f +f +f +f +l +f +e +e +e +y +y +q +e +e +e +a +"} +(10,1,1) = {" +a +b +c +f +j +g +f +f +c +f +e +e +u +z +D +I +L +e +e +a +"} +(11,1,1) = {" +a +b +c +g +g +g +f +f +c +f +e +e +v +A +E +J +M +e +e +a +"} +(12,1,1) = {" +a +b +d +h +g +f +f +f +f +f +e +e +e +e +e +e +e +e +e +a +"} +(13,1,1) = {" +a +b +c +g +f +f +f +f +h +e +e +e +e +q +e +e +e +e +e +a +"} +(14,1,1) = {" +a +b +c +c +c +f +g +g +c +p +e +q +e +e +e +e +e +e +e +a +"} +(15,1,1) = {" +a +b +c +f +f +f +f +n +c +q +e +e +e +B +e +q +N +N +e +a +"} +(16,1,1) = {" +a +b +c +i +f +f +f +f +g +e +e +r +r +b +F +b +b +e +e +a +"} +(17,1,1) = {" +a +b +c +c +f +m +f +c +g +e +e +e +b +b +b +b +b +e +e +a +"} +(18,1,1) = {" +a +b +e +c +c +c +c +c +e +e +e +e +e +b +b +b +e +e +a +a +"} +(19,1,1) = {" +a +a +e +e +e +e +e +e +e +e +e +e +e +e +b +b +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/excavation1.dmm b/maps/expedition_vr/beach/submaps/excavation1.dmm new file mode 100644 index 0000000000..84484ccd57 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/excavation1.dmm @@ -0,0 +1,361 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/cave, +/area/template_noop) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"c" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"d" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 9 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"e" = ( +/obj/structure/cliff/automatic, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"f" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 5 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"g" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 9 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"h" = ( +/obj/random/outcrop, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"i" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"j" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"k" = ( +/obj/mecha/working/ripley, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"l" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"m" = ( +/obj/structure/table/sifwoodentable, +/obj/item/mecha_parts/mecha_equipment/tool/drill/bore, +/obj/item/weapon/ore/marble, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"n" = ( +/obj/item/weapon/ore, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"o" = ( +/obj/structure/table/sifwoodentable, +/obj/item/mecha_parts/mecha_equipment/hardpoint_actuator, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"p" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"q" = ( +/obj/structure/table/sifwoodentable, +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"r" = ( +/obj/structure/table/sifwoodentable, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy/rigged, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"s" = ( +/obj/item/weapon/ore/marble, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"t" = ( +/obj/item/weapon/ore/gold, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"u" = ( +/obj/item/weapon/ore/diamond, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"v" = ( +/mob/living/simple_mob/mechanical/mining_drone, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"w" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/pickaxe/jackhammer, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"x" = ( +/obj/structure/table/sifwoodentable, +/obj/random/projectile/scrapped_grenadelauncher, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"y" = ( +/obj/structure/table/sifwoodentable, +/obj/random/medical/pillbottle, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"z" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/weapon/grenade/chem_grenade/metalfoam, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"A" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/mining_scanner, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"B" = ( +/obj/structure/table/sifwoodentable, +/obj/random/cigarettes, +/obj/random/tool/powermaint, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/Excavation) +"C" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 10 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"D" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 2 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"E" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 10 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"F" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 6 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) +"G" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 6 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/Excavation) + +(1,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +a +a +"} +(2,1,1) = {" +a +c +c +d +l +l +l +l +l +l +l +l +l +C +a +"} +(3,1,1) = {" +b +c +d +g +i +h +i +h +i +h +h +i +i +D +b +"} +(4,1,1) = {" +b +d +g +h +i +i +n +t +v +w +y +A +i +E +b +"} +(5,1,1) = {" +b +e +h +i +m +q +i +i +i +i +n +i +s +n +b +"} +(6,1,1) = {" +b +e +h +k +n +i +i +u +i +n +i +n +i +i +b +"} +(7,1,1) = {" +b +e +i +i +o +r +s +i +n +i +t +i +n +i +b +"} +(8,1,1) = {" +b +f +j +h +i +i +n +i +v +x +z +B +i +F +b +"} +(9,1,1) = {" +b +c +f +j +i +h +h +i +h +i +h +h +h +D +b +"} +(10,1,1) = {" +a +c +c +f +p +p +p +p +p +p +p +p +p +G +a +"} +(11,1,1) = {" +a +a +b +b +b +b +b +b +b +b +b +b +b +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/lava_trench.dmm b/maps/expedition_vr/beach/submaps/lava_trench.dmm new file mode 100644 index 0000000000..e9c6006d15 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/lava_trench.dmm @@ -0,0 +1,2240 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/template_noop) +"ab" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 9 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ac" = ( +/obj/structure/cliff/automatic, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ad" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 5 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ae" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 9 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"af" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ag" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ah" = ( +/obj/structure/fence/end{ + icon_state = "end"; + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ai" = ( +/obj/structure/fence/post{ + icon_state = "post"; + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"aj" = ( +/obj/structure/fence/door/opened, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ak" = ( +/obj/structure/fence/end{ + icon_state = "end"; + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"al" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"am" = ( +/obj/structure/fence/end{ + icon_state = "end"; + dir = 1 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"an" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 9 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"ao" = ( +/obj/structure/cliff/automatic, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"ap" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 5 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aq" = ( +/obj/structure/sign/warning/lava, +/turf/simulated/wall, +/area/submap/lava_trench) +"ar" = ( +/obj/structure/fence/post, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"as" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 6 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"at" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 9 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"au" = ( +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"av" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aw" = ( +/obj/structure/railing{ + icon_state = "railing0"; + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ax" = ( +/obj/structure/catwalk, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"ay" = ( +/obj/structure/railing{ + icon_state = "railing0"; + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"az" = ( +/obj/structure/fence/door/opened{ + icon_state = "door_opened"; + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"aA" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 8 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aB" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/template_noop) +"aC" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/template_noop) +"aD" = ( +/obj/structure/cliff/automatic, +/obj/structure/railing{ + icon_state = "railing0"; + dir = 4 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aE" = ( +/obj/structure/cliff/automatic, +/obj/structure/railing{ + icon_state = "railing0"; + dir = 8 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aF" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 10 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aG" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 10 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aH" = ( +/obj/structure/railing{ + icon_state = "railing0"; + dir = 4 + }, +/obj/effect/step_trigger/teleporter/offset/east, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aI" = ( +/obj/structure/catwalk, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aJ" = ( +/obj/structure/ore_box, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"aK" = ( +/obj/structure/railing{ + icon_state = "railing0"; + dir = 8 + }, +/obj/effect/step_trigger/teleporter/offset/west, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aL" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"aM" = ( +/obj/machinery/light/small/flicker{ + icon_state = "bulb1"; + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"aN" = ( +/obj/machinery/door/airlock/hatch{ + normalspeed = 0; + safe = 0 + }, +/obj/effect/map_effect/interval/effect_emitter/sparks, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"aO" = ( +/turf/simulated/wall/rshull, +/area/submap/lava_trench/outpost) +"aQ" = ( +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"aR" = ( +/obj/effect/floor_decal/corner_oldtile/blue/full{ + icon_state = "corner_oldtile_full"; + dir = 8 + }, +/obj/machinery/microscope, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"aS" = ( +/obj/effect/floor_decal/corner_oldtile/blue/full{ + icon_state = "corner_oldtile_full"; + dir = 8 + }, +/obj/structure/table/standard, +/obj/random/unidentified_medicine/scientific, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"aT" = ( +/obj/structure/fence/end, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"aU" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 2 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aV" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 10 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"aW" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 10 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"aX" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 6 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aY" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 2 + }, +/obj/structure/railing{ + icon_state = "railing0"; + dir = 4 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"aZ" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 2 + }, +/obj/structure/railing{ + icon_state = "railing0"; + dir = 8 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"ba" = ( +/obj/machinery/crystal/lava, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bb" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 4 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"bc" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 6 + }, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"bd" = ( +/obj/structure/table/steel, +/obj/item/weapon/storage/excavation, +/obj/item/device/measuring_tape, +/obj/effect/floor_decal/corner_oldtile/purple{ + icon_state = "corner_oldtile"; + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"be" = ( +/turf/simulated/mineral/ignore_mapgen/cave, +/area/template_noop) +"bf" = ( +/obj/structure/railing, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bg" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 10 + }, +/obj/structure/railing, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"bh" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 10 + }, +/obj/structure/railing, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"bi" = ( +/obj/structure/railing, +/obj/effect/step_trigger/teleporter/offset/south, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"bj" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 4 + }, +/obj/structure/railing, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"bk" = ( +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bl" = ( +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"bm" = ( +/obj/structure/fence/door/opened{ + icon_state = "door_opened"; + dir = 4 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bn" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 2 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bo" = ( +/obj/effect/floor_decal/corner_oldtile/purple/full{ + icon_state = "corner_oldtile_full"; + dir = 1 + }, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bp" = ( +/obj/machinery/floodlight, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bq" = ( +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/obj/machinery/light/small/flicker{ + icon_state = "bulb1"; + dir = 1 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"br" = ( +/obj/effect/floor_decal/corner_oldtile/blue{ + icon_state = "corner_oldtile"; + dir = 1 + }, +/obj/structure/bed/chair/office/light{ + icon_state = "officechair_white"; + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bs" = ( +/turf/simulated/floor/tiled/old_tile/gray, +/area/submap/lava_trench/outpost) +"bt" = ( +/obj/effect/floor_decal/corner_oldtile/purple{ + icon_state = "corner_oldtile"; + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bu" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 6 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bv" = ( +/obj/item/slime_crystal, +/obj/item/slime_crystal, +/obj/item/slime_crystal, +/obj/effect/floor_decal/corner_oldtile/blue{ + icon_state = "corner_oldtile"; + dir = 9 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bw" = ( +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"bx" = ( +/obj/machinery/crystal/ice, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"by" = ( +/obj/machinery/ai_status_display{ + pixel_y = 32 + }, +/obj/machinery/light/small/flicker{ + icon_state = "bulb1"; + dir = 1 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bz" = ( +/obj/effect/floor_decal/corner_oldtile{ + icon_state = "corner_oldtile"; + dir = 1 + }, +/turf/simulated/floor/tiled/old_tile/gray, +/area/submap/lava_trench/outpost) +"bA" = ( +/obj/effect/floor_decal/corner_oldtile{ + icon_state = "corner_oldtile"; + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile/gray, +/area/submap/lava_trench/outpost) +"bB" = ( +/obj/effect/floor_decal/corner_oldtile/blue{ + icon_state = "corner_oldtile"; + dir = 8 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bC" = ( +/obj/structure/table/rack, +/obj/item/weapon/shovel, +/obj/effect/floor_decal/corner_oldtile/purple/full{ + icon_state = "corner_oldtile_full"; + dir = 1 + }, +/obj/item/weapon/pickaxe/drill, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bD" = ( +/obj/effect/step_trigger/teleporter/offset/north, +/turf/simulated/floor/lava, +/area/submap/lava_trench) +"bE" = ( +/obj/machinery/crystal/lava, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"bF" = ( +/obj/structure/table/rack, +/obj/random/tool/powermaint, +/obj/random/tool/powermaint, +/obj/effect/floor_decal/corner_oldtile/purple{ + icon_state = "corner_oldtile"; + dir = 6 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bG" = ( +/obj/effect/floor_decal/corner_oldtile/purple, +/obj/structure/table/steel, +/obj/item/device/xenoarch_multi_tool, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bH" = ( +/obj/effect/floor_decal/corner_oldtile/purple, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bI" = ( +/obj/item/device/gps/science{ + gps_tag = "CRYSTALS" + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bK" = ( +/obj/effect/floor_decal/corner_oldtile/blue/full, +/obj/random/drinkbottle, +/obj/random/maintenance/research, +/obj/structure/table/standard, +/obj/machinery/light/small/flicker{ + icon_state = "bulb1"; + dir = 8 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bL" = ( +/obj/structure/flora/pottedplant/crystal, +/obj/effect/floor_decal/corner_oldtile/blue{ + icon_state = "corner_oldtile"; + dir = 8 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bM" = ( +/obj/structure/cult/pylon, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/tiled/old_tile/gray, +/area/submap/lava_trench/outpost) +"bN" = ( +/obj/structure/anomaly_container, +/obj/machinery/artifact, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bO" = ( +/obj/machinery/light/small/flicker{ + icon_state = "bulb1"; + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bP" = ( +/obj/effect/floor_decal/corner_oldtile/purple/full{ + icon_state = "corner_oldtile_full"; + dir = 4 + }, +/obj/structure/table/steel, +/obj/machinery/recharger, +/obj/machinery/light/small/flicker{ + icon_state = "bulb1"; + dir = 4 + }, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bQ" = ( +/obj/machinery/light/small/flicker{ + icon_state = "bulb1"; + dir = 8 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bR" = ( +/obj/machinery/light/small/flicker{ + icon_state = "bulb1"; + dir = 1 + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bS" = ( +/obj/effect/floor_decal/corner_oldtile/blue{ + icon_state = "corner_oldtile"; + dir = 1 + }, +/obj/structure/loot_pile/surface/medicine_cabinet{ + pixel_y = 28 + }, +/obj/structure/table/standard, +/obj/item/device/healthanalyzer/improved, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bT" = ( +/obj/machinery/suspension_gen{ + anchored = 1 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bU" = ( +/obj/machinery/light/small/flicker, +/obj/structure/ore_box, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"bW" = ( +/obj/structure/anomaly_container, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"bX" = ( +/obj/effect/floor_decal/corner_oldtile/purple/full{ + icon_state = "corner_oldtile_full"; + dir = 4 + }, +/obj/item/weapon/storage/box/samplebags, +/obj/structure/table/steel, +/obj/item/stack/flag/red, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"bY" = ( +/obj/machinery/crystal, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"bZ" = ( +/obj/structure/table/steel, +/obj/item/weapon/stock_parts/subspace/crystal, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"ca" = ( +/obj/structure/table/steel, +/obj/item/stack/material/diamond, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"cb" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"ce" = ( +/obj/effect/floor_decal/corner_oldtile/blue/full, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"ch" = ( +/obj/structure/loot_pile/maint/trash, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) +"cj" = ( +/obj/item/clothing/head/bio_hood/anomaly, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"ck" = ( +/obj/item/clothing/suit/bio_suit/anomaly, +/turf/simulated/floor/tiled/old_tile, +/area/submap/lava_trench/outpost) +"co" = ( +/obj/machinery/floodlight, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"cp" = ( +/obj/machinery/light/small/flicker, +/obj/structure/closet/crate/secure/loot, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"cq" = ( +/obj/item/weapon/banner/nt, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"cr" = ( +/obj/structure/table/steel, +/obj/item/weapon/material/shard/phoron, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/lava_trench) +"cs" = ( +/obj/item/weapon/banner/nt, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/lava_trench) + +(1,1,1) = {" +aB +aB +aB +aB +af +af +af +aB +aB +aB +aB +aB +be +be +be +be +be +be +be +be +be +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aB +ab +al +am +ar +az +ar +aT +al +aV +aB +aB +aB +aB +aB +aB +aB +aB +aB +be +be +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(3,1,1) = {" +ab +ae +af +af +af +af +af +af +af +aW +aV +aB +aB +aB +aB +aB +aB +aB +aB +be +be +be +aa +aa +aa +aa +aa +aa +aa +aa +"} +(4,1,1) = {" +ac +af +af +af +af +af +af +af +af +af +aW +al +al +al +al +al +aV +aB +aB +be +be +be +be +aa +aa +aa +aa +aa +aa +aa +"} +(5,1,1) = {" +ac +af +af +ba +an +aA +aF +af +af +af +af +af +af +af +af +af +bn +aB +aB +aB +aB +be +be +be +aa +aa +aa +aa +aa +aa +"} +(6,1,1) = {" +ac +af +af +an +at +au +aG +aF +af +aq +af +af +af +af +af +af +bn +aB +aB +aB +aB +aB +be +be +aa +aa +aa +aa +aa +aa +"} +(7,1,1) = {" +ac +af +af +ao +au +au +au +aU +af +af +af +af +af +af +af +af +aW +al +al +aV +aB +aB +be +be +aa +aa +aa +aa +aa +aa +"} +(8,1,1) = {" +ac +af +af +ao +au +au +au +aG +aF +af +af +af +af +af +af +af +af +af +af +bn +aB +aB +be +be +be +aa +aa +aa +aa +aa +"} +(9,1,1) = {" +ac +af +af +ao +au +au +au +au +aG +aF +af +af +bw +bw +bw +bw +af +af +af +bn +aB +aB +be +be +be +be +aa +aa +aa +aa +"} +(10,1,1) = {" +ac +af +af +ao +au +au +au +au +au +aU +af +af +bw +bx +bZ +bw +bw +af +af +bn +aB +aB +aB +aB +be +be +be +aa +aa +aa +"} +(11,1,1) = {" +ac +af +af +ap +av +au +au +au +af +af +af +af +bw +bE +ca +bw +bw +af +af +bn +aB +aB +aB +aB +aB +be +be +be +aa +aa +"} +(12,1,1) = {" +ac +af +af +af +ao +au +au +au +au +aU +af +af +bw +bY +cr +bw +bw +af +af +aW +al +al +aV +aB +aB +be +be +be +be +aa +"} +(13,1,1) = {" +ac +af +af +af +ao +au +au +au +au +aG +aF +af +bw +bw +bw +bw +bw +af +af +af +af +af +bn +aB +aB +aB +aB +be +be +be +"} +(14,1,1) = {" +ad +ag +af +af +ao +au +au +au +au +au +aU +af +af +bw +bw +bw +bw +af +aM +af +af +af +aW +al +al +aV +aB +aB +be +be +"} +(15,1,1) = {" +aB +ac +af +af +ao +au +au +au +au +au +aU +af +af +bw +bw +aJ +aO +aO +aO +aO +aO +af +af +af +af +bn +aB +aB +be +be +"} +(16,1,1) = {" +aB +ac +af +af +ao +au +au +af +au +au +aU +af +af +bw +cq +aO +aO +aR +bv +ce +aO +aO +af +af +af +bn +aB +aB +be +be +"} +(17,1,1) = {" +aB +ac +af +af +ao +au +au +au +au +au +aU +af +af +bw +bU +aO +aS +br +aQ +bB +bK +aO +ch +af +af +bn +aB +aB +be +be +"} +(18,1,1) = {" +aB +ac +af +af +ao +au +au +au +au +au +aU +af +af +bw +aJ +aO +bS +aQ +aQ +aQ +bL +aO +aO +af +af +bn +aB +aB +be +be +"} +(19,1,1) = {" +aB +ah +af +af +ap +av +au +au +au +aX +bc +af +af +bw +aO +aO +aO +bq +aQ +aQ +bz +bs +aO +af +af +bn +aB +aB +be +be +"} +(20,1,1) = {" +aC +ai +af +af +aw +aD +aH +aH +aH +aY +aw +af +af +bw +aN +bO +aN +aQ +aQ +bT +bs +bM +aO +bR +af +bn +aB +aB +be +be +"} +(21,1,1) = {" +aC +aj +af +af +ax +ax +ax +aI +aI +aI +ax +bw +bw +bw +aO +aO +aO +by +aQ +ck +bA +bs +aO +af +af +bn +aB +aB +be +be +"} +(22,1,1) = {" +aC +ai +af +af +ay +aE +aK +aK +aK +aZ +ay +af +bw +bw +co +aO +bd +cj +cb +aQ +bG +aO +aO +af +af +bn +aB +aB +be +be +"} +(23,1,1) = {" +aB +ak +af +af +af +ao +au +au +au +aG +aF +af +bw +bw +cp +aO +bo +bt +bI +bH +bP +aO +bN +af +af +bn +aB +aB +be +be +"} +(24,1,1) = {" +aB +ac +af +aq +af +ao +au +au +au +au +aU +af +bw +af +cs +aO +aO +bC +bF +bX +aO +aO +bW +af +af +bn +aB +aB +aB +be +"} +(25,1,1) = {" +aB +ad +ag +af +af +ao +au +au +af +au +aU +bf +bk +af +af +af +aO +aO +aO +aO +aO +bN +af +af +af +bn +aB +aB +aB +aB +"} +(26,1,1) = {" +aB +aB +ac +af +af +ao +au +au +au +au +aG +bg +bk +af +aq +af +af +af +bQ +af +af +af +af +af +af +aW +al +aV +aB +aB +"} +(27,1,1) = {" +aB +aB +ac +af +af +ao +au +au +au +au +au +bh +bl +aA +aA +aF +af +af +af +af +af +af +af +af +af +af +af +bn +aB +aB +"} +(28,1,1) = {" +aB +aB +ac +af +af +ao +au +au +af +au +au +bi +bl +bD +au +aG +aA +aA +aF +af +af +af +af +af +af +af +af +aW +aV +aB +"} +(29,1,1) = {" +aB +aB +ac +af +af +ao +au +au +af +af +au +bi +bl +bD +au +au +au +au +aG +aA +aA +af +aA +aA +aF +af +af +af +aW +aV +"} +(30,1,1) = {" +aB +aB +ac +af +af +ap +av +au +au +ba +au +bi +bl +bD +au +au +au +au +au +au +au +af +au +au +aG +aF +af +af +af +bn +"} +(31,1,1) = {" +aB +aB +ac +af +af +af +ap +av +au +au +au +bi +bl +bD +au +af +au +au +au +au +au +au +au +au +au +aG +aF +af +af +bn +"} +(32,1,1) = {" +aB +aB +ac +af +af +af +af +ap +av +au +au +bi +bl +bD +au +au +au +au +au +af +af +af +au +au +au +au +aU +af +af +bn +"} +(33,1,1) = {" +aB +aB +ad +ag +af +af +af +af +ap +bb +bb +bj +bl +av +au +au +au +au +au +au +ba +af +af +au +au +au +aU +af +af +bn +"} +(34,1,1) = {" +aB +aB +aB +ad +ag +af +af +af +af +af +af +bf +bk +ap +bb +bb +av +au +au +au +au +au +au +au +au +au +aU +af +af +ah +"} +(35,1,1) = {" +be +aB +aB +aB +ad +ag +af +af +af +af +af +bf +bk +af +af +af +ap +av +au +au +au +au +au +au +au +au +aU +af +af +ai +"} +(36,1,1) = {" +be +be +aB +aB +aB +ad +aL +aL +ag +af +af +af +af +af +af +af +af +ap +bb +bb +bb +bb +bb +av +au +au +aU +af +af +aj +"} +(37,1,1) = {" +be +be +be +aB +aB +aB +aB +aB +ac +af +af +af +af +af +af +aq +af +af +af +af +af +af +af +ap +bb +bb +bc +af +af +ai +"} +(38,1,1) = {" +aa +be +be +be +aB +aB +aB +aB +ac +af +af +ba +af +af +af +bp +af +af +af +af +af +af +af +af +af +af +af +af +af +ak +"} +(39,1,1) = {" +aa +aa +be +be +be +be +aB +aB +ad +ag +af +af +af +af +af +af +af +af +af +af +ba +af +af +af +af +af +af +af +af +bn +"} +(40,1,1) = {" +aa +aa +aa +be +be +be +aB +aB +aB +ac +af +af +af +af +af +af +af +ba +af +af +af +af +bu +aL +aL +aL +aL +aL +aL +as +"} +(41,1,1) = {" +aa +aa +aa +aa +be +be +be +aB +aB +ac +af +af +af +af +af +af +af +af +af +af +af +af +bn +aB +aB +aB +aB +aB +aB +aB +"} +(42,1,1) = {" +aa +aa +aa +aa +aa +be +be +aB +aB +ac +af +af +af +af +af +af +af +af +af +af +af +bu +as +aB +aB +aB +aB +aB +aB +aB +"} +(43,1,1) = {" +aa +aa +aa +aa +aa +be +be +aB +aB +ad +am +ar +bm +ar +aT +aL +aL +aL +aL +aL +aL +as +aB +aB +aB +be +be +be +be +be +"} +(44,1,1) = {" +aa +aa +aa +aa +aa +be +be +aB +aB +aB +aB +af +af +af +af +af +aB +aB +aB +aB +aB +aB +aB +aB +be +be +be +be +be +be +"} +(45,1,1) = {" +aa +aa +aa +aa +aa +be +be +aB +aB +aB +aB +aB +aB +aB +aB +aB +aB +aB +aB +aB +aB +aB +aB +be +be +be +aa +aa +aa +aa +"} +(46,1,1) = {" +aa +aa +aa +aa +aa +be +be +be +be +aB +aB +aB +aB +aB +aB +aB +aB +be +be +be +be +be +be +be +be +aa +aa +aa +aa +aa +"} +(47,1,1) = {" +aa +aa +aa +aa +aa +aa +be +be +be +aB +aB +aB +aB +aB +aB +aB +aB +aB +be +be +be +be +be +be +aa +aa +aa +aa +aa +aa +"} +(48,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aB +aB +aB +aB +aB +aB +aB +aB +aB +be +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/maps/expedition_vr/beach/submaps/lost_explorer.dmm b/maps/expedition_vr/beach/submaps/lost_explorer.dmm new file mode 100644 index 0000000000..683acd2757 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/lost_explorer.dmm @@ -0,0 +1,74 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) +"b" = ( +/obj/item/device/geiger, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) +"c" = ( +/obj/item/clothing/mask/gas/explorer, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) +"d" = ( +/obj/item/weapon/material/knife/tacknife/survival, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) +"e" = ( +/obj/item/clothing/shoes/boots/winter/explorer, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) +"f" = ( +/obj/item/clothing/under/explorer, +/obj/effect/decal/remains, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) +"g" = ( +/obj/item/clothing/suit/storage/hooded/explorer, +/obj/item/weapon/cell/device, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) +"h" = ( +/obj/item/device/gps/explorer, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) +"i" = ( +/obj/item/device/flashlight/lantern, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/lost_explorer) + +(1,1,1) = {" +a +a +a +a +i +"} +(2,1,1) = {" +a +c +e +a +a +"} +(3,1,1) = {" +b +a +f +g +a +"} +(4,1,1) = {" +a +d +a +a +a +"} +(5,1,1) = {" +a +a +a +h +a +"} diff --git a/maps/expedition_vr/beach/submaps/mountains.dm b/maps/expedition_vr/beach/submaps/mountains.dm new file mode 100644 index 0000000000..9150c690c2 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/mountains.dm @@ -0,0 +1,374 @@ +// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test. +// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors. +// When adding a new PoI, please add it to this list. +#if MAP_TEST +#include "deadBeacon.dmm" +#include "prepper1.dmm" +#include "quarantineshuttle.dmm" +#include "Mineshaft1.dmm" +#include "Scave1.dmm" +#include "crashed_ufo.dmm" +#include "crashed_ufo_frigate.dmm" +#include "crystal1.dmm" +#include "crystal2.dmm" +#include "crystal3.dmm" +#include "lost_explorer.dmm" +#include "CaveTrench.dmm" +#include "Cavelake.dmm" +#include "Rockb1.dmm" +#include "ritual.dmm" +#include "temple.dmm" +#include "CrashedMedShuttle1.dmm" +#include "digsite.dmm" +#include "vault1.dmm" +#include "vault2.dmm" +#include "vault3.dmm" +#include "vault4.dmm" +#include "vault5.dmm" +#include "vault6.dmm" +#include "IceCave1A.dmm" +#include "IceCave1B.dmm" +#include "IceCave1C.dmm" +#include "SwordCave.dmm" +#include "SupplyDrop1.dmm" +#include "BlastMine1.dmm" +#include "crashedcontainmentshuttle.dmm" +#include "deadspy.dmm" +#include "lava_trench.dmm" +#include "Geyser1.dmm" +#include "Geyser2.dmm" +#include "Geyser3.dmm" +#include "Cliff1.dmm" +#include "excavation1.dmm" +#include "spatial_anomaly.dmm" +#include "speakeasy_vr.dmm" +#endif + +// The 'mountains' is the mining z-level, and has a lot of caves. +// POIs here spawn in two different sections, the top half and bottom half of the map. +// The bottom half should be fairly tame, with perhaps a few enviromental hazards. +// The top half is when things start getting dangerous, but the loot gets better. + +/datum/map_template/surface/mountains + name = "Mountain Content" + desc = "Don't dig too deep!" + +// 'Normal' templates get used on the bottom half, and should be safer. +/datum/map_template/surface/mountains/normal + +// 'Deep' templates get used on the top half, and should be more dangerous and rewarding. +/datum/map_template/surface/mountains/deep + +// To be added: Templates for cave exploration when they are made. + +/**************** + * Normal Caves * + ****************/ + +/datum/map_template/surface/mountains/normal/deadBeacon + name = "Abandoned Relay" + desc = "An unregistered comms relay, abandoned to the elements." + mappath = 'maps/expedition_vr/beach/submaps/deadBeacon.dmm' + cost = 10 + +/datum/map_template/surface/mountains/normal/prepper1 + name = "Prepper Bunker" + desc = "A little hideaway for someone with more time and money than sense." + mappath = 'maps/expedition_vr/beach/submaps/prepper1.dmm' + cost = 10 + +/datum/map_template/surface/mountains/normal/qshuttle + name = "Quarantined Shuttle" + desc = "An emergency landing turned viral outbreak turned tragedy." + mappath = 'maps/expedition_vr/beach/submaps/quarantineshuttle.dmm' + cost = 20 + +/datum/map_template/surface/mountains/normal/Mineshaft1 + name = "Abandoned Mineshaft 1" + desc = "An abandoned minning tunnel from a lost money making effort." + mappath = 'maps/expedition_vr/beach/submaps/Mineshaft1.dmm' + cost = 5 + +/datum/map_template/surface/mountains/normal/crystal1 + name = "Crystal Cave 1" + desc = "A small cave with glowing gems and diamonds." + mappath = 'maps/expedition_vr/beach/submaps/crystal1.dmm' + cost = 5 + allow_duplicates = TRUE + +/datum/map_template/surface/mountains/normal/crystal2 + name = "Crystal Cave 2" + desc = "A moderate sized cave with glowing gems and diamonds." + mappath = 'maps/expedition_vr/beach/submaps/crystal2.dmm' + cost = 10 + allow_duplicates = TRUE + +/datum/map_template/surface/mountains/normal/crystal2 + name = "Crystal Cave 3" + desc = "A large spiral of crystals with diamonds in the center." + mappath = 'maps/expedition_vr/beach/submaps/crystal3.dmm' + cost = 15 + +/datum/map_template/surface/mountains/normal/lost_explorer + name = "Lost Explorer" + desc = "The remains of an explorer who rotted away ages ago, and their equipment." + mappath = 'maps/expedition_vr/beach/submaps/lost_explorer.dmm' + cost = 5 + allow_duplicates = TRUE + +/datum/map_template/surface/mountains/normal/Rockb1 + name = "Rocky Base 1" + desc = "Someones underground hidey hole" + mappath = 'maps/expedition_vr/beach/submaps/Rockb1.dmm' + cost = 15 + +/datum/map_template/surface/mountains/normal/corgiritual + name = "Dark Ritual" + desc = "Who put all these plushies here? What are they doing?" + mappath = 'maps/expedition_vr/beach/submaps/ritual.dmm' + cost = 15 + +/datum/map_template/surface/mountains/normal/abandonedtemple + name = "Abandoned Temple" + desc = "An ancient temple, long since abandoned. Perhaps alien in origin?" + mappath = 'maps/expedition_vr/beach/submaps/temple.dmm' + cost = 20 + +/datum/map_template/surface/mountains/normal/digsite + name = "Dig Site" + desc = "A small abandoned dig site." + mappath = 'maps/expedition_vr/beach/submaps/digsite.dmm' + cost = 10 + +/datum/map_template/surface/mountains/normal/vault1 + name = "Mine Vault 1" + desc = "A small vault with potential loot." + mappath = 'maps/expedition_vr/beach/submaps/vault1.dmm' + cost = 5 + allow_duplicates = TRUE + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/vault2 + name = "Mine Vault 2" + desc = "A small vault with potential loot." + mappath = 'maps/expedition_vr/beach/submaps/vault2.dmm' + cost = 5 + allow_duplicates = TRUE + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/vault3 + name = "Mine Vault 3" + desc = "A small vault with potential loot. Also a horrible suprise." + mappath = 'maps/expedition_vr/beach/submaps/vault3.dmm' + cost = 15 + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/IceCave1A + name = "Ice Cave 1A" + desc = "This cave's slippery ice makes it hard to navigate, but determined explorers will be rewarded." + mappath = 'maps/expedition_vr/beach/submaps/IceCave1A.dmm' + cost = 10 + +/datum/map_template/surface/mountains/normal/IceCave1B + name = "Ice Cave 1B" + desc = "This cave's slippery ice makes it hard to navigate, but determined explorers will be rewarded." + mappath = 'maps/expedition_vr/beach/submaps/IceCave1B.dmm' + cost = 10 + +/datum/map_template/surface/mountains/normal/IceCave1C + name = "Ice Cave 1C" + desc = "This cave's slippery ice makes it hard to navigate, but determined explorers will be rewarded." + mappath = 'maps/expedition_vr/beach/submaps/IceCave1C.dmm' + cost = 10 + +/datum/map_template/surface/mountains/normal/SwordCave + name = "Cursed Sword Cave" + desc = "An underground lake. The sword on the lake's island holds a terrible secret." + mappath = 'maps/expedition_vr/beach/submaps/SwordCave.dmm' + +/datum/map_template/surface/mountains/normal/supplydrop1 + name = "Supply Drop 1" + desc = "A drop pod that landed deep within the mountains." + mappath = 'maps/expedition_vr/beach/submaps/SupplyDrop1.dmm' + cost = 10 + allow_duplicates = TRUE + +/datum/map_template/surface/mountains/normal/crashedcontainmentshuttle + name = "Crashed Cargo Shuttle" + desc = "A severely damaged military shuttle, its cargo seems to remain intact." + mappath = 'maps/expedition_vr/beach/submaps/crashedcontainmentshuttle.dmm' + cost = 30 + +/datum/map_template/surface/mountains/normal/deadspy + name = "Spy Remains" + desc = "W+M1 = Salt." + mappath = 'maps/expedition_vr/beach/submaps/deadspy.dmm' + cost = 15 + +/datum/map_template/surface/mountains/normal/geyser1 + name = "Ore-Rich Geyser" + desc = "A subterranean geyser that produces steam. This one has a particularly abundant amount of materials surrounding it." + mappath = 'maps/expedition_vr/beach/submaps/Geyser1.dmm' + cost = 5 + allow_duplicates = TRUE + template_group = "Underground Geysers" + +/datum/map_template/surface/mountains/normal/geyser2 + name = "Fenced Geyser" + desc = "A subterranean geyser that produces steam. This one has a damaged fence surrounding it." + mappath = 'maps/expedition_vr/beach/submaps/Geyser2.dmm' + cost = 5 + allow_duplicates = TRUE + template_group = "Underground Geysers" + +/datum/map_template/surface/mountains/normal/geyser3 + name = "Magmatic Geyser" + desc = "A subterranean geyser that produces incendiary gas. It is recessed into the ground, and filled with magma. It's a relatively dormant volcano." + mappath = 'maps/expedition_vr/beach/submaps/Geyser2.dmm' + cost = 10 + allow_duplicates = TRUE + template_group = "Underground Geysers" + +/datum/map_template/surface/mountains/normal/cliff1 + name = "Ore-Topped Cliff" + desc = "A raised area of rock created by volcanic forces." + mappath = 'maps/expedition_vr/beach/submaps/Cliff1.dmm' + cost = 5 + allow_duplicates = TRUE + template_group = "Underground Cliffs" + +/datum/map_template/surface/mountains/normal/deadly_rabbit // VOREStation Edit + name = "The Killer Rabbit" + desc = "A cave where the Knights of the Round have fallen to a murderous Rabbit." + mappath = 'maps/expedition_vr/beach/submaps/deadly_rabbit_vr.dmm' + cost = 5 + allow_duplicates = FALSE + +/************** + * Deep Caves * + **************/ + +/* Vorestation Removal +/datum/map_template/surface/mountains/deep/lost_explorer + name = "Lost Explorer, Deep" + desc = "The remains of an explorer who rotted away ages ago, and their equipment. Again." + mappath = 'maps/expedition_vr/beach/submaps/lost_explorer.dmm' + cost = 5 + allow_duplicates = TRUE */ + +/datum/map_template/surface/mountains/normal/crashed_ufo //VOREStation Edit + name = "Crashed UFO" + desc = "A (formerly) flying saucer that is now embedded into the mountain, yet it still seems to be running..." + mappath = 'maps/expedition_vr/beach/submaps/crashed_ufo.dmm' + cost = 40 + discard_prob = 50 + +/datum/map_template/surface/mountains/normal/crashed_ufo_frigate //VOREStation Edit + name = "Crashed UFO Frigate" + desc = "A (formerly) flying saucer that is now embedded into the mountain, yet the combat protocols still seem to be running..." + mappath = 'maps/expedition_vr/beach/submaps/crashed_ufo_frigate.dmm' + cost = 60 + discard_prob = 50 + +/datum/map_template/surface/mountains/normal/Scave1 //VOREStation Edit + name = "Spider Cave 1" + desc = "A minning tunnel home to an aggressive collection of spiders." + mappath = 'maps/expedition_vr/beach/submaps/Scave1.dmm' + cost = 20 + +/datum/map_template/surface/mountains/normal/CaveTrench //VOREStation Edit + name = "Cave River" + desc = "A strange underground river." + mappath = 'maps/expedition_vr/beach/submaps/CaveTrench.dmm' + cost = 20 + +/datum/map_template/surface/mountains/normal/Cavelake //VOREStation Edit + name = "Cave Lake" + desc = "A large underground lake." + mappath = 'maps/expedition_vr/beach/submaps/Cavelake.dmm' + cost = 20 + +/datum/map_template/surface/mountains/normal/vault1 //VOREStation Edit + name = "Mine Vault 1" + desc = "A small vault with potential loot." + mappath = 'maps/expedition_vr/beach/submaps/vault1.dmm' + cost = 5 + allow_duplicates = TRUE + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/vault2 //VOREStation Edit + name = "Mine Vault 2" + desc = "A small vault with potential loot." + mappath = 'maps/expedition_vr/beach/submaps/vault2.dmm' + cost = 5 + allow_duplicates = TRUE + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/vault3 //VOREStation Edit + name = "Mine Vault 3" + desc = "A small vault with potential loot. Also a horrible suprise." + mappath = 'maps/expedition_vr/beach/submaps/vault3.dmm' + cost = 15 + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/vault4 //VOREStation Edit + name = "Mine Vault 4" + desc = "A small xeno vault with potential loot. Also horrible suprises." + mappath = 'maps/expedition_vr/beach/submaps/vault4.dmm' + cost = 20 + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/vault5 //VOREStation Edit + name = "Mine Vault 5" + desc = "A small xeno vault with potential loot. Also major horrible suprises." + mappath = 'maps/expedition_vr/beach/submaps/vault5.dmm' + cost = 25 + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/vault6 //VOREStation Edit + name = "Mine Vault 6" + desc = "A small mercenary tower with potential loot." + mappath = 'maps/expedition_vr/beach/submaps/vault6.dmm' + cost = 25 + template_group = "Buried Vaults" + +/datum/map_template/surface/mountains/normal/BlastMine1 //VOREStation Edit + name = "Blast Mine 1" + desc = "An abandoned blast mining site, seems that local wildlife has moved in." + mappath = 'maps/expedition_vr/beach/submaps/BlastMine1.dmm' + cost = 20 + +/datum/map_template/surface/mountains/normal/lava_trench //VOREStation Edit + name = "lava trench" + desc = "A long stretch of lava underground, almost river-like, with a small crystal research outpost on the side." + mappath = 'maps/expedition_vr/beach/submaps/lava_trench.dmm' + cost = 20 + fixed_orientation = TRUE + +/datum/map_template/surface/mountains/normal/crashedmedshuttle //VOREStation Edit + name = "Crashed Med Shuttle" + desc = "A medical response shuttle that went missing some time ago. So this is where they went." + mappath = 'maps/expedition_vr/beach/submaps/CrashedMedShuttle1.dmm' + cost = 20 + fixed_orientation = TRUE + +/datum/map_template/surface/mountains/normal/excavation1 //VOREStation Edit + name = "Excavation Site" + desc = "An abandoned mining site." + mappath = 'maps/expedition_vr/beach/submaps/excavation1.dmm' + cost = 20 + +/datum/map_template/surface/mountains/deep/spatial_anomaly + name = "spatial anomaly" + desc = "A strange section of the caves that seems twist and turn in ways that shouldn't be physically possible." + mappath = 'maps/expedition_vr/beach/submaps/spatial_anomaly.dmm' + cost = 20 + fixed_orientation = TRUE + +/datum/map_template/surface/mountains/normal/Speakeasy //VOREStation add + name = "Speakeasy" + desc = "A hidden underground bar to serve drinks in secret and in style." + mappath = 'maps/expedition_vr/beach/submaps/speakeasy_vr.dmm' + cost = 10 + allow_duplicates = FALSE + diff --git a/maps/expedition_vr/beach/submaps/mountains_areas.dm b/maps/expedition_vr/beach/submaps/mountains_areas.dm new file mode 100644 index 0000000000..eed32e1ca5 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/mountains_areas.dm @@ -0,0 +1,170 @@ +/area/submap/cave + name = "Cave Submap Area" + icon_state = "submap" + ambience = AMBIENCE_RUINS + base_turf = /turf/simulated/mineral/floor/ignore_mapgen/cave + +/area/submap/cave/deadBeacon + name = "POI - abandoned relay" + ambience = AMBIENCE_TECH_RUINS + +/area/submap/cave/prepper1 + name = "POI - Prepper Bunker" + ambience = AMBIENCE_FOREBODING + +/area/submap/cave/qShuttle + name = "POI - Quarantined Shuttle" + ambience = AMBIENCE_RUINS + +/area/submap/cave/AMine1 + name = "POI - Abandoned Mine" + +/area/submap/cave/Scave1 + name = "POI - Spider Cave 1" + ambience = AMBIENCE_FOREBODING + +/area/submap/cave/crashed_ufo + name = "POI - Crashed Alien Vessel" + requires_power = FALSE + ambience = AMBIENCE_OTHERWORLDLY + +/area/submap/cave/crashed_ufo_frigate + name = "POI - Crashed Alien Frigate" + requires_power = FALSE + ambience = AMBIENCE_OTHERWORLDLY + +/area/submap/cave/crystal1 + name = "POI - Crystaline Cave" + ambience = AMBIENCE_SPACE + +/area/submap/cave/crystal2 + name = "POI - Crystaline Cave" + ambience = AMBIENCE_SPACE + +/area/submap/cave/crystal3 + name = "POI - Crystaline Cave" + ambience = AMBIENCE_SPACE + +/area/submap/cave/lost_explorer + name = "POI - Final Resting Place" + ambience = AMBIENCE_GHOSTLY + +/area/submap/Rockb1 + name = "POI - RockyBase1" + ambience = AMBIENCE_FOREBODING + +/area/submap/Cavelake + name = "POI - Cavelake" + ambience = AMBIENCE_SPACE + +/area/submap/CaveTrench + name = "POI - Cave River" + ambience = AMBIENCE_FOREBODING + +/area/submap/CorgiRitual + name = "POI - Dark Ritual" + ambience = AMBIENCE_UNHOLY + +/area/submap/AbandonedTemple + name = "POI - Abandoned Temple" + ambience = AMBIENCE_RUINS + +/area/submap/CrashedMedShuttle + name = "POI - Crashed Med Shuttle" + ambience = AMBIENCE_RUINS + +/area/submap/cave/digsite + name = "POI - Dig Site" + ambience = AMBIENCE_OTHERWORLDLY + +/area/submap/cave/vault1 + name = "POI - Mine Vault" + ambience = AMBIENCE_FOREBODING + +/area/submap/cave/vault2 + name = "POI - Mine Vault" + ambience = AMBIENCE_FOREBODING + +/area/submap/cave/vault3 + name = "POI - Mine Vault" + ambience = AMBIENCE_FOREBODING + +/area/submap/cave/vault4 + name = "POI - Mine Vault" + ambience = AMBIENCE_FOREBODING + +/area/submap/cave/vault5 + name = "POI - Mine Vault" + ambience = AMBIENCE_FOREBODING + +/area/submap/cave/vault6 + name = "POI - Mine Vault" + ambience = AMBIENCE_FOREBODING + +/area/submap/cave/IceCave1A + name = "POI - Ice Cave 1A" + ambience = AMBIENCE_SPACE + +/area/submap/cave/IceCave1B + name = "POI - Ice Cave 1B" + ambience = AMBIENCE_SPACE + +/area/submap/cave/IceCave1C + name = "POI - Ice Cave 1C" + ambience = AMBIENCE_SPACE + +/area/submap/cave/swordcave + name = "POI - Cursed Sword Cave" + ambience = AMBIENCE_UNHOLY + +/area/submap/cave/SupplyDrop1 + name = "POI - Supply Drop 1" + ambience = AMBIENCE_TECH_RUINS + +/area/submap/cave/BlastMine1 + name = "POI - Blast Mine 1" + +/area/submap/crashedcontainmentshuttle + name = "POI - Crashed Containment Shuttle" + ambience = AMBIENCE_HIGHSEC + +/area/submap/geyser_1 + name = "POI - Ore-Rich Geyser" + ambience = AMBIENCE_RUINS + +/area/submap/geyser_2 + name = "POI - Fenced Geyser" + ambience = AMBIENCE_RUINS + +/area/submap/geyser_3 + name = "POI - Magmatic Geyser" + ambience = AMBIENCE_RUINS + +/area/submap/ore_cliff + name = "POI - Ore-Topped Cliff" + ambience = AMBIENCE_RUINS + +/area/submap/deadspy + name = "POI - Dead Spy" + ambience = AMBIENCE_FOREBODING + +/area/submap/lava_trench + name = "POI - Lava Trench" + ambience = AMBIENCE_LAVA + +/area/submap/lava_trench/outpost + name = "POI - Trench Outpost" + requires_power = FALSE + icon_state = "submap2" + +/area/submap/Excavation + name = "POI - Excavation Site" + ambience = AMBIENCE_FOREBODING + +/area/submap/spatial_anomaly + name = "POI - Spatial Anomaly" + ambience = AMBIENCE_FOREBODING + +/area/submap/Speakeasy //VOREStation add + name = "POI - Speakeasy" + requires_power = FALSE \ No newline at end of file diff --git a/maps/expedition_vr/beach/submaps/prepper1.dmm b/maps/expedition_vr/beach/submaps/prepper1.dmm new file mode 100644 index 0000000000..1503210411 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/prepper1.dmm @@ -0,0 +1,224 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/wall/r_wall, +/area/submap/cave/prepper1) +"c" = ( +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/item/stack/rods, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"d" = ( +/obj/structure/table/steel, +/obj/random/maintenance/security, +/obj/item/stack/cable_coil/random, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"e" = ( +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"f" = ( +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"g" = ( +/obj/structure/table/steel, +/obj/item/weapon/storage/box/glasses, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"h" = ( +/obj/structure/table/steel, +/obj/random/toolbox, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"i" = ( +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"j" = ( +/obj/structure/table/steel, +/obj/item/weapon/tape_roll, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"k" = ( +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/item/stack/tile/floor/steel, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"l" = ( +/obj/structure/inflatable/door, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"m" = ( +/obj/structure/closet/wardrobe/grey, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"n" = ( +/obj/structure/closet/crate/freezer/rations, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"o" = ( +/obj/structure/reagent_dispensers/water_cooler/full, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"p" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"q" = ( +/obj/structure/table/rack, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/item/clothing/mask/gas, +/obj/item/clothing/suit/armor/material/makeshift, +/obj/item/clothing/head/helmet/bucket, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"r" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"s" = ( +/obj/structure/table/steel, +/obj/item/device/flashlight/lantern, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) +"t" = ( +/obj/structure/table/rack, +/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever, +/obj/item/ammo_magazine/clip/c762, +/obj/item/ammo_magazine/clip/c762, +/turf/simulated/floor/plating, +/area/submap/cave/prepper1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +b +b +l +l +b +b +a +a +"} +(3,1,1) = {" +a +b +b +g +i +i +o +b +b +a +"} +(4,1,1) = {" +a +b +c +h +i +i +i +q +b +a +"} +(5,1,1) = {" +a +b +d +i +i +i +i +r +b +a +"} +(6,1,1) = {" +a +b +e +i +i +i +i +s +b +a +"} +(7,1,1) = {" +a +b +f +j +i +i +p +t +b +a +"} +(8,1,1) = {" +a +b +b +k +m +n +n +b +b +a +"} +(9,1,1) = {" +a +a +b +b +b +b +b +b +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/quarantineshuttle.dmm b/maps/expedition_vr/beach/submaps/quarantineshuttle.dmm new file mode 100644 index 0000000000..beeb7784ff --- /dev/null +++ b/maps/expedition_vr/beach/submaps/quarantineshuttle.dmm @@ -0,0 +1,1518 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/template_noop, +/area/template_noop) +"ab" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"ac" = ( +/obj/item/clothing/head/cone, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"ad" = ( +/turf/simulated/shuttle/wall, +/area/submap/cave/qShuttle) +"ae" = ( +/obj/structure/inflatable, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"af" = ( +/obj/structure/inflatable/door, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"ag" = ( +/obj/structure/shuttle/engine/heater{ + dir = 4; + icon_state = "heater" + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"ah" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_l" + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"ai" = ( +/obj/structure/grille, +/obj/structure/shuttle/window, +/obj/machinery/door/blast/regular{ + dir = 8; + id = "QShuttlePoIDoors"; + layer = 3.3; + name = "Emergency Lockdown Shutters" + }, +/obj/item/tape/medical{ + dir = 4; + icon_state = "tape_door_0"; + layer = 3.4 + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"aj" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/submap/cave/qShuttle) +"ak" = ( +/obj/machinery/door/airlock/external{ + desc = "It opens and closes. It is stamped with the logo of Major Bill's Transportation"; + frequency = 1380; + icon_state = "door_locked"; + id_tag = null; + locked = 1; + name = "MBT-540" + }, +/obj/item/tape/medical{ + dir = 4; + icon_state = "tape_door_0"; + layer = 3.4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"al" = ( +/obj/structure/sign/biohazard{ + dir = 1 + }, +/turf/simulated/shuttle/wall/hard_corner, +/area/submap/cave/qShuttle) +"am" = ( +/obj/structure/toilet{ + dir = 4 + }, +/obj/effect/decal/cleanable/vomit, +/obj/effect/decal/remains/human, +/turf/simulated/shuttle/floor, +/area/submap/cave/qShuttle) +"an" = ( +/obj/machinery/door/airlock{ + name = "Restroom" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"ao" = ( +/obj/effect/decal/cleanable/vomit, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"ap" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"aq" = ( +/obj/structure/bed/chair, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"ar" = ( +/obj/structure/bed/chair, +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/space/emergency, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"as" = ( +/obj/machinery/vending/snack{ + contraband = null; + products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 0, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/weapon/reagent_containers/food/snacks/chips = 0, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 0, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 0, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 0, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 0, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 0) + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"at" = ( +/obj/machinery/vending/cola{ + contraband = null; + products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 0) + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"au" = ( +/obj/structure/closet/crate/secure/loot, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"av" = ( +/obj/item/weapon/pickaxe/drill, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aw" = ( +/obj/item/clothing/mask/breath, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"ax" = ( +/obj/effect/decal/cleanable/generic, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"ay" = ( +/obj/effect/decal/remains/xeno, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"az" = ( +/obj/item/trash/syndi_cakes, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aA" = ( +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aB" = ( +/obj/item/trash/cigbutt, +/obj/item/weapon/tank/emergency/oxygen, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aC" = ( +/obj/item/weapon/material/knife/tacknife/boot, +/obj/item/clothing/mask/breath, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aD" = ( +/obj/effect/decal/remains/human, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"aE" = ( +/obj/item/trash/sosjerky, +/obj/item/weapon/storage/box/donut/empty, +/obj/item/weapon/reagent_containers/food/drinks/sillycup, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"aF" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+006 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"aG" = ( +/obj/machinery/door/airlock/glass, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+006 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"aI" = ( +/obj/machinery/button{ + name = "Cargo Hatch" + }, +/turf/simulated/shuttle/wall, +/area/submap/cave/qShuttle) +"aJ" = ( +/obj/machinery/computer, +/turf/simulated/shuttle/floor, +/area/submap/cave/qShuttle) +"aK" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 8 + }, +/obj/effect/decal/cleanable/vomit, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"aL" = ( +/obj/structure/prop/blackbox/quarantined_shuttle, +/turf/simulated/shuttle/floor, +/area/submap/cave/qShuttle) +"aM" = ( +/obj/item/trash/cheesie, +/obj/effect/decal/remains/human, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"aN" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aO" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aP" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/effect/decal/remains/human, +/obj/item/clothing/mask/breath, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"aQ" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"aR" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aS" = ( +/obj/effect/decal/cleanable/vomit, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aT" = ( +/obj/item/clothing/head/helmet/space/emergency, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"aU" = ( +/obj/machinery/door/airlock/engineering{ + icon_state = "door_locked"; + locked = 1; + name = "Cargo Bay" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aV" = ( +/obj/item/weapon/virusdish/random, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aW" = ( +/obj/item/weapon/material/shard, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aX" = ( +/obj/item/device/paicard, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aY" = ( +/obj/machinery/door/blast/regular{ + name = "Cargo Door" + }, +/obj/item/tape/medical{ + dir = 4; + icon_state = "tape_door_0"; + layer = 3.4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"aZ" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/under/mbill{ + desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation. This looks at least a few decades out of date."; + name = "\improper old Major Bill's uniform" + }, +/obj/item/clothing/head/soft/mbill{ + desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; + name = "old shipping cap" + }, +/turf/simulated/shuttle/floor, +/area/submap/cave/qShuttle) +"ba" = ( +/obj/item/trash/cigbutt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bb" = ( +/obj/machinery/door/airlock/command{ + icon_state = "door_locked"; + locked = 1 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bc" = ( +/obj/item/weapon/tank/emergency/oxygen/engi, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bd" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"be" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+006 + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"bf" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+006 + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"bg" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+006 + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"bh" = ( +/obj/item/clothing/suit/space/emergency, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bi" = ( +/obj/item/trash/candy, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bj" = ( +/obj/structure/table/rack, +/obj/structure/loot_pile/maint/boxfort, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bk" = ( +/obj/structure/table/rack, +/obj/item/weapon/shovel, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bl" = ( +/obj/structure/closet/crate/secure/science{ + icon_state = "scisecurecrateopen"; + locked = 0; + name = "Virus Samples - FRAGILE"; + opened = 1 + }, +/obj/item/weapon/virusdish/random, +/obj/item/weapon/virusdish/random, +/obj/item/weapon/virusdish/random, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bm" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 8 + }, +/obj/effect/decal/remains/human, +/obj/item/clothing/under/mbill{ + desc = "A uniform belonging to Major Bill's Transportation, a shipping megacorporation. This looks at least a few decades out of date."; + name = "\improper old Major Bill's uniform" + }, +/obj/item/clothing/head/soft/mbill{ + desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; + name = "old shipping cap" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bn" = ( +/obj/structure/table/standard, +/obj/item/device/taperecorder, +/turf/simulated/shuttle/floor, +/area/submap/cave/qShuttle) +"bo" = ( +/obj/item/weapon/tool/crowbar/red, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bp" = ( +/obj/item/trash/chips, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bq" = ( +/obj/structure/bed/chair, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"br" = ( +/obj/structure/bed/chair, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bs" = ( +/obj/structure/bed/chair, +/obj/effect/decal/remains/human, +/obj/item/clothing/mask/breath, +/obj/item/clothing/head/soft/mbill{ + desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; + name = "old shipping cap" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bt" = ( +/obj/structure/bed/chair, +/obj/effect/decal/remains/human, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bu" = ( +/obj/effect/decal/remains/xeno, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bv" = ( +/obj/item/weapon/material/shard{ + icon_state = "medium" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bw" = ( +/obj/effect/decal/remains/mouse, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bx" = ( +/obj/random/maintenance, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"by" = ( +/obj/item/weapon/coin/silver, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bz" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/space/emergency, +/obj/item/clothing/head/helmet/space/emergency, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bA" = ( +/obj/effect/decal/cleanable/generic, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bB" = ( +/obj/item/weapon/tank/emergency/oxygen/engi, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bC" = ( +/obj/item/trash/sosjerky, +/obj/effect/decal/remains/human, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bD" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/mask/breath, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bE" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"bF" = ( +/obj/structure/grille, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/shuttle/plating, +/area/submap/cave/qShuttle) +"bG" = ( +/obj/machinery/button{ + dir = 4; + name = "Cargo Access" + }, +/turf/simulated/shuttle/wall, +/area/submap/cave/qShuttle) +"bH" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor, +/area/submap/cave/qShuttle) +"bI" = ( +/obj/machinery/door/airlock{ + name = "Charge Station" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bJ" = ( +/obj/item/trash/tastybread, +/obj/item/weapon/material/butterfly/boxcutter, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bK" = ( +/obj/effect/decal/cleanable/vomit, +/obj/effect/decal/cleanable/mucus/mapped, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bL" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/effect/decal/remains/xeno, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bM" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/item/weapon/card/id/external{ + desc = "An identification card of some sort. Looks like this one was issued by the Vir Independent Mining Corp."; + name = "VIMC identification card"; + rank = "Miner"; + registered_name = "Nadia Chu" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bN" = ( +/obj/structure/table/rack, +/obj/item/weapon/storage/toolbox/emergency, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bO" = ( +/obj/structure/table/rack, +/obj/item/clothing/head/soft/mbill{ + desc = "It's a ballcap bearing the colors of Major Bill's Shipping. This one looks at least a few decades out of date."; + name = "old shipping cap" + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor_white" + }, +/area/submap/cave/qShuttle) +"bP" = ( +/obj/structure/ore_box, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bQ" = ( +/obj/item/poster, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bR" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/shuttle/floor{ + icon_state = "floor_yellow" + }, +/area/submap/cave/qShuttle) +"bS" = ( +/obj/structure/sign/biohazard, +/turf/simulated/shuttle/wall/hard_corner, +/area/submap/cave/qShuttle) +"bT" = ( +/obj/item/tape/medical{ + icon_state = "tape_v_0" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"bU" = ( +/obj/item/taperoll/medical, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"bV" = ( +/obj/item/tape/medical{ + dir = 1; + icon_state = "tape_dir_0" + }, +/obj/item/tape/medical{ + dir = 4; + icon_state = "tape_dir_0" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"bW" = ( +/obj/item/tape/medical{ + icon_state = "tape_h_0" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"bX" = ( +/obj/structure/lattice, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"bY" = ( +/obj/structure/sign/warning/secure_area, +/turf/simulated/wall/iron, +/area/submap/cave/qShuttle) +"bZ" = ( +/obj/structure/sign/kiddieplaque{ + desc = "By order of the S.D.D.C, this site or craft is to be buried and not disturbed until such time that sterility can be confirmed. Dated: 20/12/2491 "; + name = "\improper Sif Department of Disease Control notice" + }, +/turf/simulated/wall/iron, +/area/submap/cave/qShuttle) +"ca" = ( +/obj/structure/sign/warning, +/turf/simulated/wall/iron, +/area/submap/cave/qShuttle) +"cb" = ( +/obj/item/bodybag, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"cc" = ( +/obj/structure/table/steel, +/obj/item/weapon/storage/box/bodybags, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"cd" = ( +/obj/structure/table/steel, +/obj/item/clothing/suit/bio_suit, +/obj/random/medical/lite, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"ce" = ( +/obj/structure/closet/l3closet/virology, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"cf" = ( +/obj/item/weapon/reagent_containers/syringe/antiviral, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"cg" = ( +/obj/structure/dispenser/oxygen, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"ch" = ( +/obj/structure/table/steel, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"ci" = ( +/obj/structure/table/steel, +/obj/item/weapon/reagent_containers/syringe/antiviral, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"cj" = ( +/obj/structure/table/steel, +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; + name = "Chemistry Cleaner" + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"ck" = ( +/obj/structure/table/steel, +/obj/item/weapon/tool/crowbar/power, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"cl" = ( +/obj/structure/table/rack, +/obj/item/clothing/head/bio_hood, +/obj/item/clothing/suit/bio_suit, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"cm" = ( +/obj/item/weapon/weldingtool/largetank, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) +"cn" = ( +/obj/structure/closet/crate/medical, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/qShuttle) + +(1,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +"} +(2,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ac +ab +aa +aa +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +"} +(3,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ab +ab +ad +ai +ai +ai +ad +ab +ac +ab +ab +ab +ac +aa +aa +aa +aa +aa +"} +(4,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ab +ad +ad +aJ +aZ +aJ +ad +ad +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +"} +(5,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ad +ad +ad +aK +ba +bm +ad +ad +ad +bT +bV +ab +ab +ab +aa +aa +aa +aa +"} +(6,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ai +am +ad +aL +ba +bn +ad +bH +ai +ab +bW +ab +cg +cn +aa +aa +aa +aa +"} +(7,1,1) = {" +aa +aa +aa +aa +aa +aa +ae +aj +an +ad +ad +bb +ad +ad +bI +aj +ae +bW +ab +ch +ch +aa +aa +aa +aa +"} +(8,1,1) = {" +aa +aa +aa +aa +aa +aa +af +ak +ao +aw +aM +bc +bo +aD +bJ +ak +ae +bW +ab +ci +ab +aa +aa +aa +aa +"} +(9,1,1) = {" +aa +aa +aa +aa +aa +aa +ae +ak +ap +ax +aN +bd +bp +by +bK +ak +af +bW +ab +cj +ab +aa +aa +aa +aa +"} +(10,1,1) = {" +aa +aa +aa +aa +aa +aa +ae +al +ad +ay +aO +ad +bq +aA +ad +bS +ae +bW +ab +ck +ab +aa +aa +aa +aa +"} +(11,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ai +aq +az +aP +be +br +bz +bL +ai +ab +bW +bX +cl +ab +aa +aa +aa +aa +"} +(12,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ad +aq +aA +aQ +bf +bs +aA +aQ +ad +ab +bW +bY +ab +ab +aa +aa +aa +aa +"} +(13,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +ai +ar +aB +aQ +bg +bt +bA +bM +ai +ab +bW +bZ +ab +ab +aa +aa +aa +aa +"} +(14,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ad +ad +aC +aR +ad +bq +bB +ad +ad +ab +bW +ca +cm +ab +aa +aa +aa +aa +"} +(15,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ad +as +aD +aS +bh +aN +bC +bN +ad +bU +bW +cb +ab +ab +aa +aa +aa +aa +"} +(16,1,1) = {" +aa +aa +aa +aa +aa +ac +ab +ad +at +aE +aT +bi +bu +bD +bO +ad +ab +bW +cb +cb +aa +aa +aa +aa +aa +"} +(17,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ad +ad +ad +aU +ad +aU +ad +ad +ad +ab +bW +cb +cb +aa +aa +aa +aa +aa +"} +(18,1,1) = {" +aa +aa +aa +aa +aa +ab +ab +ad +au +aF +aV +bj +bv +bE +bP +ad +ab +bW +ab +ab +aa +aa +aa +aa +aa +"} +(19,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ad +av +aG +aA +aA +aA +aG +bQ +ad +ab +bW +cc +ab +aa +aa +aa +aa +aa +"} +(20,1,1) = {" +aa +aa +aa +aa +aa +aa +ab +ad +au +aH +aW +bk +bw +bF +bR +ad +ab +bW +cd +ab +aa +aa +aa +aa +aa +"} +(21,1,1) = {" +aa +aa +aa +aa +aa +ad +ad +ad +ad +ad +aX +aA +aV +ad +ad +ad +ad +ad +ce +ab +ab +aa +aa +aa +aa +"} +(22,1,1) = {" +aa +aa +aa +aa +aa +ad +ag +ad +ag +aI +aA +bl +bx +ad +ag +ad +ag +ad +ab +ab +ab +aa +aa +aa +aa +"} +(23,1,1) = {" +aa +aa +aa +aa +ab +ad +ah +ad +ah +ad +aY +aY +aY +bG +ah +ad +ah +ad +cf +ab +ac +aa +aa +aa +aa +"} +(24,1,1) = {" +aa +aa +aa +aa +ab +ac +ab +aa +aa +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} +(25,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +"} diff --git a/maps/expedition_vr/beach/submaps/ritual.dmm b/maps/expedition_vr/beach/submaps/ritual.dmm new file mode 100644 index 0000000000..9506d7e2cb --- /dev/null +++ b/maps/expedition_vr/beach/submaps/ritual.dmm @@ -0,0 +1,70 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CorgiRitual) +"b" = ( +/obj/structure/plushie/ian, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CorgiRitual) +"c" = ( +/obj/item/weapon/flame/candle/everburn, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CorgiRitual) +"d" = ( +/obj/structure/plushie/ian{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CorgiRitual) +"e" = ( +/obj/structure/plushie/ian{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CorgiRitual) +"f" = ( +/obj/structure/ghost_pod/manual/corgi, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CorgiRitual) +"g" = ( +/obj/structure/plushie/ian{ + dir = 1 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/CorgiRitual) + +(1,1,1) = {" +a +a +e +e +a +"} +(2,1,1) = {" +a +c +a +c +a +"} +(3,1,1) = {" +b +a +f +a +g +"} +(4,1,1) = {" +a +c +a +c +a +"} +(5,1,1) = {" +a +d +d +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/spatial_anomaly.dmm b/maps/expedition_vr/beach/submaps/spatial_anomaly.dmm new file mode 100644 index 0000000000..9b0f64aad9 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/spatial_anomaly.dmm @@ -0,0 +1,1256 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/solidrock, +/area/submap/spatial_anomaly) +"b" = ( +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"c" = ( +/obj/effect/map_effect/portal/master/side_a{ + dir = 4; + icon_state = "portal_side_a"; + portal_id = "spatial_anomaly_5" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"d" = ( +/obj/effect/map_effect/portal/master/side_b{ + dir = 8; + icon_state = "portal_side_b"; + portal_id = "spatial_anomaly_5" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"e" = ( +/obj/structure/barricade, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"f" = ( +/turf/template_noop, +/area/template_noop) +"g" = ( +/obj/effect/map_effect/portal/master/side_b{ + portal_id = "spatial_anomaly_4" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"h" = ( +/obj/effect/map_effect/portal/line/side_a{ + icon_state = "portal_line_side_a"; + dir = 4 + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"i" = ( +/obj/effect/map_effect/portal/line/side_b{ + icon_state = "portal_line_side_b"; + dir = 8 + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"j" = ( +/turf/simulated/floor/lava, +/area/submap/spatial_anomaly) +"k" = ( +/obj/item/weapon/disposable_teleporter/slime, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"l" = ( +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"m" = ( +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"n" = ( +/obj/effect/map_effect/portal/master/side_a{ + dir = 4; + icon_state = "portal_side_a"; + portal_id = "spatial_anomaly_3" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"o" = ( +/obj/effect/map_effect/portal/master/side_a{ + dir = 1; + icon_state = "portal_side_a"; + portal_id = "spatial_anomaly_4" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"p" = ( +/obj/effect/map_effect/portal/master/side_b{ + dir = 8; + icon_state = "portal_side_b"; + portal_id = "spatial_anomaly_3" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"q" = ( +/obj/effect/map_effect/portal/master/side_b{ + portal_id = "spatial_anomaly_2" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"r" = ( +/obj/effect/map_effect/portal/line/side_b, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"s" = ( +/obj/machinery/crystal/lava, +/turf/simulated/floor/lava, +/area/submap/spatial_anomaly) +"t" = ( +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"u" = ( +/obj/effect/map_effect/portal/master/side_a{ + portal_id = "spatial_anomaly_1" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"v" = ( +/obj/item/weapon/stool/padded, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"w" = ( +/obj/structure/table/steel_reinforced, +/obj/item/device/xenoarch_multi_tool, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"x" = ( +/turf/simulated/wall/solidrock, +/area/template_noop) +"y" = ( +/obj/random/technology_scanner, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"z" = ( +/obj/structure/table/steel_reinforced, +/obj/random/unidentified_medicine/scientific, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"A" = ( +/obj/structure/table/steel_reinforced, +/obj/random/tool/power, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"B" = ( +/obj/structure/table/steel_reinforced, +/obj/item/weapon/ore/diamond, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"C" = ( +/obj/structure/sign/warning/lava, +/turf/simulated/wall, +/area/submap/spatial_anomaly) +"D" = ( +/obj/effect/map_effect/portal/line/side_a, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"E" = ( +/obj/structure/table/rack, +/obj/item/weapon/pickaxe/jackhammer, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"F" = ( +/obj/effect/map_effect/portal/master/side_a{ + dir = 1; + icon_state = "portal_side_a"; + portal_id = "spatial_anomaly_2" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"G" = ( +/obj/effect/map_effect/portal/line/side_a{ + icon_state = "portal_line_side_a"; + dir = 1 + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"H" = ( +/turf/unsimulated/wall, +/area/template_noop) +"I" = ( +/obj/effect/map_effect/portal/master/side_b{ + dir = 1; + icon_state = "portal_side_b"; + portal_id = "spatial_anomaly_1" + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"J" = ( +/obj/effect/map_effect/portal/line/side_b{ + icon_state = "portal_line_side_b"; + dir = 1 + }, +/obj/effect/map_effect/perma_light/brighter{ + light_color = "#ff00ff" + }, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"K" = ( +/obj/item/weapon/mining_scanner, +/obj/structure/table/rack, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"L" = ( +/obj/item/weapon/storage/belt/archaeology, +/obj/effect/decal/remains/human, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"M" = ( +/obj/structure/bookcase/manuals/xenoarchaeology, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"N" = ( +/obj/item/weapon/pickaxe/brush, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"O" = ( +/obj/item/weapon/pickaxe/one_pick, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"P" = ( +/obj/item/weapon/pickaxe/four_pick, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"Q" = ( +/obj/effect/decal/remains/human, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) +"R" = ( +/obj/item/weapon/pickaxe/five_pick, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"S" = ( +/obj/item/weapon/pickaxe/six_pick, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"T" = ( +/obj/item/weapon/pickaxe/two_pick, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"U" = ( +/obj/item/device/measuring_tape, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"X" = ( +/obj/item/weapon/pickaxe/three_pick, +/turf/simulated/floor/outdoors/rocks/caves, +/area/submap/spatial_anomaly) +"Y" = ( +/obj/item/weapon/pickaxe/excavationdrill, +/turf/simulated/floor/plating/external, +/area/submap/spatial_anomaly) + +(1,1,1) = {" +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +"} +(2,1,1) = {" +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +"} +(3,1,1) = {" +f +f +f +f +f +f +f +f +x +a +a +a +a +a +x +x +x +x +f +f +f +f +f +f +f +f +f +f +f +f +"} +(4,1,1) = {" +f +f +f +f +f +x +a +a +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +f +f +f +f +f +f +f +"} +(5,1,1) = {" +f +f +f +x +a +a +a +a +a +a +a +l +b +b +b +b +b +a +a +a +a +a +a +a +f +f +f +f +f +f +"} +(6,1,1) = {" +f +f +x +a +a +a +a +a +a +a +a +b +a +a +a +a +R +a +a +a +a +a +a +a +a +a +a +f +f +f +"} +(7,1,1) = {" +f +f +x +a +t +g +b +O +b +a +a +b +a +a +a +a +b +a +a +a +b +T +b +I +t +a +a +f +f +f +"} +(8,1,1) = {" +f +f +x +a +a +a +a +b +b +a +a +b +a +a +a +a +p +a +a +l +b +b +b +J +t +a +a +f +f +f +"} +(9,1,1) = {" +f +f +x +a +a +a +a +a +b +a +a +b +a +a +a +a +t +a +a +b +a +b +b +J +t +a +a +f +f +f +"} +(10,1,1) = {" +f +f +x +a +t +t +a +a +l +a +a +b +b +b +o +t +a +a +a +b +a +a +a +a +a +a +f +f +f +f +"} +(11,1,1) = {" +f +f +x +a +c +h +a +a +b +a +a +a +a +a +a +a +a +a +a +b +b +b +b +b +a +a +f +f +f +f +"} +(12,1,1) = {" +f +f +x +a +b +b +a +a +b +b +t +a +a +a +a +a +a +a +a +a +a +X +b +l +a +a +a +f +f +f +"} +(13,1,1) = {" +f +f +x +a +b +b +a +b +b +b +t +t +B +a +a +t +q +b +b +b +b +b +b +b +a +a +a +f +f +f +"} +(14,1,1) = {" +f +x +a +a +b +b +b +b +y +b +t +v +w +a +a +t +r +b +b +b +a +a +a +a +a +a +a +f +f +f +"} +(15,1,1) = {" +f +x +a +a +b +b +C +N +b +t +t +t +z +a +a +t +r +b +b +b +b +b +b +b +a +a +a +f +f +f +"} +(16,1,1) = {" +f +x +a +a +j +b +b +b +b +m +t +Q +A +a +a +a +a +a +a +a +b +b +b +t +a +a +a +f +f +f +"} +(17,1,1) = {" +f +x +a +a +j +j +b +b +a +a +a +a +a +a +a +a +a +a +a +a +b +L +m +t +a +a +a +f +f +f +"} +(18,1,1) = {" +f +x +a +a +j +j +s +a +a +a +a +a +a +a +b +b +b +b +b +b +b +b +t +t +a +a +a +f +f +f +"} +(19,1,1) = {" +f +x +a +a +s +j +a +a +b +b +b +l +b +b +b +b +S +b +l +b +b +Y +t +M +a +a +a +f +f +f +"} +(20,1,1) = {" +f +f +x +a +j +j +a +a +P +b +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +f +"} +(21,1,1) = {" +f +f +x +a +k +b +a +a +b +a +a +a +a +t +a +a +a +a +a +a +a +a +a +a +a +a +f +f +f +f +"} +(22,1,1) = {" +f +f +x +a +b +b +a +a +b +a +a +a +a +n +a +a +t +u +b +b +U +b +F +t +a +a +f +f +f +f +"} +(23,1,1) = {" +f +f +x +a +d +i +a +a +b +a +a +a +a +b +a +a +t +D +b +b +b +b +G +t +a +a +f +f +f +f +"} +(24,1,1) = {" +f +f +x +a +t +t +a +a +l +b +b +b +b +b +a +a +t +D +b +b +b +b +G +t +a +a +f +f +f +f +"} +(25,1,1) = {" +f +f +f +x +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +b +b +a +a +a +a +f +f +f +f +f +"} +(26,1,1) = {" +f +f +f +f +x +a +a +a +a +a +a +a +a +a +a +a +a +b +e +l +E +a +a +a +f +f +f +f +f +f +"} +(27,1,1) = {" +f +f +f +f +f +f +f +x +a +a +a +a +f +H +f +f +H +l +e +b +K +a +a +f +f +f +f +f +f +f +"} +(28,1,1) = {" +f +f +f +f +f +f +f +f +f +f +f +f +f +H +f +f +H +b +a +a +a +a +f +f +f +f +f +f +f +f +"} +(29,1,1) = {" +f +f +f +f +f +f +f +f +f +f +f +f +f +H +H +H +a +a +a +a +f +f +f +f +f +f +f +f +f +f +"} +(30,1,1) = {" +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +f +"} diff --git a/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm b/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm new file mode 100644 index 0000000000..a817bd965c --- /dev/null +++ b/maps/expedition_vr/beach/submaps/speakeasy_vr.dmm @@ -0,0 +1,458 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/submap/Speakeasy) +"c" = ( +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"f" = ( +/obj/structure/table/gamblingtable, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"g" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"h" = ( +/obj/random/handgun, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"i" = ( +/obj/item/clothing/head/fedora, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"j" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"k" = ( +/obj/item/weapon/stool/padded, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"l" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"m" = ( +/obj/structure/table/woodentable, +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"n" = ( +/obj/structure/reagent_dispensers/beerkeg, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"o" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"p" = ( +/obj/machinery/media/jukebox, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"s" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"u" = ( +/obj/structure/table/gamblingtable, +/obj/machinery/light/poi{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"v" = ( +/obj/structure/table/fancyblack, +/obj/item/clothing/mask/smokable/cigarette/cigar, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"w" = ( +/turf/simulated/wall/wood, +/area/submap/Speakeasy) +"x" = ( +/obj/structure/bed/chair/sofa/left/blue{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"B" = ( +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"C" = ( +/turf/simulated/mineral/floor/cave, +/area/submap/Speakeasy) +"D" = ( +/obj/structure/bed/chair/sofa/corner/black{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"E" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"H" = ( +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"I" = ( +/obj/structure/table/woodentable, +/obj/random/drinkbottle, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"K" = ( +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/neutral, +/area/submap/Speakeasy) +"L" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"M" = ( +/obj/machinery/light/poi{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) +"N" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"O" = ( +/obj/machinery/light/poi{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"R" = ( +/obj/structure/bed/chair/sofa/black{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"U" = ( +/obj/structure/bed/chair/sofa/right/blue{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"V" = ( +/obj/structure/table/woodentable, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"W" = ( +/obj/structure/bed/chair/wood, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"X" = ( +/obj/structure/table/woodentable, +/obj/machinery/chemical_dispenser/bar_alc/full, +/turf/simulated/floor/wood, +/area/submap/Speakeasy) +"Y" = ( +/obj/structure/table/fancyblack, +/obj/random/cash/big, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/Speakeasy) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +w +w +w +w +w +w +w +w +w +w +w +a +a +a +a +"} +(3,1,1) = {" +a +w +n +i +h +w +X +B +V +B +p +w +w +w +a +a +"} +(4,1,1) = {" +a +w +n +B +B +w +H +B +N +k +B +x +D +w +a +a +"} +(5,1,1) = {" +a +w +w +j +j +w +w +B +I +k +B +f +R +w +a +a +"} +(6,1,1) = {" +a +w +B +B +B +B +w +O +N +k +B +f +U +w +w +a +"} +(7,1,1) = {" +a +w +M +Y +c +B +w +B +I +k +B +B +B +B +w +C +"} +(8,1,1) = {" +a +w +l +v +E +B +o +B +N +k +B +B +B +B +o +C +"} +(9,1,1) = {" +a +w +M +Y +c +B +w +B +N +k +B +B +B +B +w +C +"} +(10,1,1) = {" +a +w +B +B +B +B +w +B +I +k +B +B +B +B +w +a +"} +(11,1,1) = {" +a +w +w +w +w +w +w +B +B +B +K +K +K +s +w +a +"} +(12,1,1) = {" +a +a +w +f +g +B +B +B +B +B +K +K +K +f +w +a +"} +(13,1,1) = {" +a +a +w +L +B +W +N +N +g +B +K +K +K +L +w +a +"} +(14,1,1) = {" +a +a +w +w +B +W +m +N +g +B +W +u +g +w +w +a +"} +(15,1,1) = {" +a +a +a +w +w +w +w +w +w +w +w +w +w +w +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/temple.dmm b/maps/expedition_vr/beach/submaps/temple.dmm new file mode 100644 index 0000000000..53e0515434 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/temple.dmm @@ -0,0 +1,886 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/submap/AbandonedTemple) +"b" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/AbandonedTemple) +"c" = ( +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"d" = ( +/turf/simulated/wall/sandstone, +/area/submap/AbandonedTemple) +"e" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"f" = ( +/obj/effect/decal/remains/mummy1, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"g" = ( +/turf/simulated/wall/sandstonediamond, +/area/submap/AbandonedTemple) +"h" = ( +/obj/item/weapon/flame/candle/everburn, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"i" = ( +/obj/item/weapon/ectoplasm, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"j" = ( +/obj/structure/table/wooden_reinforced, +/obj/item/weapon/coin/iron, +/obj/item/weapon/coin/platinum, +/obj/item/weapon/coin/uranium, +/obj/item/weapon/coin/diamond, +/obj/item/weapon/coin/iron, +/obj/item/weapon/coin/uranium, +/obj/item/weapon/coin/iron, +/obj/item/weapon/coin/phoron, +/obj/item/weapon/coin/platinum, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"k" = ( +/obj/structure/table/wooden_reinforced, +/obj/item/weapon/coin/gold, +/obj/item/weapon/coin/gold, +/obj/item/weapon/coin/gold, +/obj/item/weapon/coin/silver, +/obj/item/weapon/coin/silver, +/obj/item/weapon/coin/silver, +/obj/item/weapon/coin/gold, +/obj/item/weapon/coin/gold, +/obj/item/weapon/coin/gold, +/obj/item/weapon/coin/silver, +/obj/item/weapon/coin/silver, +/obj/item/weapon/coin/silver, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"l" = ( +/obj/effect/decal/remains/xeno, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"m" = ( +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"n" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"o" = ( +/obj/structure/loot_pile/maint/technical, +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"p" = ( +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"q" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/flame/lighter/zippo/royal, +/obj/item/clothing/mask/smokable/pipe, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"r" = ( +/obj/effect/rune, +/obj/effect/decal/remains/human, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"s" = ( +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"t" = ( +/obj/machinery/artifact, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"u" = ( +/obj/structure/bed/chair/comfy/brown{ + dir = 4 + }, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"v" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/paper, +/obj/item/weapon/pen/fountain, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"w" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"x" = ( +/obj/effect/decal/cleanable/blood/xeno, +/obj/effect/decal/remains/posi, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"y" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/flame/candle/candelabra/everburn, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"z" = ( +/obj/structure/simple_door/gold, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"A" = ( +/obj/effect/decal/remains/posi, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"B" = ( +/obj/machinery/crystal{ + icon_state = "crystal3"; + light_color = "#f44256"; + light_power = 3 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/cave/crystal1) +"C" = ( +/obj/structure/flora/pottedplant/dead, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"D" = ( +/obj/machinery/crystal{ + icon_state = "crystal3"; + light_color = "#f44256"; + light_power = 3 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"E" = ( +/obj/effect/decal/remains/human, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"F" = ( +/obj/effect/decal/cleanable/blood, +/obj/effect/decal/remains/human, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"G" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/paper/alien{ + desc = ""; + icon_state = "alienpaper_words"; + info = "(On the screen of the tablet are several lines of characters written in a language you don't seem to recognize. At the end of each line is a set of numbers seperated by a colon. The screen flickers occasionally, as if damaged. Nothing about the tablet seems particularly interesting, but it does seem very, very old.)" + }, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"H" = ( +/obj/effect/decal/cleanable/blood/xeno, +/turf/simulated/floor/carpet/turcarpet, +/area/submap/AbandonedTemple) +"I" = ( +/obj/structure/table/bench/wooden, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"J" = ( +/obj/effect/decal/cleanable/cobweb, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"K" = ( +/obj/structure/table/bench/wooden, +/obj/effect/decal/remains/xeno, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"L" = ( +/obj/structure/simple_door/sandstone, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"M" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/item/weapon/flame/candle/candelabra/everburn, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"N" = ( +/obj/effect/decal/cleanable/cobweb2, +/obj/item/weapon/flame/candle/candelabra/everburn, +/turf/simulated/floor/tiled/asteroid_steel, +/area/submap/AbandonedTemple) +"O" = ( +/obj/effect/decal/cleanable/blood, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/AbandonedTemple) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +"} +(3,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +a +a +a +"} +(4,1,1) = {" +a +b +c +d +d +d +d +d +d +d +d +d +d +d +m +c +b +b +b +b +b +b +a +a +a +"} +(5,1,1) = {" +a +b +c +d +e +p +u +p +p +p +w +c +c +d +d +m +c +b +b +b +b +b +b +a +a +"} +(6,1,1) = {" +a +b +c +d +f +q +v +y +p +p +c +E +c +s +d +d +c +c +b +b +b +b +b +a +a +"} +(7,1,1) = {" +a +b +c +d +g +g +g +g +g +g +g +g +z +g +g +d +d +c +c +b +b +b +b +a +a +"} +(8,1,1) = {" +a +b +c +d +h +c +h +z +c +g +B +c +c +c +c +c +d +d +c +b +b +b +b +a +a +"} +(9,1,1) = {" +a +b +c +d +i +r +c +g +c +g +C +c +c +c +c +c +D +d +m +c +c +s +b +a +a +"} +(10,1,1) = {" +a +b +c +d +h +s +h +g +c +g +c +w +c +I +c +K +c +d +d +d +d +c +b +a +a +"} +(11,1,1) = {" +a +b +c +d +g +g +g +g +c +z +c +p +p +I +c +I +c +d +M +c +d +c +b +a +a +"} +(12,1,1) = {" +a +b +c +d +j +c +p +p +c +g +c +F +G +c +c +c +w +L +c +w +L +c +b +a +a +"} +(13,1,1) = {" +a +b +c +d +k +c +p +p +c +g +c +p +y +c +c +c +s +L +c +c +L +c +O +a +a +"} +(14,1,1) = {" +a +b +c +d +g +g +g +g +c +z +c +p +H +I +c +I +c +d +N +c +d +s +b +a +a +"} +(15,1,1) = {" +a +b +c +d +c +c +w +g +c +g +c +c +l +I +c +I +c +d +d +d +d +c +b +a +a +"} +(16,1,1) = {" +a +b +c +d +l +t +c +g +c +g +C +c +c +c +c +c +D +d +s +c +c +c +b +a +a +"} +(17,1,1) = {" +a +b +c +d +m +c +c +z +c +g +D +c +c +c +c +s +d +d +c +b +b +b +b +a +a +"} +(18,1,1) = {" +a +b +c +d +g +g +g +g +g +g +g +g +z +g +g +d +d +J +c +b +b +b +b +a +a +"} +(19,1,1) = {" +a +b +c +d +n +c +c +n +c +c +c +c +w +n +d +d +c +c +b +b +b +b +b +a +a +"} +(20,1,1) = {" +a +b +c +d +o +c +x +c +c +A +n +l +n +d +d +c +c +b +b +b +b +b +b +a +a +"} +(21,1,1) = {" +a +b +c +d +d +d +d +d +d +d +d +d +d +d +J +c +b +b +b +b +b +b +a +a +a +"} +(22,1,1) = {" +a +a +c +c +c +c +c +c +c +c +c +c +c +c +c +b +b +b +b +b +b +a +a +a +a +"} +(23,1,1) = {" +a +a +a +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +b +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/vault1.dmm b/maps/expedition_vr/beach/submaps/vault1.dmm new file mode 100644 index 0000000000..5f39b245ab --- /dev/null +++ b/maps/expedition_vr/beach/submaps/vault1.dmm @@ -0,0 +1,118 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/wall, +/area/submap/cave/vault1) +"c" = ( +/turf/simulated/floor/plating, +/area/submap/cave/vault1) +"d" = ( +/obj/structure/loot_pile/maint/technical, +/turf/simulated/floor/plating, +/area/submap/cave/vault1) +"e" = ( +/obj/random/multiple/minevault, +/turf/simulated/floor/plating, +/area/submap/cave/vault1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +b +b +b +b +b +a +a +"} +(3,1,1) = {" +a +b +b +c +c +c +b +b +a +"} +(4,1,1) = {" +a +b +c +c +c +c +c +b +a +"} +(5,1,1) = {" +a +b +d +c +e +c +c +b +a +"} +(6,1,1) = {" +a +b +c +c +c +c +c +b +a +"} +(7,1,1) = {" +a +b +b +c +c +c +b +b +a +"} +(8,1,1) = {" +a +a +b +b +b +b +b +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/vault2.dmm b/maps/expedition_vr/beach/submaps/vault2.dmm new file mode 100644 index 0000000000..016df627cd --- /dev/null +++ b/maps/expedition_vr/beach/submaps/vault2.dmm @@ -0,0 +1,114 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/wall, +/area/submap/cave/vault2) +"c" = ( +/turf/simulated/floor/plating, +/area/submap/cave/vault2) +"d" = ( +/obj/random/multiple/minevault, +/turf/simulated/floor/plating, +/area/submap/cave/vault2) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +b +b +a +a +a +b +b +a +"} +(3,1,1) = {" +a +b +b +b +b +b +b +b +a +"} +(4,1,1) = {" +a +a +b +c +c +c +b +a +a +"} +(5,1,1) = {" +a +a +b +c +d +c +b +a +a +"} +(6,1,1) = {" +a +a +b +c +c +c +b +a +a +"} +(7,1,1) = {" +a +b +b +b +b +b +b +b +a +"} +(8,1,1) = {" +a +b +b +a +a +a +b +b +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/vault3.dmm b/maps/expedition_vr/beach/submaps/vault3.dmm new file mode 100644 index 0000000000..16c4876348 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/vault3.dmm @@ -0,0 +1,141 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/wall, +/area/submap/cave/vault3) +"c" = ( +/obj/effect/alien/weeds, +/obj/random/multiple/minevault, +/turf/simulated/floor/plating, +/area/submap/cave/vault3) +"d" = ( +/obj/structure/loot_pile/maint/technical, +/obj/effect/alien/weeds, +/turf/simulated/floor/plating, +/area/submap/cave/vault3) +"e" = ( +/obj/effect/alien/weeds, +/mob/living/simple_mob/animal/space/alien/drone, +/turf/simulated/floor/plating, +/area/submap/cave/vault3) +"f" = ( +/obj/effect/alien/weeds, +/obj/effect/alien/weeds, +/turf/simulated/floor/plating, +/area/submap/cave/vault3) +"g" = ( +/obj/effect/alien/weeds, +/turf/simulated/floor/plating, +/area/submap/cave/vault3) +"h" = ( +/obj/effect/alien/weeds, +/obj/effect/alien/weeds, +/obj/effect/alien/weeds/node, +/turf/simulated/floor/plating, +/area/submap/cave/vault3) +"i" = ( +/obj/structure/bed/nest, +/turf/simulated/floor/plating, +/area/submap/cave/vault3) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +b +b +b +b +b +a +a +"} +(3,1,1) = {" +a +b +b +e +g +g +b +b +a +"} +(4,1,1) = {" +a +b +c +f +f +f +i +b +a +"} +(5,1,1) = {" +a +b +d +f +h +f +g +b +a +"} +(6,1,1) = {" +a +b +c +f +f +f +i +b +a +"} +(7,1,1) = {" +a +b +b +g +g +e +b +b +a +"} +(8,1,1) = {" +a +a +b +b +b +b +b +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/vault4.dmm b/maps/expedition_vr/beach/submaps/vault4.dmm new file mode 100644 index 0000000000..33851a5907 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/vault4.dmm @@ -0,0 +1,141 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/alien/wall, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault4) +"c" = ( +/obj/structure/simple_door/resin, +/obj/effect/alien/weeds, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault4) +"d" = ( +/obj/effect/alien/weeds, +/obj/structure/bed/nest, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault4) +"e" = ( +/obj/effect/alien/weeds, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault4) +"f" = ( +/obj/effect/alien/weeds, +/mob/living/simple_mob/animal/space/alien/drone, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault4) +"g" = ( +/obj/effect/alien/weeds/node, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault4) +"h" = ( +/obj/effect/alien/weeds, +/obj/random/multiple/minevault, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault4) +"i" = ( +/obj/effect/alien/weeds, +/mob/living/simple_mob/animal/space/alien, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault4) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +b +b +c +b +b +a +a +"} +(3,1,1) = {" +a +b +b +d +i +h +b +b +a +"} +(4,1,1) = {" +a +b +d +e +e +g +f +b +a +"} +(5,1,1) = {" +a +c +e +e +e +e +e +c +a +"} +(6,1,1) = {" +a +b +f +g +e +e +d +b +a +"} +(7,1,1) = {" +a +b +b +h +i +d +b +b +a +"} +(8,1,1) = {" +a +a +b +b +c +b +b +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/vault5.dmm b/maps/expedition_vr/beach/submaps/vault5.dmm new file mode 100644 index 0000000000..3831106ee4 --- /dev/null +++ b/maps/expedition_vr/beach/submaps/vault5.dmm @@ -0,0 +1,151 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/alien/wall, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) +"c" = ( +/obj/structure/simple_door/resin, +/obj/effect/alien/weeds, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) +"d" = ( +/obj/effect/alien/weeds, +/obj/structure/bed/nest, +/obj/item/weapon/gun/projectile/p92x/large, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) +"e" = ( +/obj/effect/alien/weeds, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) +"f" = ( +/obj/effect/alien/weeds, +/obj/item/clothing/suit/storage/vest/tactical, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) +"g" = ( +/obj/effect/alien/weeds, +/obj/structure/bed/nest, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) +"h" = ( +/obj/effect/alien/weeds, +/obj/random/multiple/minevault, +/mob/living/simple_mob/animal/space/alien/sentinel/praetorian, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) +"j" = ( +/obj/effect/alien/weeds, +/obj/effect/alien/weeds/node, +/mob/living/simple_mob/animal/space/alien/queen/empress, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) +"k" = ( +/obj/effect/alien/weeds, +/obj/item/clothing/head/helmet/tac, +/obj/item/weapon/gun/projectile/SVD, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault5) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +b +b +b +b +b +a +a +"} +(3,1,1) = {" +a +b +b +g +e +h +b +b +a +"} +(4,1,1) = {" +a +b +d +e +e +e +k +b +a +"} +(5,1,1) = {" +a +c +e +e +j +e +e +c +a +"} +(6,1,1) = {" +a +b +f +e +e +e +g +b +a +"} +(7,1,1) = {" +a +b +b +h +e +g +b +b +a +"} +(8,1,1) = {" +a +a +b +b +b +b +b +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/expedition_vr/beach/submaps/vault6.dmm b/maps/expedition_vr/beach/submaps/vault6.dmm new file mode 100644 index 0000000000..d4200ba5ab --- /dev/null +++ b/maps/expedition_vr/beach/submaps/vault6.dmm @@ -0,0 +1,206 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 6 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"c" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 2 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"d" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 10 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"e" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 6 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"f" = ( +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"g" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 10 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"h" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"i" = ( +/mob/living/simple_mob/humanoid/merc/ranged/grenadier, +/turf/simulated/floor/cult, +/area/submap/cave/vault6) +"j" = ( +/turf/simulated/floor/cult, +/area/submap/cave/vault6) +"k" = ( +/obj/random/tool/power, +/obj/random/tech_supply, +/turf/simulated/floor/cult, +/area/submap/cave/vault6) +"l" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"m" = ( +/obj/structure/bonfire/permanent/sifwood, +/obj/structure/grille/rustic, +/turf/simulated/floor/cult, +/area/submap/cave/vault6) +"n" = ( +/obj/random/multiple/minevault, +/turf/simulated/floor/cult, +/area/submap/cave/vault6) +"o" = ( +/obj/structure/cliff/automatic/corner, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"p" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 5 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"q" = ( +/obj/structure/cliff/automatic{ + icon_state = "cliffbuilder"; + dir = 9 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"r" = ( +/obj/structure/cliff/automatic/corner{ + icon_state = "cliffbuilder-corner"; + dir = 9 + }, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) +"s" = ( +/obj/structure/cliff/automatic, +/turf/simulated/mineral/floor/ignore_mapgen/cave, +/area/submap/cave/vault6) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +b +h +h +h +o +a +a +"} +(3,1,1) = {" +a +b +e +f +f +f +p +o +a +"} +(4,1,1) = {" +a +c +f +i +j +n +f +s +a +"} +(5,1,1) = {" +a +c +f +j +m +j +f +s +a +"} +(6,1,1) = {" +a +c +f +k +j +j +f +s +a +"} +(7,1,1) = {" +a +d +g +f +f +f +q +r +a +"} +(8,1,1) = {" +a +a +d +l +l +l +r +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/gateway_vr/eggnogtown.dmm b/maps/gateway_vr/eggnogtown.dmm index 3219728088..de787f7cab 100644 --- a/maps/gateway_vr/eggnogtown.dmm +++ b/maps/gateway_vr/eggnogtown.dmm @@ -1284,7 +1284,7 @@ }, /area/gateway/eggnogtown/greenhouse) "kG" = ( -/obj/machinery/telecomms/relay/preset/tether, +/obj/machinery/telecomms/relay, /turf/simulated/floor/reinforced, /area/gateway/eggnogtown/gateway) "kI" = ( @@ -1502,6 +1502,7 @@ "nd" = ( /obj/structure/bed/double, /obj/structure/lattice, +/obj/structure/curtain/black, /turf/simulated/open, /area/gateway/eggnogtown/houserhomestead) "ne" = ( @@ -3111,7 +3112,7 @@ }, /obj/item/weapon/card/id{ access = list(777); - name = "Houser's secret hidde keycard"; + name = "Houser's secret hidden keycard"; registered_name = "Houser" }, /obj/machinery/light/small{ diff --git a/maps/gateway_vr/eggnogtownunderground.dmm b/maps/gateway_vr/eggnogtownunderground.dmm index c88b450f4c..d7ea90b144 100644 --- a/maps/gateway_vr/eggnogtownunderground.dmm +++ b/maps/gateway_vr/eggnogtownunderground.dmm @@ -1,52 +1,164 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) "ab" = ( /turf/simulated/mineral/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) +"ac" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/underground) "ad" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/underground) -"ae" = ( /obj/machinery/light/small, /turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/hotspring) -"af" = ( -/obj/machinery/light/small{ - dir = 8 - }, +"ae" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b, /turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/underground) -"ag" = ( -/obj/machinery/camera/network/civilian{ - dir = 8 - }, +"af" = ( /turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"ag" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/underground) "ah" = ( -/obj/machinery/camera/network/civilian{ - dir = 5 - }, +/obj/random/mob/semirandom_mob_spawner/vore/retaliate, /turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 }, /area/gateway/eggnogtown/underground) "ai" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"aj" = ( +/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"ak" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/hotsprings) +"al" = ( /obj/machinery/light/small{ dir = 4 }, /turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/hotsprings) +"am" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; temperature = 258.15 }, /area/gateway/eggnogtown/underground) +"an" = ( +/obj/machinery/camera/network/civilian{ + dir = 8 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) +"ao" = ( +/obj/random/mob/semirandom_mob_spawner/vore/hostile, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"ap" = ( +/obj/random/awayloot, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 303.15 + }, +/area/gateway/eggnogtown/underground) +"aq" = ( +/obj/machinery/camera/network/civilian{ + dir = 5 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) +"ar" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/mineral/floor/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/underground) +"as" = ( +/turf/simulated/mineral/ignore_cavegen{ + nitrogen = 82.1472; + oxygen = 21.8366; + temperature = 258.15 + }, +/area/gateway/eggnogtown/vibeout) "ba" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/chemical_dispenser/bar_alc/full, @@ -91,7 +203,7 @@ check_arrest = 0; check_down = 0; check_records = 0; - control_area = /area/submap/admin_upload/lo/pow; + control_area = /area/gateway/eggnogtown/houserhomestead/basement; desc = "A firewall prevents AIs from interacting with this device."; lethal_is_configurable = 0; name = "DEATH RAY CONTROL"; @@ -142,7 +254,7 @@ }, /area/gateway/eggnogtown/vibeout) "gA" = ( -/turf/unsimulated/beach/water{ +/turf/simulated/floor/beach/water{ name = "hot spring"; temperature = 303.15 }, @@ -166,12 +278,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/hotspring) -"hz" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/underground) "hM" = ( /obj/structure/curtain, /turf/simulated/floor/wood{ @@ -199,12 +305,6 @@ temperature = 303.15 }, /area/gateway/eggnogtown/hotsprings) -"jz" = ( -/obj/random/awayloot, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "kA" = ( /turf/simulated/wall/iron, /area/gateway/eggnogtown/underground) @@ -231,14 +331,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/vibeout) -"kV" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/hotsprings) "lo" = ( /obj/structure/bed/chair/sofa/right, /turf/simulated/floor/wood{ @@ -267,7 +359,7 @@ /obj/machinery/light/small{ dir = 8 }, -/turf/unsimulated/beach/water{ +/turf/simulated/floor/beach/water{ name = "hot spring"; temperature = 303.15 }, @@ -276,12 +368,6 @@ /obj/structure/simple_door/silver, /turf/simulated/floor/tiled/steel_ridged, /area/gateway/eggnogtown/hotspring) -"mF" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "nh" = ( /obj/structure/bed/chair/sofa/black/corner, /turf/simulated/floor/plating/eris/under{ @@ -294,12 +380,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/hotspring) -"ob" = ( -/obj/random/mob/semirandom_mob_spawner/vore/hostile, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "pn" = ( /obj/structure/bed/chair/bay/comfy/red{ dir = 1 @@ -345,7 +425,7 @@ /area/gateway/eggnogtown/vibeout) "sc" = ( /obj/random/mob/semirandom_mob_spawner/vore/passive, -/turf/unsimulated/beach/water{ +/turf/simulated/floor/beach/water{ name = "hot spring"; temperature = 303.15 }, @@ -423,14 +503,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/houserhomestead/basement) -"vs" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/hotsprings) "vv" = ( /obj/machinery/media/jukebox, /turf/simulated/floor/wood{ @@ -459,12 +531,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/vibeout) -"vZ" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "ws" = ( /obj/structure/railing, /obj/structure/railing{ @@ -499,11 +565,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/hotspring) -"yD" = ( -/turf/simulated/mineral/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/vibeout) "yM" = ( /obj/structure/table/bench/wooden, /turf/simulated/floor/wood{ @@ -532,11 +593,6 @@ "Ce" = ( /turf/simulated/wall/iron, /area/gateway/eggnogtown/vibeout) -"Da" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 303.15 - }, -/area/gateway/eggnogtown/underground) "Ds" = ( /obj/structure/closet/walllocker{ pixel_y = 26 @@ -572,18 +628,6 @@ temperature = 258.15 }, /area/gateway/eggnogtown/vibeout) -"Gy" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/underground) -"GM" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate/c, -/turf/simulated/mineral/floor/ignore_cavegen{ - temperature = 258.15 - }, -/area/gateway/eggnogtown/underground) "GR" = ( /turf/simulated/wall/iron, /area/gateway/eggnogtown/houserhomestead/basement) @@ -699,9 +743,10 @@ temperature = 303.15 }, /area/gateway/eggnogtown/hotsprings) -"Qe" = ( -/obj/random/mob/semirandom_mob_spawner/vore/retaliate/b, -/turf/simulated/mineral/floor/ignore_cavegen{ +"QL" = ( +/obj/effect/map_effect/interval/effect_emitter/steam, +/turf/simulated/floor/beach/water{ + name = "hot spring"; temperature = 303.15 }, /area/gateway/eggnogtown/underground) @@ -1058,9 +1103,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -1200,16 +1245,16 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -Da -Da -kV -Da +af +af +ak +af ab ab ab @@ -1225,7 +1270,7 @@ ab ab ab ab -Da +af ab ab kA @@ -1341,18 +1386,18 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -1364,13 +1409,13 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da -kV +af +af +af +af +af +af +ak ab ab ab @@ -1481,21 +1526,21 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -Da -Da +af +af gA gA gA -Da -Da +af +af ab ab gA @@ -1505,14 +1550,14 @@ gA ab ab ab -Da -Da +af +af gA gA gA gA gA -Da +af ab ab ab @@ -1622,23 +1667,23 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -Da -Da +af +af gA gA gA gA gA -Da -Da +af +af ab gA gA @@ -1646,8 +1691,8 @@ sc gA gA ab -Da -Da +af +af gA gA gA @@ -1656,8 +1701,8 @@ gA gA gA gA -Da -Da +af +af ab ab ab @@ -1764,32 +1809,32 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -Da -Da +af +af gA gA gA gA gA gA -Da +af ab gA gA +QL gA gA gA -gA -Da -Da +af +af gA gA gA @@ -1799,8 +1844,8 @@ gA gA gA gA -Da -Da +af +af ab ab ab @@ -1906,15 +1951,15 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -Da +af gA gA gA @@ -1922,16 +1967,16 @@ gA gA gA gA -Da -Da +af +af gA gA gA gA gA gA -Da -Da +af +af gA gA gA @@ -1941,8 +1986,8 @@ gA gA gA gA -Da -Da +af +af ab ab ab @@ -2047,16 +2092,16 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -Da +af gA gA gA @@ -2065,26 +2110,26 @@ gA gA gA gA -Da +af ab -Da +af gA gA gA -Da -Da -Da +af +af +af +gA +gA +gA +gA +QL gA gA gA gA gA -gA -gA -gA -gA -gA -Da +af ab ab ab @@ -2189,8 +2234,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2198,24 +2243,24 @@ ab ab ab ab -Da +af +gA +gA +gA +QL gA gA gA gA -gA -gA -gA -gA -Da -Da -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af +af +af gA gA gA @@ -2226,7 +2271,7 @@ gA gA gA gA -Da +af ab ab ab @@ -2331,7 +2376,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -2348,8 +2393,8 @@ gA gA gA gA -Da -Da +af +af cb cb cb @@ -2357,8 +2402,8 @@ cb cb cb cb -Da -Da +af +af gA gA gA @@ -2367,8 +2412,8 @@ gA gA gA gA -Da -Da +af +af ab ab ab @@ -2472,8 +2517,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2483,15 +2528,15 @@ ab ab ab ab -Da +af gA gA gA gA gA -Da -Da -Da +af +af +af cb cb cb @@ -2499,9 +2544,9 @@ cb cb cb cb -Da -Da -Da +af +af +af gA gA gA @@ -2509,7 +2554,7 @@ gA gA gA gA -Da +af ab ab ab @@ -2614,8 +2659,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2625,14 +2670,14 @@ ab ab ab ab -Da +af gA gA gA gA -Da -Da -Da +af +af +af Kk iV cb @@ -2644,14 +2689,14 @@ de Kk ab ab -Da -Da +af +af gA gA gA gA -Da -Da +af +af ab ab ab @@ -2756,8 +2801,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2767,13 +2812,13 @@ ab ab ab ab -Da -Da -Da +af +af +af gA -Da -Da -Da +af +af +af ab Kk Ds @@ -2787,12 +2832,12 @@ Kk ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -2898,8 +2943,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -2911,9 +2956,9 @@ ab ab ab ab -Da -vs -Da +af +al +af ab ab ab @@ -2930,9 +2975,9 @@ ab ab ab ab -Da -vs -Da +af +al +af ab ab ab @@ -3039,8 +3084,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3181,8 +3226,8 @@ ab ab ab ab -GM -ad +ag +aa ab ab ab @@ -3323,8 +3368,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3338,8 +3383,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3465,8 +3510,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3478,9 +3523,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -3607,8 +3652,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3618,9 +3663,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -3749,8 +3794,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -3759,10 +3804,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -3771,9 +3816,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -3891,19 +3936,19 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -3913,13 +3958,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -4033,18 +4078,18 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -4057,12 +4102,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -4177,14 +4222,14 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -4201,10 +4246,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -4319,34 +4364,34 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -GM -ad -ad -ad +aa +aa +aa +aa +ag +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -4461,34 +4506,34 @@ ab ab ab ab -ad -ad +aa +aa ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab -ad -ad +aa +aa ab ab ab @@ -4602,36 +4647,36 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -GM -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +ag +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab -ad -GM -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +ag +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -4743,36 +4788,36 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -ad -GM -ad +aa +ag +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -4784,11 +4829,11 @@ ab ab ab ab -ad +aa ab -ad -af -ad +aa +am +aa ab ab ab @@ -4885,12 +4930,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -4899,21 +4944,21 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -4926,11 +4971,11 @@ ab ab ab ab -ad -ad -ad -ag -ad +aa +aa +aa +an +aa ab ab ab @@ -5026,9 +5071,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -5042,15 +5087,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -5065,10 +5110,10 @@ ab ab ab ab -ad -ad -GM -ad +aa +aa +ag +aa ab ab kA @@ -5165,11 +5210,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -5184,15 +5229,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -5205,12 +5250,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -5305,12 +5350,12 @@ ab ab ab ab -ad -ad -ad -GM -ad -ad +aa +aa +aa +ag +aa +aa ab ab ab @@ -5327,14 +5372,14 @@ ab ab ab ab -ad +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -5346,12 +5391,12 @@ ab ab ab ab -ad -ad -GM -ad -ad -ad +aa +aa +ag +aa +aa +aa ab ab ab @@ -5446,13 +5491,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -5468,14 +5513,14 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -5486,11 +5531,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -5588,12 +5633,12 @@ ab ab ab ab -ad -GM -ad -ad -GM -ad +aa +ag +aa +aa +ag +aa ab ab ab @@ -5608,16 +5653,16 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -5626,9 +5671,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -5731,11 +5776,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -5748,17 +5793,17 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -5768,8 +5813,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -5889,18 +5934,18 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -5908,9 +5953,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -6029,33 +6074,33 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab ab -ad -GM -ad -ad -ad -GM +aa +ag +aa +aa +aa +ag ab ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad +aa ab ab ab @@ -6170,34 +6215,34 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -GM -ad +aa +ag +aa ab -ad -ad +aa +aa ab ab ab @@ -6312,34 +6357,34 @@ ab ab ab ab -ad -GM -GM -ad +aa +ag +ag +aa ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab -ad -GM +aa +ag ab ab ab @@ -6453,35 +6498,35 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -6595,21 +6640,21 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab -GM -ad -ad +ag +aa +aa ab ab ab @@ -6617,13 +6662,13 @@ ab ab ab ab -ad +aa ab ab -ad -GM -GM -ad +aa +ag +ag +aa ab ab ab @@ -6631,11 +6676,11 @@ ab ab ab ab -ad +aa ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -6737,35 +6782,35 @@ ab ab ab ab -ad -GM -ad -ad -ad -ad -ad -ad -ad +aa +ag +aa +aa +aa +aa +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -6773,12 +6818,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -6879,50 +6924,50 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab ab -ad +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -7021,8 +7066,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7035,37 +7080,37 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad +aa ab ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -7163,8 +7208,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7190,24 +7235,24 @@ ab ab ab ab -ad +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -Gy -ad -Gy -ad +ae +aa +ae +aa ab ab ab @@ -7305,7 +7350,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -7331,24 +7376,24 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -7447,7 +7492,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -7474,23 +7519,23 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7589,8 +7634,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7616,15 +7661,15 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -7632,8 +7677,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7731,8 +7776,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7759,14 +7804,14 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -7775,7 +7820,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -7873,8 +7918,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -7890,9 +7935,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -7902,23 +7947,23 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -8016,7 +8061,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -8030,10 +8075,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8045,24 +8090,24 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8074,14 +8119,14 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab -ad -ad +aa +aa ab ab ab @@ -8158,22 +8203,22 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -8187,25 +8232,25 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -Gy -ad +aa +aa +aa +aa +aa +aa +aa +ae +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8215,16 +8260,16 @@ ab ab ab ab -ad -ad -Gy -ad -ad -ad -ad -ad -ad -ad +aa +aa +ae +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -8301,19 +8346,19 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -8329,14 +8374,14 @@ ab ab ab ab -ad +aa ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -8345,9 +8390,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8357,16 +8402,16 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab -ad -Gy -ad +aa +ae +aa ab ab ab @@ -8444,18 +8489,18 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -8471,14 +8516,14 @@ ab ab ab ab -ad +aa ab ab -ad -Gy -ad -ad -ad +aa +ae +aa +aa +aa ab ab ab @@ -8487,9 +8532,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8498,18 +8543,18 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8586,18 +8631,18 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8607,20 +8652,20 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8629,29 +8674,29 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8730,14 +8775,14 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -8749,15 +8794,15 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8772,18 +8817,18 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8792,8 +8837,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -8872,15 +8917,15 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -8891,15 +8936,15 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -8909,22 +8954,22 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab -ad +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -8934,8 +8979,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9015,33 +9060,33 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab -ad +aa ab ab ab -ad -ad +aa +aa ab ab ab @@ -9052,20 +9097,20 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -Gy +aa +ae ab -ad -Gy -ad -ad +aa +ae +aa +aa ab ab ab @@ -9076,9 +9121,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -9158,33 +9203,33 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -ad +aa ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab @@ -9195,17 +9240,17 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -9219,11 +9264,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -9300,34 +9345,34 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab -ad +aa ab ab -ad -ad +aa +aa ab ab -ad -ad +aa +aa ab ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab @@ -9338,8 +9383,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9361,12 +9406,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -9443,34 +9488,34 @@ ab ab ab ab -ad +aa ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab -ad +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9480,8 +9525,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9504,12 +9549,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -9563,7 +9608,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -9585,34 +9630,34 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad +aa ab ab ab @@ -9622,8 +9667,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9647,10 +9692,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -9704,8 +9749,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9727,17 +9772,17 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -ad -hz -ad +aa +aa +aa +aa +aa +ac +aa ab ab ab @@ -9747,15 +9792,15 @@ ab ab ab ab -ad +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9764,8 +9809,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9788,10 +9833,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -9845,8 +9890,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -9869,35 +9914,35 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -9905,9 +9950,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -9930,10 +9975,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -9987,7 +10032,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -10011,21 +10056,21 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10034,10 +10079,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10047,9 +10092,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -10071,11 +10116,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -10110,11 +10155,11 @@ ab ab ab ab -yD -yD -yD -yD -yD +as +as +as +as +as ab ab ab @@ -10128,8 +10173,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -10153,22 +10198,22 @@ ab ab ab ab -ad +aa ab ab ab -ad -ad -hz -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +ac +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10177,21 +10222,21 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10213,11 +10258,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -10252,11 +10297,11 @@ ab ab ab ab -yD +as vW Hk UX -yD +as ab ab ab @@ -10269,8 +10314,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -10294,23 +10339,23 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10322,17 +10367,17 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10355,10 +10400,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10394,11 +10439,11 @@ ab ab ab ab -yD +as eY rj UX -yD +as ab ab ab @@ -10410,8 +10455,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -10435,24 +10480,24 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10465,16 +10510,16 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10496,10 +10541,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10536,11 +10581,11 @@ ab ab ab ab -yD +as AJ AJ AJ -yD +as ab ab ab @@ -10551,9 +10596,9 @@ ab ab ab ab -ad -Gy -ad +aa +ae +aa ab ab ab @@ -10576,9 +10621,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -10587,15 +10632,15 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10608,13 +10653,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10638,10 +10683,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10676,15 +10721,15 @@ ab ab ab ab -yD -yD -yD +as +as +as YM YM YM -yD -yD -yD +as +as +as ab ab ab @@ -10692,9 +10737,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -10702,8 +10747,8 @@ ab ab ab ab -Da -Da +af +af ab ab ab @@ -10714,12 +10759,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -10730,14 +10775,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10751,8 +10796,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -10778,10 +10823,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -10818,7 +10863,7 @@ ab ab ab ab -yD +as rj rj rj @@ -10826,16 +10871,16 @@ rj rj rj rj -yD -yD -yD +as +as +as ab ab ab ab ab -ad -ad +aa +aa uh uh uh @@ -10843,10 +10888,10 @@ uh uh uh uh -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -10858,9 +10903,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -10873,14 +10918,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -10894,7 +10939,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -10909,21 +10954,21 @@ ab ab ab ab -ad -ad -ad -ad -ad -ah -ad -ad -ad +aa +aa +aa +aa +aa +aq +aa +aa +aa ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -10970,14 +11015,14 @@ tf su Gs rj -yD -yD +as +as ab ab ab -ad -ad -ad +aa +aa +aa uh yM yM @@ -10985,11 +11030,11 @@ yM xH gP uh -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -11016,14 +11061,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11036,7 +11081,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -11049,22 +11094,22 @@ ab ab ab ab -ad -ad -Gy -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11095,13 +11140,13 @@ lq "} (73,1,1) = {" lq -yD -yD -yD -yD -yD -yD -yD +as +as +as +as +as +as +as rj tf TU @@ -11113,13 +11158,13 @@ su Tx rj Jz -yD +as ab ab ab -ad -ad -ad +aa +aa +aa uh yM bX @@ -11127,12 +11172,12 @@ xH xH xH mf -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -11159,13 +11204,13 @@ ab ab ab ab -ad -ad -ad -hz -ad -ad -ad +aa +aa +aa +ac +aa +aa +aa ab ab ab @@ -11177,8 +11222,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -11191,21 +11236,21 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab -ai -ad -ad -ad -ad -ad -ad -ad +ar +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11237,7 +11282,7 @@ lq "} (74,1,1) = {" lq -yD +as Ce Ce xk @@ -11255,12 +11300,12 @@ su iu rj ba -yD +as ab ab +aa +aa ad -ad -ae uh uh uG @@ -11269,13 +11314,13 @@ xH Xs uh uh -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af ab ab ab @@ -11301,13 +11346,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -hz -ad +aa +aa +aa +aa +aa +ac +aa ab ab ab @@ -11318,14 +11363,14 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -Da -Da +af +af ab ab ab @@ -11342,10 +11387,10 @@ ab ab kA kA -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -11379,7 +11424,7 @@ lq "} (75,1,1) = {" lq -yD +as Ce Rv rj @@ -11396,13 +11441,13 @@ AJ su iu rj -yD -yD -yD +as +as +as ab -ad -ad -ad +aa +aa +aa HV xH xH @@ -11410,15 +11455,15 @@ xH xH xA Ou -Da -Da +af +af gA gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -11443,14 +11488,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11459,16 +11504,16 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -11483,10 +11528,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -11521,7 +11566,7 @@ lq "} (76,1,1) = {" lq -yD +as Ce Ce rj @@ -11538,12 +11583,12 @@ gf tf rj rj -yD +as tI zz -ad -ad -ad +aa +aa +aa uh uh sm @@ -11552,15 +11597,15 @@ xH xH Oy vJ -Da -Da +af +af gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -11585,33 +11630,33 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab -ad +aa ab ab ab ab -Da -Da -Da -ob -Da -Da +af +af +af +ao +af +af ab ab ab @@ -11625,10 +11670,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -11663,13 +11708,13 @@ lq "} (77,1,1) = {" lq -yD -yD -yD +as +as +as hM hM -yD -yD +as +as rj tf TU @@ -11683,9 +11728,9 @@ rj tI tI zz -ad -ad -ad +aa +aa +aa uh lo nD @@ -11694,17 +11739,17 @@ xH xH We vJ -Da -Da +af +af gA gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -11728,17 +11773,17 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -11748,13 +11793,13 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af ab ab ab @@ -11766,10 +11811,10 @@ ab ab ab ab -ad -ad -Gy -ad +aa +aa +ae +aa ab ab ab @@ -11807,10 +11852,10 @@ lq lq ab ab -yD +as Pb lX -yD +as ab rj tf @@ -11821,13 +11866,13 @@ tf tf tf rj -yD +as tI qr up -ad -ad -ad +aa +aa +aa uh eo XC @@ -11836,18 +11881,18 @@ xH xH OL TN -Da -Da +af +af gA gA gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -11870,12 +11915,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -11889,14 +11934,14 @@ ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA -Da -Da +af +af ab ab ab @@ -11908,10 +11953,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -11949,12 +11994,12 @@ lq lq ab ab -yD -yD -yD -yD +as +as +as +as ab -yD +as rj rj rj @@ -11962,14 +12007,14 @@ rj rj vv wu -yD -yD +as +as tI qr DZ -ad -ad -ad +aa +aa +aa uh uh uh @@ -11978,19 +12023,68 @@ uh uh uh uh -Da -Da +af +af +gA +gA +QL +gA +gA +gA +ai +af +af +af +af +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ac +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +ab +af +af +af gA gA gA gA -gA -gA -mF -Da -Da -Da -Da +af +af ab ab ab @@ -12000,59 +12094,10 @@ ab ab ab ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -hz -ad -ad -ad -ad -ad -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -ab -Da -Da -Da -gA -gA -gA -gA -Da -Da -ab -ab -ab -ab -ab -ab -ab -ab -ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -12096,22 +12141,22 @@ ab ab ab ab -yD -yD -yD +as +as +as YM YM YM -yD -yD -yD -yD +as +as +as +as tI qr up -ad -ad -ad +aa +aa +aa ab ab ab @@ -12120,8 +12165,8 @@ ab ab ab ab -Da -Da +af +af gA gA gA @@ -12129,11 +12174,11 @@ gA gA gA gA -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -12154,12 +12199,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12171,17 +12216,17 @@ ab ab ab ab -Da -Da -Da -jz +af +af +af +ap gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -12191,10 +12236,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -12240,20 +12285,20 @@ ab ab ab ab -yD +as AJ AJ AJ -yD +as ab ab -yD +as Ki Ki ws -ad -ad -ad +aa +aa +aa ab ab ab @@ -12261,9 +12306,9 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -12272,12 +12317,12 @@ gA gA gA gA -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -12296,12 +12341,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12313,17 +12358,17 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -12333,15 +12378,15 @@ ab ab ab ab -Gy -ad -ad +ae +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -12382,19 +12427,19 @@ ab ab ab ab -yD +as kS Wr ZR -yD +as ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -12403,10 +12448,10 @@ ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA gA @@ -12415,11 +12460,11 @@ gA gA gA gA -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -12438,12 +12483,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12454,18 +12499,18 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA +QL gA gA gA -gA -Da -Da +af +af ab ab ab @@ -12474,16 +12519,16 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -12524,19 +12569,19 @@ ab ab ab ab -yD +as nh KY Aw -yD +as ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -12544,25 +12589,25 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da -vZ -Da +af +af +af +af +af +af +ah +af gA gA gA gA gA gA -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -12580,12 +12625,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12596,18 +12641,18 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -12616,15 +12661,15 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -12666,33 +12711,33 @@ ab ab ab ab -yD -yD -yD -yD -yD +as +as +as +as +as ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af gA gA gA @@ -12701,10 +12746,10 @@ gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -12722,12 +12767,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -12738,18 +12783,18 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -12757,15 +12802,15 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -12815,21 +12860,21 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -12840,13 +12885,13 @@ gA gA gA gA -Da -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af +af ab ab ab @@ -12862,11 +12907,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -12879,19 +12924,19 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af gA gA gA -Da +af ab ab -Da +af ab ab ab @@ -12899,14 +12944,14 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab @@ -12956,22 +13001,22 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA gA @@ -12982,12 +13027,12 @@ gA gA gA gA -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -13002,13 +13047,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -13021,13 +13066,13 @@ ab ab ab ab -Da -Da -Da -Da -ob -Da -Da +af +af +af +af +ao +af +af ab ab ab @@ -13041,14 +13086,14 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13098,21 +13143,21 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -13123,12 +13168,12 @@ gA gA gA gA -Da -Qe -Da -Da -Da -Da +af +aj +af +af +af +af ab ab ab @@ -13143,13 +13188,13 @@ ab ab ab ab -ad -ad -ad -ad -hz -ad -ad +aa +aa +aa +aa +ac +aa +aa ab ab ab @@ -13163,12 +13208,12 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -13183,13 +13228,13 @@ ab ab ab ab -ad +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13239,21 +13284,21 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da +af +af gA gA gA @@ -13265,10 +13310,10 @@ gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -13281,14 +13326,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -13306,12 +13351,12 @@ ab ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -13330,8 +13375,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13380,22 +13425,22 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da +af +af +af gA gA gA @@ -13405,10 +13450,10 @@ gA gA gA gA -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -13423,13 +13468,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -13441,19 +13486,19 @@ ab ab ab ab -ad +aa ab ab ab ab ab ab -Da -Da -Da -Da -Da -Da +af +af +af +af +af +af ab ab ab @@ -13472,8 +13517,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13521,33 +13566,33 @@ ab ab ab ab -ad -ad -hz -ad -ad -ad -ad -ad -ad +aa +aa +ac +aa +aa +aa +aa +aa +aa ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA gA +QL gA gA gA -gA -Da -Da -Da +af +af +af ab ab ab @@ -13563,10 +13608,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -13583,8 +13628,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13592,11 +13637,11 @@ ab ab ab ab -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -13614,8 +13659,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13664,22 +13709,22 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab -Da -Da -Da -Da +af +af +af +af gA gA gA @@ -13687,7 +13732,7 @@ gA gA gA gA -Da +af ab ab ab @@ -13705,9 +13750,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -13725,20 +13770,20 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -13756,8 +13801,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13806,30 +13851,30 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da +af +af +af gA gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -13846,9 +13891,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -13868,19 +13913,19 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -Da -Da -Da -Da +af +af +af +af ab ab ab @@ -13898,8 +13943,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -13948,30 +13993,30 @@ ab ab ab ab -ad -ad +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -Da -Da +af +af gA gA gA gA gA gA -Da -Da +af +af ab ab ab @@ -13987,9 +14032,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14010,19 +14055,19 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab ab -Da -Da -Da +af +af +af ab ab ab @@ -14040,8 +14085,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14089,15 +14134,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -14105,15 +14150,15 @@ ab ab ab ab -Da -Da +af +af gA gA gA gA -Da -Da -Da +af +af +af ab ab ab @@ -14128,9 +14173,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14152,19 +14197,19 @@ ab ab ab ab -ad +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -Da -Da +af +af ab ab ab @@ -14182,8 +14227,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14231,15 +14276,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14247,15 +14292,15 @@ ab ab ab ab -Da -Da -Da +af +af +af gA gA -Da +af ab -Da -Da +af +af ab ab ab @@ -14270,9 +14315,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14285,22 +14330,22 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad +aa ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14324,8 +14369,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14373,16 +14418,16 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -14390,11 +14435,11 @@ ab ab ab ab -Da -Da -Da -Da -Da +af +af +af +af +af ab ab ab @@ -14412,8 +14457,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14426,24 +14471,24 @@ ab ab ab ab -ad -ad +aa +aa ab -ad -ad +aa +aa ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14465,9 +14510,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14515,16 +14560,16 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14554,9 +14599,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14568,25 +14613,25 @@ ab ab ab ab -ad +aa ab ab ab -ad +aa ab ab ab ab -ad -ad +aa +aa ab ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14607,9 +14652,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14656,18 +14701,18 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -14696,9 +14741,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14709,17 +14754,17 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad +aa +aa ab ab ab -ad +aa ab ab ab @@ -14727,8 +14772,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14749,9 +14794,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14798,21 +14843,21 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -14839,8 +14884,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14851,17 +14896,17 @@ ab ab ab ab -ad +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad -ad +aa +aa ab ab ab @@ -14870,8 +14915,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -14891,9 +14936,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14940,9 +14985,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -14950,13 +14995,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -14981,10 +15026,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -14992,18 +15037,18 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15012,8 +15057,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -15033,9 +15078,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15082,9 +15127,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15094,12 +15139,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -15124,38 +15169,38 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab ab -ad +aa ab -ad -ad +aa +aa ab ab ab @@ -15175,9 +15220,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15224,9 +15269,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15268,16 +15313,16 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -15294,9 +15339,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15317,9 +15362,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15366,9 +15411,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15413,12 +15458,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -15436,9 +15481,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15460,9 +15505,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15508,10 +15553,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -15577,10 +15622,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -15603,8 +15648,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -15651,9 +15696,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15718,10 +15763,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -15746,8 +15791,8 @@ GR ab ab ab -ad -ad +aa +aa ab ab ab @@ -15781,7 +15826,7 @@ lq "} (106,1,1) = {" lz -ad +aa ab ab ab @@ -15794,8 +15839,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -15858,12 +15903,12 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa ab ab ab @@ -15888,9 +15933,9 @@ GR GR GR ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -15923,7 +15968,7 @@ lq "} (107,1,1) = {" lz -ad +aa ab ab ab @@ -15936,8 +15981,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -15997,15 +16042,15 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16031,9 +16076,9 @@ gF GR ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -16065,8 +16110,8 @@ lq "} (108,1,1) = {" lz -ad -ad +aa +aa ab ab ab @@ -16079,7 +16124,7 @@ ab ab ab ab -ad +aa ab ab ab @@ -16138,16 +16183,16 @@ ab ab ab ab -ad -ad -hz -ad -ad -ad -ad -ad -hz -ad +aa +aa +ac +aa +aa +aa +aa +aa +ac +aa ab ab ab @@ -16174,8 +16219,8 @@ GR ab ab ab -ad -ad +aa +aa ab ab ab @@ -16208,8 +16253,8 @@ lq (109,1,1) = {" lq ab -ad -ad +aa +aa ab ab ab @@ -16221,8 +16266,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16278,17 +16323,17 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16317,8 +16362,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16351,8 +16396,8 @@ lq lq ab ab -ad -ad +aa +aa ab ab ab @@ -16362,9 +16407,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -16419,18 +16464,18 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16459,8 +16504,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16493,8 +16538,8 @@ lq lq ab ab -ad -ad +aa +aa ab ab ab @@ -16503,10 +16548,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -16560,16 +16605,16 @@ ab ab ab ab -ad -ad -ad -ad -hz -ad -ad -ad -hz -ad +aa +aa +aa +aa +ac +aa +aa +aa +ac +aa ab ab ab @@ -16601,8 +16646,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16636,17 +16681,17 @@ lq ab ab ab -ad -ad +aa +aa ab ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -16700,18 +16745,18 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab -ad -ad +aa +aa ab ab ab @@ -16743,8 +16788,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16779,15 +16824,15 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -16840,14 +16885,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16884,8 +16929,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -16921,14 +16966,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -16982,10 +17027,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -17026,8 +17071,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17064,11 +17109,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -17124,8 +17169,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17153,9 +17198,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -17168,8 +17213,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17265,8 +17310,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17294,14 +17339,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -17310,8 +17355,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17407,8 +17452,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17436,24 +17481,24 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -17549,8 +17594,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -17579,22 +17624,22 @@ ab ab ab ab -ad +aa ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -17690,10 +17735,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -17719,23 +17764,23 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab -ad -ad -ad +aa +aa +aa ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -17832,10 +17877,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -17861,11 +17906,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -17875,9 +17920,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -17974,10 +18019,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -18005,10 +18050,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -18017,8 +18062,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -18116,11 +18161,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -18149,8 +18194,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -18258,11 +18303,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -18282,17 +18327,17 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -18399,13 +18444,13 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18424,18 +18469,18 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -18541,14 +18586,14 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18565,19 +18610,19 @@ ab ab ab ab -ad -ad -ad -ad -hz -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +ac +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18684,15 +18729,15 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18701,26 +18746,26 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -18827,43 +18872,43 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -18970,27 +19015,27 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -19003,9 +19048,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19114,22 +19159,22 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -19146,8 +19191,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -19257,19 +19302,19 @@ ab ab ab ab -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ab ab ab @@ -19289,8 +19334,8 @@ ab ab ab ab -ad -ad +aa +aa ab ab ab @@ -19402,13 +19447,13 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab -ad +aa ab ab ab @@ -19431,9 +19476,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19573,9 +19618,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19716,9 +19761,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19858,9 +19903,9 @@ ab ab ab ab -ad -ad -ad +aa +aa +aa ab ab ab @@ -19999,11 +20044,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -20141,11 +20186,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -20283,11 +20328,11 @@ ab ab ab ab -ad -ad -ad -ad -ad +aa +aa +aa +aa +aa ab ab ab @@ -20425,10 +20470,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab @@ -20567,10 +20612,10 @@ ab ab ab ab -ad -ad -ad -ad +aa +aa +aa +aa ab ab ab diff --git a/maps/gateway_vr/listeningpost.dmm b/maps/gateway_vr/listeningpost.dmm index a14786ace9..6c2d6b2fb9 100644 --- a/maps/gateway_vr/listeningpost.dmm +++ b/maps/gateway_vr/listeningpost.dmm @@ -211,7 +211,7 @@ /turf/simulated/mineral/floor, /area/mine/unexplored) "aL" = ( -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aM" = ( /turf/simulated/mineral/floor, @@ -220,51 +220,51 @@ /obj/machinery/gateway{ dir = 9 }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aO" = ( /obj/machinery/gateway{ dir = 1 }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aP" = ( /obj/machinery/gateway{ dir = 5 }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aQ" = ( /obj/machinery/gateway{ dir = 8 }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aR" = ( /obj/machinery/gateway/centeraway, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aS" = ( /obj/machinery/gateway{ dir = 4 }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aT" = ( /obj/machinery/gateway{ dir = 10 }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aU" = ( /obj/machinery/gateway, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aV" = ( /obj/machinery/gateway{ dir = 6 }, -/turf/simulated/floor/greengrid, +/turf/simulated/floor/greengrid/airless, /area/mine/explored) "aW" = ( /obj/effect/overmap/visitable/sector/common_gateway/listeningpost, diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm index 11f7326b98..42f3f1b517 100644 --- a/maps/gateway_vr/variable/arynthilake_a.dmm +++ b/maps/gateway_vr/variable/arynthilake_a.dmm @@ -3,7 +3,7 @@ /turf/unsimulated/mineral, /area/gateway/arynthilake) "ac" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake) "ae" = ( /obj/effect/floor_decal/techfloor{ @@ -18,7 +18,7 @@ /turf/simulated/floor/tiled/techfloor, /area/gateway/arynthilake/gateway) "af" = ( -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake) "ag" = ( /turf/simulated/wall/r_wall, @@ -147,7 +147,7 @@ /area/gateway/arynthilake/oldcabin) "aV" = ( /obj/item/weapon/lampshade, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "aX" = ( /turf/simulated/floor/carpet/bcarpet, @@ -227,13 +227,13 @@ /area/gateway/arynthilake) "bn" = ( /obj/structure/table/steel, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) "bo" = ( /obj/structure/table, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -345,7 +345,7 @@ /obj/item/stack/material/steel{ amount = 50 }, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -540,7 +540,7 @@ /area/gateway/arynthilake/dome) "eV" = ( /obj/effect/landmark/mcguffin_spawner, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "eW" = ( /obj/item/device/analyzer/plant_analyzer, @@ -641,7 +641,7 @@ /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/under/dress/lilacdress, /obj/item/clothing/under/dress/littleblackdress, -/obj/item/clothing/under/dress/qipao/red, +/obj/item/clothing/under/qipao/red, /obj/item/clothing/under/dress/red_swept_dress, /obj/item/clothing/under/dress/redeveninggown, /obj/item/clothing/under/dress/sailordress, @@ -727,7 +727,7 @@ }, /area/gateway/arynthilake/dome) "jI" = ( -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "jK" = ( /obj/structure/table/rack/shelf/steel, @@ -919,7 +919,7 @@ /area/gateway/arynthilake) "nc" = ( /obj/random/awayloot, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "np" = ( /obj/random/mob/semirandom_mob_spawner/animal/e, @@ -927,7 +927,7 @@ /area/gateway/arynthilake) "nr" = ( /obj/effect/fake_sun, -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "nx" = ( /obj/machinery/door/airlock/engineering, @@ -1176,7 +1176,7 @@ /area/gateway/arynthilake/engine) "sl" = ( /obj/effect/overmap/visitable/sector/common_gateway/arynthilake, -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "sA" = ( /obj/structure/table/rack/steel, @@ -1258,7 +1258,7 @@ }, /area/gateway/arynthilake/dome) "ug" = ( -/obj/machinery/telecomms/relay/preset/tether, +/obj/machinery/telecomms/relay, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "uo" = ( @@ -1754,7 +1754,7 @@ /area/gateway/arynthilake/engine) "Iq" = ( /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -1813,7 +1813,7 @@ /turf/simulated/floor/tiled/eris/techmaint_cargo, /area/gateway/arynthilake/dome) "JK" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -1936,7 +1936,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "MD" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake/caves) @@ -2070,7 +2070,7 @@ /area/gateway/arynthilake/dome) "Or" = ( /obj/effect/landmark/hidden_level, -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "OC" = ( /turf/simulated/floor/carpet/blucarpet{ @@ -2098,7 +2098,7 @@ check_arrest = 0; check_down = 0; check_records = 0; - control_area = /area/gateway/grasslands/underground/maintenance; + control_area = /area/gateway/arynthilake/underground/maintenance; desc = "A firewall prevents AIs from interacting with this device."; lethal = 1; locked = 0; @@ -2150,7 +2150,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/gateway/arynthilake/engine) "Qr" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "Qx" = ( /obj/random/mob/semirandom_mob_spawner/robot/retaliate, @@ -2308,7 +2308,7 @@ /turf/simulated/floor/wood, /area/gateway/arynthilake/dome) "UZ" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caveruins) "Vf" = ( /obj/structure/closet, @@ -2324,7 +2324,7 @@ /obj/item/clothing/under/dress/wench, /obj/item/clothing/under/dress/white, /obj/item/clothing/under/haltertop, -/obj/item/clothing/under/hephaestus, +/obj/item/clothing/under/corp/hephaestus, /obj/item/clothing/under/lawyer/blue, /obj/item/clothing/under/lawyer/bluesuit, /obj/item/clothing/under/lawyer/bluesuit/skirt, @@ -2355,7 +2355,7 @@ /area/gateway/arynthilake/caveruins) "We" = ( /obj/random/mob/semirandom_mob_spawner/monster/e, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "Wj" = ( /obj/machinery/light{ diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm index 9f2634d8d5..612294d96b 100644 --- a/maps/gateway_vr/variable/arynthilake_b.dmm +++ b/maps/gateway_vr/variable/arynthilake_b.dmm @@ -3,7 +3,7 @@ /obj/item/stack/material/steel{ amount = 50 }, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -41,7 +41,7 @@ /area/gateway/arynthilake/dome) "bs" = ( /obj/effect/landmark/mcguffin_spawner, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "bw" = ( /obj/structure/table/sifwooden_reinforced, @@ -72,7 +72,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/gateway/arynthilake/dome) "cg" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake) "ch" = ( /turf/simulated/floor/plating{ @@ -230,7 +230,7 @@ /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "ek" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "eq" = ( /obj/structure/lattice, @@ -247,7 +247,7 @@ /area/gateway/arynthilake/dome) "eN" = ( /obj/effect/fake_sun, -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "eP" = ( /obj/structure/table/standard{ @@ -309,7 +309,7 @@ /area/gateway/arynthilake/dome) "fC" = ( /obj/effect/overmap/visitable/sector/common_gateway/arynthilake, -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "fX" = ( /obj/structure/table/standard{ @@ -356,7 +356,7 @@ /obj/item/clothing/under/dress/wench, /obj/item/clothing/under/dress/white, /obj/item/clothing/under/haltertop, -/obj/item/clothing/under/hephaestus, +/obj/item/clothing/under/corp/hephaestus, /obj/item/clothing/under/lawyer/blue, /obj/item/clothing/under/lawyer/bluesuit, /obj/item/clothing/under/lawyer/bluesuit/skirt, @@ -467,7 +467,7 @@ /turf/simulated/floor/tiled/techfloor, /area/gateway/arynthilake/gateway) "iX" = ( -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake) "jh" = ( /obj/structure/cable/green{ @@ -503,7 +503,7 @@ check_arrest = 0; check_down = 0; check_records = 0; - control_area = /area/gateway/grasslands/underground/maintenance; + control_area = /area/gateway/arynthilake/underground/maintenance; desc = "A firewall prevents AIs from interacting with this device."; lethal = 1; locked = 0; @@ -731,7 +731,7 @@ /area/gateway/arynthilake/dome) "nK" = ( /obj/structure/table/steel, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -838,7 +838,7 @@ /area/gateway/arynthilake/dome) "pS" = ( /obj/random/awayloot, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "pT" = ( /obj/structure/bed/double/padded, @@ -886,7 +886,7 @@ /turf/simulated/floor/beach/sand/desert, /area/gateway/arynthilake/caves) "rt" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -929,7 +929,7 @@ /area/gateway/arynthilake/dome) "si" = ( /obj/structure/table, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -1187,7 +1187,7 @@ /turf/simulated/floor/water, /area/gateway/arynthilake/caves) "zs" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caveruins) "zt" = ( /obj/structure/table/rack, @@ -1262,7 +1262,7 @@ /turf/simulated/floor/tiled/techfloor, /area/gateway/arynthilake/gateway) "Bg" = ( -/obj/machinery/telecomms/relay/preset/tether, +/obj/machinery/telecomms/relay, /turf/simulated/floor/tiled/eris, /area/gateway/arynthilake/engine) "Bz" = ( @@ -1337,7 +1337,7 @@ /area/gateway/arynthilake) "Ev" = ( /obj/random/mob/semirandom_mob_spawner/monster, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake) @@ -1472,7 +1472,7 @@ /turf/simulated/floor/plating/external, /area/gateway/arynthilake/caveruins) "Hw" = ( -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "HK" = ( /obj/machinery/light, @@ -1564,7 +1564,7 @@ /area/gateway/arynthilake/dome) "JB" = ( /obj/item/weapon/lampshade, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "JK" = ( /obj/structure/table/marble, @@ -1666,7 +1666,7 @@ /turf/simulated/floor/outdoors/grass/forest, /area/gateway/arynthilake) "KQ" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ outdoors = 1 }, /area/gateway/arynthilake/caves) @@ -1707,7 +1707,7 @@ /area/gateway/arynthilake/caveruins) "LR" = ( /obj/random/mob/semirandom_mob_spawner/monster/f, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "LY" = ( /obj/random/mob/semirandom_mob_spawner/animal/retaliate/c, @@ -1810,7 +1810,7 @@ /obj/item/clothing/under/dress/dress_saloon, /obj/item/clothing/under/dress/lilacdress, /obj/item/clothing/under/dress/littleblackdress, -/obj/item/clothing/under/dress/qipao/red, +/obj/item/clothing/under/qipao/red, /obj/item/clothing/under/dress/red_swept_dress, /obj/item/clothing/under/dress/redeveninggown, /obj/item/clothing/under/dress/sailordress, @@ -1841,7 +1841,7 @@ /area/gateway/arynthilake/dome) "NX" = ( /obj/random/mob/semirandom_mob_spawner/monster/e, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "Ob" = ( /obj/structure/catwalk, @@ -2024,7 +2024,7 @@ /area/gateway/arynthilake/dome) "Ry" = ( /obj/effect/landmark/hidden_level, -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "RK" = ( /obj/structure/table/fancyblack, @@ -2153,7 +2153,7 @@ /area/gateway/arynthilake/dome) "Uq" = ( /obj/random/mob/semirandom_mob_spawner/monster/b, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/caves) "UA" = ( /turf/simulated/wall/sifwood, diff --git a/maps/gateway_vr/variable/arynthilakeunderground_a.dmm b/maps/gateway_vr/variable/arynthilakeunderground_a.dmm index 121b0fac96..9c1e9f7982 100644 --- a/maps/gateway_vr/variable/arynthilakeunderground_a.dmm +++ b/maps/gateway_vr/variable/arynthilakeunderground_a.dmm @@ -44,7 +44,7 @@ /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) "gh" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "hB" = ( /obj/structure/table/steel_reinforced, @@ -85,7 +85,7 @@ "lM" = ( /obj/effect/map_effect/perma_light/gateway{ light_color = "#0c6ba6"; - light_power = .3; + light_power = 0.3; light_range = 5 }, /turf/simulated/floor/beach/sand/desert, @@ -123,10 +123,10 @@ /area/gateway/arynthilake/engine) "nD" = ( /obj/effect/landmark/hidden_level, -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "nO" = ( -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "oM" = ( /turf/simulated/floor/plating/eris/under, @@ -157,7 +157,7 @@ /area/gateway/arynthilake/engine) "qU" = ( /obj/random/awayloot, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "qX" = ( /obj/machinery/porta_turret{ @@ -209,7 +209,7 @@ /area/gateway/arynthilake/engine) "xh" = ( /obj/machinery/crystal, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "zh" = ( /obj/structure/ladder/up, @@ -229,7 +229,7 @@ /area/gateway/arynthilake/engine) "Bj" = ( /obj/random/mob/semirandom_mob_spawner/monster/e, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "BJ" = ( /obj/effect/landmark/gateway_scatter, @@ -253,7 +253,7 @@ /area/gateway/arynthilake/engine) "Eb" = ( /obj/random/mob/semirandom_mob_spawner/monster/f, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "Ek" = ( /obj/machinery/light/small{ @@ -306,9 +306,7 @@ /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) "LF" = ( -/turf/simulated/floor/plating/eris/under{ - temperature = 258.15 - }, +/turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "LY" = ( /turf/simulated/floor/beach/sand/desert, @@ -381,7 +379,7 @@ /area/gateway/arynthilake/underground/maintenance) "YC" = ( /obj/random/mob/semirandom_mob_spawner/monster/d, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "ZY" = ( /obj/structure/table/rack/shelf/steel, diff --git a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm index 75fa807ad5..5acb316d64 100644 --- a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm +++ b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm @@ -18,7 +18,7 @@ /turf/simulated/floor/tiled/eris/steel/orangecorner, /area/gateway/arynthilake/engine) "bL" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "bX" = ( /turf/unsimulated/mineral, @@ -50,7 +50,7 @@ /area/gateway/arynthilake/engine) "eQ" = ( /obj/random/awayloot, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "fM" = ( /turf/simulated/floor/tiled/eris/steel/danger, @@ -105,7 +105,7 @@ /area/gateway/arynthilake/engine) "jX" = ( /obj/effect/landmark/hidden_level, -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "kb" = ( /turf/simulated/wall/r_wall, @@ -136,7 +136,7 @@ "ng" = ( /obj/effect/map_effect/perma_light/gateway{ light_color = "#0c6ba6"; - light_power = .3; + light_power = 0.3; light_range = 5 }, /turf/simulated/floor/beach/sand/desert, @@ -188,11 +188,11 @@ "vG" = ( /obj/random/awayloot, /obj/random/mob/semirandom_mob_spawner/monster/f, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "wg" = ( /obj/random/mob/semirandom_mob_spawner/monster/e, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "wi" = ( /turf/simulated/wall/r_wall, @@ -261,7 +261,7 @@ /turf/simulated/floor/tiled/eris/techmaint, /area/gateway/arynthilake/engine) "Ff" = ( -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "Fs" = ( /obj/structure/table/rack/shelf/steel, @@ -323,7 +323,7 @@ /area/gateway/arynthilake/underground/maintenance) "LR" = ( /obj/random/mob/semirandom_mob_spawner/monster/f, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "LY" = ( /obj/structure/table/steel_reinforced, @@ -362,7 +362,7 @@ /area/gateway/arynthilake/engine) "QA" = ( /obj/machinery/crystal, -/turf/simulated/mineral/floor/ignore_cavegen, +/turf/simulated/mineral/floor/ignore_cavegen/cave, /area/gateway/arynthilake/underground) "QT" = ( /obj/structure/table/steel_reinforced, @@ -408,7 +408,7 @@ /turf/simulated/floor/plating/eris/under, /area/gateway/arynthilake/underground/maintenance) "Xt" = ( -/turf/simulated/mineral/ignore_cavegen, +/turf/simulated/mineral/ignore_cavegen/cave, /area/gateway/arynthilake/underground/maintenance) "Xx" = ( /obj/structure/table/rack/shelf/steel, diff --git a/maps/gateway_vr/variable/honlethhighlands_a.dmm b/maps/gateway_vr/variable/honlethhighlands_a.dmm index d273f3b5fe..db7570d4ef 100644 --- a/maps/gateway_vr/variable/honlethhighlands_a.dmm +++ b/maps/gateway_vr/variable/honlethhighlands_a.dmm @@ -6,12 +6,12 @@ }, /area/gateway/honlethhighlands) "ab" = ( -/turf/simulated/mineral/ignore_cavegen{ +/turf/simulated/mineral/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) "ac" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -125,7 +125,7 @@ }, /area/gateway/honlethhighlands/caves) "aE" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ name = "dirt"; outdoors = 1; temperature = 253.15 @@ -190,7 +190,7 @@ /area/gateway/honlethhighlands/town/command) "aS" = ( /obj/effect/landmark/gateway_scatter, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -216,7 +216,7 @@ }, /area/gateway/honlethhighlands) "aX" = ( -/turf/simulated/mineral/ignore_cavegen{ +/turf/simulated/mineral/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/beach) @@ -308,7 +308,7 @@ /area/gateway/honlethhighlands/beach) "bp" = ( /obj/random/mob/semirandom_mob_spawner/animal/retaliate/c, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -513,7 +513,7 @@ /area/gateway/honlethhighlands/gate) "fa" = ( /obj/random/mob/semirandom_mob_spawner/animal/retaliate/b, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -540,7 +540,7 @@ /obj/item/stack/material/wood, /obj/item/stack/material/wood, /obj/item/stack/material/wood, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -665,7 +665,7 @@ /area/gateway/honlethhighlands) "is" = ( /obj/item/weapon/flame/lighter/random, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -822,7 +822,7 @@ /area/gateway/honlethhighlands/beach) "mG" = ( /obj/structure/table/bench/wooden, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -945,7 +945,7 @@ "oe" = ( /obj/structure/bonfire, /obj/random/meat, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1025,13 +1025,13 @@ /area/gateway/honlethhighlands/town/engineering) "pT" = ( /obj/effect/landmark/mcguffin_spawner, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) "pX" = ( /obj/random/maintenance, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1643,7 +1643,7 @@ /area/gateway/honlethhighlands/town/xenobio) "zE" = ( /obj/random/junk, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1721,7 +1721,7 @@ "AK" = ( /obj/random/mre, /obj/random/mre, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1968,7 +1968,7 @@ /area/gateway/honlethhighlands/gate) "Et" = ( /obj/random/mob/semirandom_mob_spawner/animal/retaliate, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2204,7 +2204,7 @@ /area/gateway/honlethhighlands/gate) "JM" = ( /obj/random/cigarettes, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2262,7 +2262,7 @@ /area/gateway/honlethhighlands/beach) "Ld" = ( /obj/random/awayloot, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2321,7 +2321,7 @@ "Ms" = ( /obj/structure/table/bench/wooden, /obj/random/mob/semirandom_mob_spawner/humanoid/retaliate, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2519,7 +2519,7 @@ /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/engineering) "QB" = ( -/obj/machinery/telecomms/relay/preset/tether, +/obj/machinery/telecomms/relay, /turf/simulated/floor/tiled, /area/gateway/honlethhighlands/town/engineering) "QG" = ( @@ -2556,7 +2556,7 @@ /area/gateway/honlethhighlands/town/command) "Ro" = ( /obj/random/mob/semirandom_mob_spawner/vore/passive/b, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2910,13 +2910,13 @@ /area/gateway/honlethhighlands/town/bar) "Zw" = ( /obj/random/mob/semirandom_mob_spawner/vore/passive, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) "Zy" = ( /obj/random/drinkbottle, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) diff --git a/maps/gateway_vr/variable/honlethhighlands_b.dmm b/maps/gateway_vr/variable/honlethhighlands_b.dmm index 73e1727581..7de8389bc7 100644 --- a/maps/gateway_vr/variable/honlethhighlands_b.dmm +++ b/maps/gateway_vr/variable/honlethhighlands_b.dmm @@ -6,12 +6,12 @@ }, /area/gateway/honlethhighlands) "ab" = ( -/turf/simulated/mineral/ignore_cavegen{ +/turf/simulated/mineral/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) "ac" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -125,7 +125,7 @@ }, /area/gateway/honlethhighlands/caves) "aE" = ( -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ name = "dirt"; outdoors = 1; temperature = 253.15 @@ -190,7 +190,7 @@ /area/gateway/honlethhighlands/town/command) "aS" = ( /obj/effect/landmark/gateway_scatter, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -216,7 +216,7 @@ }, /area/gateway/honlethhighlands) "aX" = ( -/turf/simulated/mineral/ignore_cavegen{ +/turf/simulated/mineral/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/beach) @@ -520,7 +520,7 @@ /obj/item/stack/material/wood, /obj/item/stack/material/wood, /obj/item/stack/material/wood, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -656,13 +656,13 @@ /area/gateway/honlethhighlands) "is" = ( /obj/item/weapon/flame/lighter/random, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) "iw" = ( /obj/random/mob/semirandom_mob_spawner/monster, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -821,7 +821,7 @@ "mo" = ( /obj/structure/table/bench/wooden, /obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -836,7 +836,7 @@ /area/gateway/honlethhighlands) "mG" = ( /obj/structure/table/bench/wooden, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -944,7 +944,7 @@ "oe" = ( /obj/structure/bonfire, /obj/random/meat, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1033,13 +1033,13 @@ /area/gateway/honlethhighlands/town/engineering) "pR" = ( /obj/random/mob/semirandom_mob_spawner/monster/c, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) "pT" = ( /obj/effect/landmark/mcguffin_spawner, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1155,7 +1155,7 @@ /area/gateway/honlethhighlands/gate) "qO" = ( /obj/random/mob/semirandom_mob_spawner/monster/f, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1509,7 +1509,7 @@ /area/gateway/honlethhighlands/gate) "wF" = ( /obj/random/mob/semirandom_mob_spawner/monster/b, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1677,7 +1677,7 @@ /area/gateway/honlethhighlands/town/xenobio) "zE" = ( /obj/random/junk, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -1748,7 +1748,7 @@ "AK" = ( /obj/random/mre, /obj/random/mre, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2197,7 +2197,7 @@ /area/gateway/honlethhighlands/gate) "JM" = ( /obj/random/cigarettes, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2493,7 +2493,7 @@ /area/gateway/honlethhighlands/gate) "Qm" = ( /obj/random/mob/semirandom_mob_spawner/monster/e, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2578,7 +2578,7 @@ /area/gateway/honlethhighlands/town/command) "Ro" = ( /obj/random/mob/semirandom_mob_spawner/monster/d, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2634,7 +2634,7 @@ /area/gateway/honlethhighlands/town/supply) "Td" = ( /obj/random/awayloot, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2887,7 +2887,7 @@ /area/gateway/honlethhighlands/town/command) "WQ" = ( /obj/random/mob/semirandom_mob_spawner/humanoid, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) @@ -2959,7 +2959,7 @@ /area/gateway/honlethhighlands/town/bar) "Zy" = ( /obj/random/drinkbottle, -/turf/simulated/mineral/floor/ignore_cavegen{ +/turf/simulated/mineral/floor/ignore_cavegen/cave{ temperature = 253.15 }, /area/gateway/honlethhighlands/caves) diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm index 16e6a42d3f..4aa6d1cace 100644 --- a/maps/gateway_vr/wildwest.dmm +++ b/maps/gateway_vr/wildwest.dmm @@ -98,11 +98,6 @@ }, /turf/space, /area/space) -"ar" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/space, -/area/space) "as" = ( /obj/effect/gateway, /turf/simulated/floor/cult, @@ -2420,7 +2415,7 @@ af af af af -ar +af af af af @@ -7260,7 +7255,7 @@ fH gF cx aD -ar +af af ia ia @@ -7543,7 +7538,7 @@ af af af af -ar +af ad fM nd @@ -7671,7 +7666,7 @@ ia ia ia af -ar +af af af af diff --git a/maps/offmap_vr/common_offmaps.dm b/maps/offmap_vr/common_offmaps.dm index 41a1707af8..b726a2fec3 100644 --- a/maps/offmap_vr/common_offmaps.dm +++ b/maps/offmap_vr/common_offmaps.dm @@ -220,6 +220,33 @@ mappath = 'maps/gateway_vr/wildwest.dmm' associated_map_datum = /datum/map_z_level/common_lateload/gateway_destination + +///////////////////////////////////////////////////////////////////////////////////// + +/datum/map_template/common_lateload/om_adventure + name = "OM Adventure Submap" + desc = "Please do not use this." + mappath = null + associated_map_datum = null + +/datum/map_z_level/common_lateload/om_adventure_destination + name = "OM Adventure Destination" + z = Z_LEVEL_OM_ADVENTURE + +#include "../om_adventure/grasscave.dm" +/datum/map_template/common_lateload/om_adventure/grasscave + name = "Grass Cave" + desc = "Looks like a cave with some grass in it." + mappath = 'maps/om_adventure/grasscave.dmm' + associated_map_datum = /datum/map_z_level/common_lateload/om_adventure_destination + +/datum/map_template/common_lateload/om_adventure/grasscave/on_map_loaded(z) + . = ..() + seed_submaps(list(z), 60, /area/om_adventure/grasscave/unexplored, /datum/map_template/om_adventure/outdoor) + seed_submaps(list(z), 60, /area/om_adventure/grasscave/rocks, /datum/map_template/om_adventure/cave) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, z, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore/grasscave(null, 1, 1, z, 64, 64) + ////////////////////////////////////////////////////////////////////////////////////// // Admin-use z-levels for loading whenever an admin feels like #if AWAY_MISSION_TEST @@ -402,6 +429,53 @@ /mob/living/simple_mob/shadekin ) +////////////////////////////////////////////////////////////////////////////// +//Antag/Event/ERT Areas + +#include "../submaps/admin_use_vr/ert.dm" +#include "../submaps/admin_use_vr/mercship.dm" +#include "../submaps/admin_use_vr/salamander_trader.dm" + +/datum/map_template/admin_use/ert + name = "Special Area - ERT" + desc = "It's the ERT ship! Lorge." + mappath = 'maps/submaps/admin_use_vr/ert.dmm' + +/datum/map_template/admin_use/trader + name = "Special Area - Trader" + desc = "Big trader ship." + mappath = 'maps/submaps/admin_use_vr/tradeship.dmm' + +/datum/map_template/admin_use/salamander_trader + name = "Special Area - Salamander Trader" + desc = "Modest trader ship." + mappath = 'maps/submaps/admin_use_vr/salamander_trader.dmm' + +/datum/map_template/admin_use/mercenary + name = "Special Area - Merc Ship" + desc = "Prepare tae be boarded, arr!" + mappath = 'maps/submaps/admin_use_vr/kk_mercship.dmm' + +/datum/map_template/admin_use/skipjack + name = "Special Area - Skipjack Base" + desc = "Stinky!" + mappath = 'maps/submaps/admin_use_vr/skipjack.dmm' + +/datum/map_template/admin_use/thunderdome + name = "Special Area - Thunderdome" + desc = "Thunderrrrdomeee" + mappath = 'maps/submaps/admin_use_vr/thunderdome.dmm' + +/datum/map_template/admin_use/wizardbase + name = "Special Area - Wizard Base" + desc = "Wingardium Levosia" + mappath = 'maps/submaps/admin_use_vr/wizard.dmm' + +/datum/map_template/admin_use/dojo + name = "Special Area - Ninja Dojo" + desc = "Sneaky" + mappath = 'maps/submaps/admin_use_vr/dojo.dmm' + ////////////////////////////////////////////////////////////////////////////// //Overmap ship spawns diff --git a/maps/offmap_vr/talon/talon_v2.dm b/maps/offmap_vr/talon/talon_v2.dm index 1944cd8cb2..8f8efc0879 100644 --- a/maps/offmap_vr/talon/talon_v2.dm +++ b/maps/offmap_vr/talon/talon_v2.dm @@ -11,7 +11,7 @@ var/global/list/latejoin_talon = list() /datum/spawnpoint/talon display_name = "ITV Talon Cryo" - restrict_job = list("Talon Captain", "Talon Pilot", "Talon Engineer", "Talon Doctor", "Talon Guard") + restrict_job = list("Talon Captain", "Talon Pilot", "Talon Engineer", "Talon Doctor", "Talon Guard", "Talon Miner") msg = "has come out of cryostasis" announce_channel = "Talon" @@ -47,7 +47,7 @@ var/global/list/latejoin_talon = list() vessel_mass = 10000 vessel_size = SHIP_SIZE_LARGE initial_generic_waypoints = list("talon_v2_near_fore_port", "talon_v2_near_fore_star", "talon_v2_near_aft_port", "talon_v2_near_aft_star", "talon_v2_wing_port", "talon_v2_wing_star") - initial_restricted_waypoints = list("Talon's Shuttle" = list("offmap_spawn_talonboat")) + initial_restricted_waypoints = list("Talon's Shuttle" = list("offmap_spawn_talonboat"), "Talon's Escape Pod" = list("offmap_spawn_talonpod")) skybox_icon = 'talon.dmi' skybox_icon_state = "skybox" @@ -55,7 +55,7 @@ var/global/list/latejoin_talon = list() skybox_pixel_y = 60 levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT) - unowned_areas = list(/area/shuttle/talonboat) + unowned_areas = list(/area/shuttle/talonboat,/area/shuttle/talonpod) // The shuttle's 'shuttle' computer /obj/machinery/computer/shuttle_control/explore/talonboat @@ -70,6 +70,8 @@ var/global/list/latejoin_talon = list() vessel_size = SHIP_SIZE_TINY shuttle = "Talon's Shuttle" + levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT) + // A shuttle lateloader landmark /obj/effect/shuttle_landmark/shuttle_initializer/talonboat name = "Talon's shuttle bay" @@ -94,6 +96,49 @@ var/global/list/latejoin_talon = list() icon = 'icons/turf/areas_vr_talon.dmi' icon_state = "green" + +/////////////////////////// +//// The Escape Pod + +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/talon_escape + name = "shuttle control console" + shuttle_tag = "Talon's Escape Pod" + req_one_access = list(access_talon) + +/obj/effect/overmap/visitable/ship/landable/talon_pod + name = "ITV Talon Escape Pod" + desc = "An emergency escape pod from the ITV Talon." + vessel_mass = 500 + vessel_size = SHIP_SIZE_TINY + shuttle = "Talon's Escape Pod" + + levels_for_distress = list(1, Z_LEVEL_BEACH, Z_LEVEL_AEROSTAT, Z_LEVEL_DEBRISFIELD, Z_LEVEL_FUELDEPOT) + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/talonpod + name = "Talon's pod bay" + base_area = /area/talon_v2/pod_hangar + base_turf = /turf/simulated/floor/reinforced + landmark_tag = "offmap_spawn_talonpod" + docking_controller = "talon_podbay" + shuttle_type = /datum/shuttle/autodock/overmap/talonpod + +// The talon's boat +/datum/shuttle/autodock/overmap/talonpod + name = "Talon's Escape Pod" + current_location = "offmap_spawn_talonpod" + docking_controller_tag = "talonpod_docker" + shuttle_area = /area/shuttle/talonpod + fuel_consumption = 1 + defer_initialisation = TRUE + +/area/shuttle/talonpod + name = "Talon's Escape Pod" + requires_power = 1 + icon = 'icons/turf/areas_vr_talon.dmi' + icon_state = "green" + /////////////////////////// //// The Various Machines /obj/machinery/telecomms/allinone/talon @@ -186,6 +231,37 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k
\ Harry Townes"} +/obj/item/weapon/paper/talon_cannon + name = "ITV Talon OFD Console" + info = {"to whoever's got the itchiest trigger finger,
\ +as a reward for recent good performance, the lads upstairs have seen fit to have our ship retrofitted with an Obstruction Field Disperser. This fancy bit of hardware can be used to, well, 'disperse' 'obstructions'. asteroids or carp shoals in the way? no problem! load her up and fire! range is pretty short though.
\ +
\ +they haven't issued very much ammo for it, so if you want more you'll have to trade with those nanotrasen boys and girls. use the blue ones for ion storms and electrical clouds, and the red ones for asteroids and carp. calibration and aiming the thing is a bit of a pain but you'll figure it out. pre-calibrate then mess with the numbers until accuracy hits 100%.
\ +
\ +aside from that, only thing you really need to keep in mind is that it'll explode pretty spectacularly if you try to fire it whilst it's cooling down *or* if the hatch is closed. hatch is rigged to the bridge shutter controls.
\ +
\ +oh, and it's not a weapon. don't try to shoot other ships with it or anything, it won't work.
\ +
\ +Harry Townes"} + +/obj/item/weapon/paper/talon_escape_pod + name = "ITV Talon Escape Pod" + info = {"to whoever's stuck bailing out,
\ +after some extensive retrofits to comply with starfaring vessel regulations, our lovely little ship has been outfitted with a proper escape pod, which you are now standing in if you are reading this paper! congratulations!
\ +
\ +in the untimely event that you actually need to use it and survive long enough to, here's what you need to know;
\ +1. the thrusters don't have enough power to really fly around in space very much.
\ +2. you probably don't have very much air either.
\ +3. on the plus side, plenty of seats and supplies.
\ +4. remember to hit the emergency distress signal button.
\ +5. you have no sensors, so I hope you wrote down or remember what's around.
\ +
\ +if you have to punch out, do it whilst the ship is in open space. the pod has nothing to stop space debris ventilating it! it is rated for reentry though, so if you can bail over a planet it should be able to take you down to a safe landing spot. from there, use the emergency supplies and try to hold out until rescue comes.
\ +
\ +personally I recommend using the ship's boat if you need to evacuate, but if you're stuck with the pod then... good luck!
\ +
\ +Harry Townes"} + //Prevents remote control of drones /obj/machinery/drone_fabricator/talon name = "somewhat glitchy drone fabricator" @@ -273,6 +349,12 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k /obj/item/clothing/suit/space/void/pilot/talon name = "talon pilot's voidsuit" +/obj/item/clothing/head/helmet/space/void/mining/talon + name = "talon miner's voidsuit helmet" + camera_networks = list(NETWORK_TALON_HELMETS) +/obj/item/clothing/suit/space/void/mining/talon + name = "talon miner's voidsuit" + /obj/item/device/gps/command/taloncap gps_tag = "TALC" /obj/item/device/gps/security/talonguard @@ -283,6 +365,8 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k gps_tag = "TALE" /obj/item/device/gps/explorer/talonpilot gps_tag = "TALP" +/obj/item/device/gps/mining/talonminer + gps_tag = "TALM" /obj/structure/closet/secure_closet/talon_captain name = "talon captain's locker" @@ -398,6 +482,29 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k /obj/item/device/gps/explorer/talonpilot ) +/obj/structure/closet/secure_closet/talon_miner + name = "talon miner's locker" + req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/miner + + starts_with = list( + /obj/item/device/radio/headset/talon, + /obj/item/clothing/head/helmet/space/void/refurb/mining/talon, + /obj/item/clothing/suit/space/void/refurb/mining/talon, + /obj/item/weapon/tank/oxygen, + /obj/item/device/suit_cooling_unit, + /obj/item/device/gps/mining/talonminer, + /obj/item/clothing/gloves/black, + /obj/item/device/analyzer, + /obj/item/weapon/storage/bag/ore, + /obj/item/device/flashlight/lantern, + /obj/item/weapon/shovel, + /obj/item/weapon/pickaxe, + /obj/item/weapon/mining_scanner, + /obj/item/clothing/glasses/material, + /obj/item/clothing/glasses/meson + ) + /obj/machinery/vending/medical_talon //Not a subtype for *reasons* name = "NanoMed Plus" desc = "Medical drug dispenser." @@ -501,6 +608,13 @@ speaking of, if some dumbass does take it and fly off solo then get themselves k hard_drive.store_file(new/datum/computer_file/program/camera_monitor/talon_helmet()) set_autorun("tsensormonitor") +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner + name = "miner's laptop" + +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner/install_default_programs() + ..() + hard_drive.store_file(new/datum/computer_file/program/ship_nav()) + //Generic modular consoles scattered around /obj/item/modular_computer/console/preset/talon name = "talon modular computer" diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm index 38899fbe5a..59d89d7a42 100644 --- a/maps/offmap_vr/talon/talon_v2.dmm +++ b/maps/offmap_vr/talon/talon_v2.dmm @@ -2,794 +2,228 @@ "aa" = ( /turf/space, /area/space) -"ab" = ( -/obj/machinery/mineral/input, -/obj/machinery/conveyor{ - dir = 4; - id = "talonrefinery" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) "ac" = ( -/obj/machinery/mineral/processing_unit_console{ +/obj/machinery/computer/ship/helm{ req_one_access = list(301) }, -/obj/structure/girder, -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/railing/grey, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"ad" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"ae" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"af" = ( -/obj/structure/closet/secure_closet/talon_guard, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/obj/item/weapon/storage/box/nifsofts_security, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"ag" = ( -/obj/structure/closet/secure_closet/talon_doctor, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/obj/item/weapon/storage/box/nifsofts_medical, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"ah" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/network/talon, -/obj/machinery/atm{ - pixel_y = 31 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"ai" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"aj" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"ak" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 9 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/engineering/port) -"al" = ( /obj/machinery/light{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"am" = ( -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/table/steel, -/obj/item/weapon/storage/box/nifsofts_mining, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"an" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/light_switch{ - pixel_y = 24 - }, /obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"ao" = ( -/obj/structure/table/rack/steel, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"ap" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/table/steel, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"ad" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/fiftyspawner/uranium, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"aq" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"ar" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/steel, -/obj/machinery/recharger, -/obj/item/device/geiger{ - pixel_x = -7 - }, -/obj/machinery/alarm/talon{ - pixel_y = 24 - }, -/obj/machinery/camera/network/talon{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"as" = ( -/obj/machinery/holoposter{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"at" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"au" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_bridge_shields" }, /turf/simulated/floor/plating, -/area/talon_v2/engineering) -"av" = ( -/obj/structure/table/standard, -/obj/machinery/recharger, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/light/small{ - dir = 8 +/area/talon_v2/bridge) +"ae" = ( +/obj/machinery/vending/sovietsoda, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"af" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/sign/painting/public{ + pixel_x = -30 }, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"aw" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/area/talon_v2/central_hallway/fore) +"ag" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"ax" = ( -/obj/structure/closet/secure_closet/talon_engineer, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/obj/item/weapon/storage/box/nifsofts_engineering, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"ay" = ( -/obj/machinery/disposal/wall{ - dir = 4 +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"ah" = ( +/obj/machinery/light{ + dir = 8 }, /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/structure/sign/painting/public{ - pixel_x = -30 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"az" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/catwalk, -/obj/machinery/power/apc/talon/hyper{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"aA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"aB" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/star) -"aC" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = -26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/engineering{ - name = "Talon Port Engines"; - req_one_access = list(301) - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"aD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"aE" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/hatch{ - name = "Generator Room"; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/sign/warning/radioactive{ - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"aF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/vending/medical_talon{ +/obj/machinery/disposal/wall{ dir = 4 }, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) -"aG" = ( -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, +"aj" = ( +/obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"aH" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"aI" = ( -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"aJ" = ( -/obj/structure/cable/yellow, -/obj/machinery/power/rtg/advanced, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"aK" = ( -/obj/structure/cable/yellow, -/obj/machinery/light/small, -/obj/machinery/power/port_gen/pacman/super/potato, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/generators) -"aL" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/engineering/star_store) -"aN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"aO" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"aP" = ( -/obj/machinery/power/apc/talon/hyper{ - pixel_y = -24 - }, -/obj/effect/catwalk_plated/dark, -/obj/structure/closet/walllocker_double/hydrant/west, -/obj/structure/cable/green, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"aQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"aR" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/aft_port) -"aS" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/command{ - name = "Bridge"; - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"aT" = ( -/obj/structure/handrail, -/turf/simulated/floor/tiled/techmaint, +/obj/random/multiple/corp_crate/talon_cargo, +/obj/structure/railing/grey, +/turf/simulated/floor/tiled/techfloor, /area/talon_v2/maintenance/wing_starboard) -"aU" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +"ak" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 }, +/obj/structure/railing/grey, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"al" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"am" = ( +/obj/machinery/computer/ship/navigation{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"an" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/department/bridge{ - pixel_y = 31 - }, /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"aV" = ( -/obj/machinery/light/small, -/obj/machinery/light_switch{ +/obj/structure/sign/directions/bar{ dir = 1; - pixel_x = 2; - pixel_y = -28 - }, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/terminal{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"aW" = ( -/obj/effect/shuttle_landmark/shuttle_initializer/talonboat, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/effect/overmap/visitable/ship/landable/talon_boat, -/obj/structure/handrail, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"aZ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" + pixel_x = 32; + pixel_y = -3 }, /obj/structure/sign/directions/bridge{ dir = 1; - pixel_x = 32 + pixel_x = 32; + pixel_y = 3 }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"ba" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"bc" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"bd" = ( -/obj/machinery/vending/dinnerware{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"bf" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/machinery/oxygen_pump{ - dir = 8; - pixel_x = -30 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/handrail{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"bg" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"bh" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/structure/handrail, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"bk" = ( -/obj/structure/table/woodentable, -/obj/machinery/firealarm{ - dir = 4; - layer = 3.3; - pixel_x = 26 - }, -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green, -/obj/item/weapon/paper/talon_captain, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"bo" = ( -/obj/machinery/computer/ship/engines, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"bp" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/holoposter{ - pixel_y = -32 - }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) -"bq" = ( -/obj/machinery/suit_cycler/vintage/tguard, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"br" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"by" = ( -/obj/effect/floor_decal/industrial/warning{ +"ao" = ( +/obj/machinery/computer/ship/sensors{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"bz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"bA" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"bB" = ( +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"ap" = ( /obj/structure/railing/grey{ dir = 1 }, -/obj/structure/flora/pottedplant/small, +/obj/structure/flora/pottedplant/sticky, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) -"bC" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 10 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"bI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"bJ" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, +"aq" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"bK" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"bM" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"bN" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -26 - }, -/obj/structure/table/woodentable, -/obj/machinery/button/remote/blast_door{ +/obj/structure/extinguisher_cabinet{ dir = 4; - id = "talon_quietroom"; - name = "window blast shields"; + pixel_x = -30 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"ar" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/table/steel, +/obj/random/maintenance/engineering, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"as" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/sign/department/commander{ pixel_x = -28 }, -/obj/machinery/recharger, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"bP" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"at" = ( +/obj/structure/bed/chair/bay/comfy/brown{ + dir = 1 + }, +/obj/structure/panic_button{ + pixel_x = 32; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"au" = ( +/obj/structure/bed/chair/bay/chair, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"av" = ( +/obj/structure/table/standard, +/obj/fiftyspawner/steel, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/item/device/paicard, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"ax" = ( +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"ay" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"az" = ( +/obj/machinery/computer/ship/engines{ + dir = 8; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"aA" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"bQ" = ( +/area/talon_v2/engineering) +"aB" = ( /obj/machinery/optable, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -803,567 +237,276 @@ }, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) -"bU" = ( -/obj/structure/table/steel, -/obj/item/device/measuring_tape, -/obj/item/weapon/tool/wrench, -/obj/item/weapon/storage/excavation, -/obj/item/stack/flag/yellow, -/obj/item/weapon/pickaxe, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"bV" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/gen_store) -"bX" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"bY" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"bZ" = ( -/obj/machinery/oxygen_pump{ - dir = 1; - pixel_y = -30 - }, -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"ca" = ( +"aC" = ( /obj/structure/cable/green{ - d1 = 4; + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"cc" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/structure/railing/grey{ - dir = 8 + icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"ce" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 +"aD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"cf" = ( -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "talon_meddoor"; - name = "Door Bolts"; - pixel_x = -28; - specialfunctions = 4 - }, -/obj/machinery/light{ +/obj/structure/railing/grey{ dir = 8 }, -/obj/effect/landmark/start{ - name = "Talon Doctor" - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/med_room) -"cg" = ( -/obj/structure/catwalk, -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"ch" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/anomaly_storage) -"ck" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/engi{ - name = "Starboard Eng. Storage"; - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"cl" = ( -/obj/machinery/disposal/wall{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"cm" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, /obj/structure/railing/grey, -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"cn" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"aE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"cp" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"cr" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"ct" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"cv" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/workroom) -"cw" = ( -/obj/structure/catwalk, -/obj/structure/handrail, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/aft_port) -"cx" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"cB" = ( +/obj/structure/railing/grey, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"aF" = ( /obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"cE" = ( -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"cG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/closet/walllocker/medical/east, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"cH" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"cK" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/blast/regular/open{ - id = "talon_boat_cockpit" - }, /obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/plating, -/area/shuttle/talonboat) -"cM" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/closet/walllocker_double/east, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "talon_bridge_shields" + }, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"aG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/computer/ship/engines{ + dir = 1 + }, +/obj/structure/railing/grey, +/obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"cN" = ( +/area/talon_v2/engineering) +"aH" = ( +/obj/structure/closet/walllocker/medical/east, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/extinguisher/mini, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"aI" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"aJ" = ( /obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/security{ - id_tag = "talon_secdoor"; - name = "Guard's Cabin"; +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/engineeringatmos{ + name = "Talon Atmospherics"; req_one_access = list(301) }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/crew_quarters/sec_room) -"cS" = ( -/obj/structure/catwalk, -/obj/machinery/firealarm{ +/obj/structure/sign/directions/engineering/atmospherics{ + dir = 8; + pixel_y = 35 + }, +/obj/structure/sign/directions/engineering{ dir = 4; - pixel_x = 26 + pixel_y = 29 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"aK" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/structure/closet/walllocker/medical/south, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/fire, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"aL" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"aN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"aO" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/obj/structure/lattice, +/turf/space, +/area/space) +"aP" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"aQ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"aR" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"aS" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/command{ + name = "Bridge"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"aT" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"aU" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/command{ + name = "Bridge"; + req_one_access = list(301) }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"cT" = ( -/obj/structure/catwalk, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"cU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"aV" = ( +/obj/structure/disposalpipe/junction/yjunction{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"cV" = ( +/area/talon_v2/engineering) +"aW" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"aZ" = ( +/obj/machinery/shipsensors{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/bridge) +"ba" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/random/multiple/corp_crate/talon_cargo, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"bc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"bd" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/power/sensor{ - name = "Talon Main Grid"; - name_tag = "TLN-MAIN-GRID" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable/green, -/obj/effect/catwalk_plated/dark, -/obj/structure/sign/department/eng{ - name = "ENGINEER'S QUARTERS"; - pixel_x = 32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"cX" = ( -/obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"cZ" = ( -/obj/structure/table/woodentable, -/obj/item/device/paicard, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"da" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"db" = ( /turf/simulated/wall/shull, -/area/talon_v2/brig) -"dc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"dd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_starboard) -"dh" = ( -/obj/structure/ore_box, -/obj/structure/railing/grey, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"di" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"dj" = ( -/obj/machinery/light/small, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"dl" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"dn" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"dp" = ( -/obj/machinery/computer/ship/sensors{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"dq" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"dr" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"ds" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"dt" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"dv" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"dw" = ( -/obj/machinery/vending/wallmed1{ - emagged = 1; - pixel_y = 32; - shut_up = 0 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"dz" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"dA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"dC" = ( +/area/talon_v2/ofd_ops) +"bf" = ( /obj/structure/railing/grey, /obj/machinery/light{ dir = 8 @@ -1379,209 +522,60 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) -"dD" = ( -/obj/structure/railing/grey{ +"bg" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/medical{ + id_tag = "talon_meddoor"; + name = "Doctor's Cabin"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/med_room) +"bh" = ( +/obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"dF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"bi" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/hydrant/south, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"bn" = ( +/obj/structure/hull_corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/space, +/area/space) +"bo" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 +/obj/machinery/computer/ship/sensors{ + dir = 8 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) -"dG" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"dJ" = ( -/obj/structure/catwalk, -/obj/structure/trash_pile, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"dK" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 9 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"dL" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"dN" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/weapon/tank/oxygen, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"dO" = ( -/obj/structure/sign/warning/airlock{ - pixel_x = -31 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/handrail{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"dP" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"dQ" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"dR" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"dT" = ( -/obj/structure/table/standard, -/obj/fiftyspawner/steel, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/item/device/paicard, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"dV" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_starboard) -"dW" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"dX" = ( -/obj/machinery/computer/ship/navigation, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/button/remote/blast_door{ - id = "talon_bridge_shields"; - name = "bridge blast shields"; - pixel_y = 16 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"dY" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"dZ" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/railing/grey, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"ed" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"ef" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"eg" = ( +"bp" = ( /obj/machinery/alarm/talon{ dir = 8; pixel_x = 22 @@ -1595,260 +589,63 @@ /obj/item/weapon/bedsheet/red, /turf/simulated/floor/carpet, /area/talon_v2/crew_quarters/sec_room) -"eh" = ( -/obj/machinery/door/firedoor/glass/talon, +"br" = ( +/obj/structure/flora/pottedplant/fern, +/obj/machinery/holoposter{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"bt" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1 +/obj/structure/window/reinforced{ + dir = 8 }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"ei" = ( -/obj/machinery/conveyor{ - id = "talontrash" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"ej" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/structure/window/reinforced{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/door/blast/regular/open{ + id = "talon_windows" }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/fore) -"ek" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"el" = ( -/obj/machinery/vending/engineering{ - products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/weapon/storage/belt/utility = 4, /obj/item/clothing/glasses/meson = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/tool/screwdriver = 12, /obj/item/weapon/tool/crowbar = 12, /obj/item/weapon/tool/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/weapon/tool/wrench = 12, /obj/item/device/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/weapon/light/tube = 10, /obj/item/clothing/head/hardhat/red = 4, /obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5, /obj/item/weapon/stock_parts/micro_laser = 5, /obj/item/weapon/stock_parts/matter_bin = 5, /obj/item/weapon/stock_parts/manipulator = 5, /obj/item/weapon/stock_parts/console_screen = 5); - req_access = list(301); - req_log_access = 301; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"eo" = ( +/obj/machinery/door/firedoor/glass/talon, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/bar) +"bx" = ( +/obj/structure/trash_pile, +/obj/machinery/camera/network/talon, +/obj/structure/railing/grey{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"ep" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "talontrash" - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "talontrashblast" - }, /turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"eq" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"er" = ( -/obj/effect/floor_decal/industrial/outline/yellow, +/area/talon_v2/engineering/star_store) +"bz" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"eu" = ( -/obj/structure/catwalk, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/fore_starboard) -"ew" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"ex" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "talontrash" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"ey" = ( -/obj/machinery/button/remote/airlock{ - dir = 4; - id = "talon_capdoor"; - name = "Door Bolts"; - pixel_x = 28; - specialfunctions = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"ez" = ( -/obj/machinery/light/small, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"eC" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/structure/railing/grey, -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"eD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"eF" = ( -/obj/structure/disposaloutlet{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"eG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) -"eH" = ( -/obj/effect/shuttle_landmark/premade/talon_v2_near_aft_port, -/turf/space, -/area/space) -"eI" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"eK" = ( -/obj/machinery/disposal/deliveryChute{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"eL" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/structure/flora/pottedplant/sticky, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"eM" = ( -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 1; - req_access = list(301) - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "talontrashblast"; - pixel_y = -28 - }, -/obj/machinery/conveyor_switch/oneway{ - id = "talontrash" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"eN" = ( -/obj/machinery/light/small, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"eP" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/wall/rshull, -/area/talon_v2/engineering) -"eR" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/loot_pile/maint/trash, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"eS" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"eT" = ( +/area/talon_v2/central_hallway/port) +"bB" = ( /obj/structure/railing/grey, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -1867,499 +664,100 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) -"eV" = ( -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"eX" = ( -/obj/machinery/atmospherics/portables_connector/aux, -/obj/effect/floor_decal/industrial/outline, -/obj/structure/railing/grey, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"eY" = ( -/obj/structure/sign/warning/airlock{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"eZ" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 10 - }, -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 28; - req_one_access = list(301) - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"fa" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"fb" = ( -/turf/simulated/wall/shull, -/area/talon_v2/engineering/star_store) -"fd" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/head/beret/talon, -/obj/item/clothing/head/beret/talon, -/obj/item/clothing/head/beret/talon, -/obj/item/clothing/head/beret/talon, -/obj/item/clothing/suit/storage/hooded/wintercoat/talon, -/obj/item/clothing/suit/storage/hooded/wintercoat/talon, -/obj/item/clothing/suit/storage/hooded/wintercoat/talon, -/obj/item/clothing/suit/storage/hooded/wintercoat/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"ff" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6 - }, -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -28; - req_one_access = list(301) - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"fg" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/table/rack/steel, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"fh" = ( -/obj/structure/sign/warning/airlock{ - pixel_y = -32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 - }, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"fi" = ( -/obj/structure/table/rack/shelf/steel, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"fj" = ( -/obj/structure/closet/walllocker_double/hydrant/west, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) -"fk" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/smartfridge/sheets/persistent_lossy{ - layer = 3.3 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"fm" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/aft_port) -"fn" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 4 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/structure/handrail{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/aft_port) -"fo" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/glass{ - name = "Cantina" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/bar) -"fp" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"bC" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock{ - name = "Storage Room" +/obj/structure/catwalk, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"bG" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"bI" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/department/bridge{ + pixel_y = 31 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"bJ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/sign/directions/bridge{ + dir = 1; + pixel_x = 32 }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/gen_store) -"fq" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 1; - id_tag = "talon_port_aft"; - pixel_y = -30; - req_one_access = list(301) - }, -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 28; - req_one_access = list(301) - }, -/obj/machinery/light/small, -/obj/structure/handrail{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/aft_port) -"fr" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 1; - id_tag = "talon_starboard_aft"; - pixel_y = -30; - req_one_access = list(301) - }, -/obj/machinery/airlock_sensor{ +/area/talon_v2/central_hallway/fore) +"bK" = ( +/obj/machinery/power/apc/talon{ dir = 4; - pixel_x = -28; - req_one_access = list(301) + name = "east bump"; + pixel_x = 24 }, -/obj/machinery/light/small, -/obj/structure/handrail{ - dir = 4 +/obj/structure/cable/green, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/aft_starboard) -"fs" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/structure/handrail{ dir = 8 }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor/grid, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"bM" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_starboard) -"fv" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"fw" = ( -/obj/structure/railing/grey, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"fx" = ( -/obj/structure/table/steel, -/obj/machinery/cell_charger, -/obj/item/weapon/cell/apc, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"fz" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"fC" = ( +"bN" = ( /obj/structure/reagent_dispensers/water_cooler/full, /obj/structure/sign/painting/public{ pixel_y = 30 }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/bar) -"fF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"fG" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/aft_port) -"fM" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"fN" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"fQ" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"bP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"fR" = ( -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor{ - pixel_x = -28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/aft_port) -"fS" = ( -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor{ - pixel_x = 28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/aft_starboard) -"fU" = ( -/obj/machinery/computer/ship/engines{ - dir = 8; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"fV" = ( -/turf/simulated/wall/shull, -/area/talon_v2/hangar) -"fW" = ( -/turf/simulated/wall/shull, -/area/talon_v2/refining) -"gb" = ( -/obj/structure/bed/chair/wood, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/sign/painting/public{ - pixel_x = 30 - }, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"gc" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 1; - id_tag = "talon_port"; - pixel_y = -30; - req_one_access = list(301) - }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"gd" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/junction{ - dir = 8; + dir = 2; icon_state = "pipe-j2" }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"ge" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"gg" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/whetstone, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"gj" = ( -/obj/machinery/power/sensor{ - name = "Talon Power Generation"; - name_tag = "TLN-PWR-GEN" - }, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/catwalk_plated/dark, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"gl" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"gm" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"gn" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/table/standard, -/obj/machinery/photocopier/faxmachine/talon, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"go" = ( -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"gr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"gs" = ( -/obj/effect/floor_decal/emblem/talon_big{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -2367,838 +765,113 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway/fore) -"gt" = ( -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"gu" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"bQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning/dust/corner, -/turf/simulated/floor/reinforced/airless, -/area/space) -"gx" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/structure/railing/grey, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"gA" = ( -/obj/structure/table/rack/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/obj/structure/closet/walllocker/medical/south, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"bT" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty/phoron, /turf/simulated/floor/plating, /area/talon_v2/engineering/star_store) -"gB" = ( +"bU" = ( /obj/machinery/light{ - dir = 1 + dir = 4 }, -/obj/structure/bed/chair/bay/chair, -/obj/machinery/camera/network/talon, -/obj/machinery/button/remote/blast_door{ - id = "talon_brig2"; - name = "Cell 2 Shutters"; - pixel_x = 7; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/machinery/button/remote/blast_door{ - id = "talon_brig1"; - name = "Cell 1 Shutters"; - pixel_x = -8; - pixel_y = 28; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"gD" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"gE" = ( -/obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"gF" = ( -/obj/machinery/ntnet_relay, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"gH" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Cargo Bay"; - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"gI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"gJ" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "talon_cargo_port"; - name = "Cargo Loading Hatch" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"gM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/catwalk, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"gN" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ - dir = 1 + dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) -"gO" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, +"bW" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"gP" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 1 }, -/obj/structure/hull_corner/long_vert{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"gR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"gU" = ( -/obj/machinery/power/apc/talon{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"gV" = ( -/obj/structure/disposalpipe/segment{ +/obj/structure/ship_munition/disperser_charge/explosive, +/obj/structure/railing{ dir = 1 }, -/obj/machinery/holoposter{ - dir = 4; - pixel_x = 32 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"gX" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 10 - }, -/turf/space, -/area/space) -"hb" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/obj/structure/vehiclecage/quadbike, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"hc" = ( -/obj/effect/floor_decal/emblem/talon_big{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"hg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/holoposter{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"hh" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"hi" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"hj" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/engineering/star_store) -"hk" = ( -/obj/machinery/light/small, -/obj/structure/sign/directions/engineering/engeqp{ - pixel_y = -24 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/eng_room) -"ho" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"hp" = ( -/obj/machinery/atmospherics/binary/algae_farm/filled{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"hr" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"hs" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/glass{ - name = "Cantina" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/bar) -"hu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"hw" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"hA" = ( -/obj/structure/bookcase/manuals/engineering, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"hD" = ( -/obj/structure/closet/autolok_wall{ - dir = 1; - pixel_y = -32 - }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 4 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"hG" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"hH" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/machinery/airlock_sensor{ - dir = 1; - pixel_y = -23; - req_one_access = list(301) - }, -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"hK" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/aft_starboard) -"hL" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"hM" = ( -/obj/structure/table/woodentable, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/medical, +/turf/simulated/floor/reinforced, +/area/talon_v2/ofd_ops) +"bX" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/med_room) -"hP" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"bY" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"hQ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"hS" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"hT" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"hU" = ( -/obj/machinery/camera/network/talon{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"hW" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/aft_port) -"hY" = ( -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline, +/obj/structure/railing/grey, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"ia" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +"bZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/wall/shull, /area/talon_v2/crew_quarters/bar) -"ig" = ( -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = 26 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"ii" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"ik" = ( -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"in" = ( -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"iq" = ( -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"ir" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/random/multiple/corp_crate/talon_cargo, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"iv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6 - }, -/obj/structure/handrail, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_port) -"iw" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular/open{ - id = "talon_windows" - }, -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/plating, -/area/talon_v2/crew_quarters/bar) -"iy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"iz" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"iB" = ( -/obj/machinery/mineral/stacking_machine, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"iD" = ( -/obj/structure/catwalk, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/aft_port) -"iF" = ( -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/wing_starboard) -"iI" = ( -/obj/machinery/atmospherics/portables_connector/aux{ - dir = 4 - }, -/obj/machinery/light/small, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"iJ" = ( -/obj/structure/catwalk, -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"iM" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"iN" = ( -/obj/machinery/vending/engivend{ - products = list(/obj/item/device/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/device/multitool = 4, /obj/item/weapon/cell/high = 10, /obj/item/weapon/airlock_electronics = 10, /obj/item/weapon/module/power_control = 10, /obj/item/weapon/circuitboard/airalarm = 10, /obj/item/weapon/circuitboard/firealarm = 10, /obj/item/weapon/circuitboard/status_display = 2, /obj/item/weapon/circuitboard/ai_status_display = 2, /obj/item/weapon/circuitboard/newscaster = 2, /obj/item/weapon/circuitboard/holopad = 2, /obj/item/weapon/circuitboard/intercom = 4, /obj/item/weapon/circuitboard/security/telescreen/entertainment = 4, /obj/item/weapon/stock_parts/motor = 2, /obj/item/weapon/stock_parts/spring = 2, /obj/item/weapon/stock_parts/gear = 2, /obj/item/weapon/circuitboard/atm, /obj/item/weapon/circuitboard/guestpass, /obj/item/weapon/circuitboard/keycard_auth, /obj/item/weapon/circuitboard/photocopier, /obj/item/weapon/circuitboard/fax, /obj/item/weapon/circuitboard/request, /obj/item/weapon/circuitboard/microwave, /obj/item/weapon/circuitboard/washing, /obj/item/weapon/circuitboard/scanner_console, /obj/item/weapon/circuitboard/sleeper_console, /obj/item/weapon/circuitboard/body_scanner, /obj/item/weapon/circuitboard/sleeper, /obj/item/weapon/circuitboard/dna_analyzer, /obj/item/weapon/circuitboard/partslathe); - req_access = list(301); - req_log_access = 301 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"iP" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"iQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/med_room) -"iR" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"iS" = ( +"cc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"iU" = ( -/obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"iV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"jb" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"jc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/grey, -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/obj/machinery/power/shield_generator/charged, -/obj/structure/cable/green{ d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"jg" = ( -/obj/effect/landmark/start{ - name = "Talon Pilot" - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"jh" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"ji" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"jk" = ( -/obj/structure/hull_corner/long_vert{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"jr" = ( -/obj/structure/fitness/weightlifter, -/obj/machinery/camera/network/talon{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"ju" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"jv" = ( -/obj/structure/table/woodentable, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "talon_quietroom"; - name = "window blast shields"; - pixel_x = 28 +/area/talon_v2/armory) +"cd" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"ce" = ( +/obj/machinery/cryopod/talon, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"cf" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/structure/closet/walllocker/medical/south, /obj/item/weapon/storage/firstaid/regular, /obj/item/weapon/storage/firstaid/o2, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"jx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/closet/walllocker_double/hydrant/west, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"jy" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"jC" = ( -/obj/machinery/atmospherics/pipe/tank/oxygen{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"jD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/item/device/radio/off{ + channels = list("Talon" = 1) }, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"jF" = ( -/obj/structure/table/bench/wooden, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"jG" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"jI" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/area/talon_v2/central_hallway/fore) +"cg" = ( +/obj/machinery/disposal/wall{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"jL" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"jM" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/hangar) -"jN" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"ch" = ( +/obj/structure/closet/excavation, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"jO" = ( +/area/talon_v2/anomaly_storage) +"ci" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -3208,1987 +881,81 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"jQ" = ( -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/gen_store) -"jS" = ( -/obj/machinery/mineral/output, -/obj/machinery/conveyor{ - dir = 8; - id = "talonrefinery" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"jY" = ( -/obj/structure/table/steel, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/pickaxe/drill, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"kc" = ( -/obj/machinery/conveyor{ +/obj/structure/closet/emergsuit_wall{ dir = 1; - id = "talonrefinery" + pixel_y = -32 }, -/obj/structure/sign/warning/moving_parts{ - pixel_x = 32 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"kd" = ( -/obj/effect/shuttle_landmark/premade/talon_v2_wing_star, -/turf/space, -/area/space) -"ke" = ( -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/wing_starboard) -"kf" = ( -/obj/machinery/power/apc/talon{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/green, /obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/handrail{ - dir = 4 + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"kg" = ( -/turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) -"ki" = ( -/obj/machinery/atmospherics/unary/engine/bigger{ - dir = 1 - }, -/turf/space, -/area/talon_v2/engineering/port) -"kj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, +"ck" = ( /obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"kk" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"kl" = ( -/obj/structure/sign/warning/airlock{ - pixel_x = -31 - }, -/obj/structure/handrail, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"kn" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - locked = 0 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"kr" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"kt" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"ku" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/random/multiple/corp_crate/talon_cargo, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"kx" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"kz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light/small, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"kA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"kC" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/structure/handrail{ - dir = 1 +/obj/structure/disposalpipe/segment, +/obj/machinery/door/airlock/engineering{ + id_tag = "talon_engdoor"; + name = "Engineer's Cabin"; + req_one_access = list(301) }, /turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_starboard) -"kD" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -26; - pixel_y = -25 - }, +/area/talon_v2/engineering/star_store) +"cl" = ( +/obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/bar) -"kG" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/corner/black/diagonal, -/obj/machinery/camera/network/talon{ - dir = 8 - }, -/obj/random/mre, -/obj/random/mre, -/obj/random/mre, -/obj/random/mre, -/obj/random/mre, -/obj/random/mre, -/obj/structure/closet/walllocker_double/kitchen/east{ - name = "Ration Cabinet" - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"kH" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"kI" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/catwalk_plated/dark, -/turf/simulated/floor/plating, -/area/shuttle/talonboat) -"kJ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"kM" = ( -/obj/structure/closet/autolok_wall{ - dir = 1; - pixel_y = -32 - }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"kP" = ( -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/obj/machinery/power/smes/buildable/offmap_spawn{ - RCon_tag = "Talon Port SMES" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"kR" = ( -/obj/structure/handrail, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"kS" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, +"cn" = ( /obj/machinery/light/small{ - dir = 4 + dir = 1 }, -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"kT" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/structure/catwalk, -/obj/structure/railing/grey, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"kU" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"cp" = ( +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "talon_capdoor"; + name = "Door Bolts"; + pixel_x = 28; + specialfunctions = 4 }, /obj/structure/cable/green{ d1 = 1; - d2 = 8; - icon_state = "1-8" + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"kW" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"ct" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"cw" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"cy" = ( /obj/effect/shuttle_landmark/premade/talon_v2_near_fore_star, /turf/space, /area/space) -"kX" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"kY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6 - }, -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"kZ" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"lc" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"le" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/handrail{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"lf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"lg" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_port) -"lj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/fore) -"lk" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"lm" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/handrail, -/obj/structure/closet/autolok_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"ln" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"lr" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"ls" = ( -/obj/structure/bed/chair/bay/comfy/brown{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"lv" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/conveyor_switch/oneway{ - id = "talonrefinery"; - name = "Conveyor Control"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/refining) -"lw" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/engineering{ - name = "Talon Starboard Engines"; - req_one_access = list(301) - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"lx" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"lA" = ( -/obj/machinery/light/small, -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/refining) -"lB" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"lC" = ( -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"lD" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/landmark/start{ - name = "Talon Guard" - }, -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "talon_secdoor"; - name = "Door Bolts"; - pixel_x = 28; - specialfunctions = 4 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/sec_room) -"lF" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/gen_store) -"lI" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/holoposter{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"lJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"lM" = ( -/obj/effect/landmark/start{ - name = "Talon Captain" - }, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"lN" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"lO" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"lP" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/closet/walllocker_double/hydrant/west, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"lR" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/loading{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"lS" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"lT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"lU" = ( -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/pilot_room) -"lV" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"lW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/holoposter{ - dir = 1; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"lX" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"lZ" = ( -/obj/item/modular_computer/console/preset/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"ma" = ( -/obj/machinery/cryopod/robot/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"mb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/holoposter{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"mc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"md" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"me" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/accessory/holster/machete, -/obj/item/weapon/material/knife/machete, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"mk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/catwalk, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"ml" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"mm" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"mo" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ms" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"mt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"mu" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/holoposter{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"mw" = ( -/turf/simulated/wall/shull, -/area/talon_v2/maintenance/wing_starboard) -"mx" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway) -"mA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"mC" = ( -/obj/structure/sign/warning/airlock{ - pixel_x = -31 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/handrail{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"mE" = ( -/obj/structure/sign/directions/cargo/refinery{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"mG" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/closet/walllocker/medical/west, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"mH" = ( -/obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"mI" = ( -/obj/structure/hull_corner{ - dir = 8 - }, -/turf/space, -/area/space) -"mM" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"mO" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"mP" = ( -/obj/structure/railing/grey, -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"mQ" = ( -/obj/structure/railing/grey, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"mS" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/refining) -"mT" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"mV" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"mX" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"mZ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"nb" = ( -/obj/structure/flora/pottedplant/minitree, -/obj/machinery/holoposter{ - dir = 1; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"nc" = ( -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"ne" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ng" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"nh" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 9 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/engineering/starboard) -"nk" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/wing_port) -"nl" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"nn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"nq" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"ns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/pilot_room) -"nu" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"nw" = ( -/obj/structure/catwalk, -/obj/structure/handrail{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/fore_starboard) -"nx" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/item/modular_computer/console/preset/talon{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"nz" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light/small, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"nB" = ( -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"nC" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"nD" = ( -/obj/structure/table/woodentable, -/obj/machinery/camera/network/talon{ - dir = 8 - }, -/obj/machinery/recharger, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"nE" = ( -/obj/structure/table/woodentable, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/item/weapon/paper/talon_guard, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/sec_room) -"nH" = ( -/obj/machinery/light, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"nI" = ( -/obj/machinery/power/smes/buildable/offmap_spawn{ - RCon_tag = "Talon Port SMES" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"nK" = ( -/obj/structure/closet/walllocker/emerglocker/west, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"nL" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"nM" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock{ - id_tag = "talon_restroom2"; - name = "Unisex Restroom" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"nN" = ( -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = 26 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"nP" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"nS" = ( -/obj/machinery/atmospherics/portables_connector/aux, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"nW" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/noticeboard{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"oc" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"od" = ( -/turf/simulated/floor/reinforced, -/area/talon_v2/hangar) -"oh" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/crew_quarters/bar) -"ol" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/machinery/door/blast/regular/open{ - id = "talon_boat_east" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 4; - pixel_x = 11; - pixel_y = 24; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"om" = ( +"cA" = ( /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/maintenance/wing_port) -"on" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/pilot_room) -"oo" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"op" = ( -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"oq" = ( -/obj/structure/sign/warning/airlock{ - pixel_x = 32 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"or" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/refining) -"ow" = ( -/obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"ox" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"oz" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"oA" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"oC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/blast/regular/open{ - id = "talon_windows" - }, -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/plating, -/area/talon_v2/crew_quarters/cap_room) -"oF" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, -/obj/item/device/mass_spectrometer/adv, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"oG" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"oK" = ( -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = -26 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"oN" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/glass_research{ - name = "Anomaly Storage"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/anomaly_storage) -"oO" = ( -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"oS" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/computer/guestpass{ - dir = 8; - pixel_x = 26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"oT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"oU" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"oV" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"oW" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "talon_restroom2"; - name = "Door Bolts"; - pixel_x = -28; - specialfunctions = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"pa" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"pb" = ( -/obj/machinery/camera/network/talon{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"pc" = ( -/obj/machinery/washing_machine, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/crew_quarters/restrooms) -"pf" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"pi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_starboard) -"pk" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/turf/simulated/wall/rshull, -/area/shuttle/talonboat) -"pl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"pn" = ( -/obj/structure/flora/pottedplant/fern, -/obj/machinery/holoposter{ - dir = 1; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"po" = ( -/obj/machinery/fitness/punching_bag, -/obj/structure/sign/painting/public{ - pixel_x = 30 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"pp" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/closet/walllocker_double/hydrant/east, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"pr" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"pt" = ( -/obj/structure/cable/yellow{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/terminal{ - dir = 4 - }, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"pv" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/alarm/talon{ - pixel_y = 28 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"pw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"px" = ( -/obj/machinery/oxygen_pump{ - dir = 4; - pixel_x = 30 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"pA" = ( -/obj/structure/disposalpipe/junction/yjunction{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"pB" = ( -/obj/structure/table/standard, -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/crew_quarters/restrooms) -"pC" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"pE" = ( -/obj/structure/catwalk, -/obj/structure/railing/grey, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"pG" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"pH" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"pK" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light/small, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"pL" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/sign/department/commander{ - pixel_x = -28 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"pN" = ( -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"pQ" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"pR" = ( -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/obj/structure/table/steel, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"pT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"pV" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on, -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"pZ" = ( -/obj/structure/table/rack/shelf/steel, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"qa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"qb" = ( -/obj/structure/bed/chair/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"qc" = ( -/obj/structure/bed/chair/bay/chair, -/obj/machinery/alarm/talon{ - pixel_y = 24 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"qe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"qi" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/camera/network/talon, -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"qk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"ql" = ( -/obj/structure/hull_corner{ - dir = 4 - }, -/turf/space, -/area/space) -"qm" = ( -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 1; - req_access = list(301) - }, -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 2; - req_access = list(301) - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "talon_brig1"; - name = "Cell Shutters"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"qn" = ( -/obj/structure/hull_corner{ - dir = 8 - }, -/obj/structure/lattice, -/turf/space, -/area/space) -"qo" = ( -/obj/structure/table/rack/steel, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"qp" = ( -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/bar) -"qq" = ( -/obj/structure/closet/walllocker_double/south, -/obj/structure/handrail{ - dir = 1 - }, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"qr" = ( -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/med_room) -"qs" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"qt" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"qu" = ( -/obj/structure/barricade, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"qv" = ( -/obj/structure/table/rack/steel, -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"qw" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/structure/cable/green, -/obj/machinery/power/apc/talon{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"qy" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"qC" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/engi{ - name = "Port Eng. Storage"; - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"qD" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/pipe_dispenser, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"qE" = ( +"cB" = ( /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -5196,454 +963,178 @@ dir = 4 }, /turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"qH" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/mining{ - name = "Refinery"; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/refining) -"qI" = ( -/obj/structure/table/woodentable, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"qJ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"qK" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/effect/catwalk_plated, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/star) -"qL" = ( -/obj/structure/closet/walllocker_double/south, -/obj/machinery/light, -/obj/item/weapon/extinguisher, -/obj/item/stack/cable_coil/green, -/obj/item/stack/cable_coil/green, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"qN" = ( -/turf/simulated/wall/shull{ - can_open = 1 - }, -/area/talon_v2/workroom) -"qO" = ( -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"qP" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/random/multiple/corp_crate/talon_cargo, +/area/talon_v2/crew_quarters/cap_room) +"cC" = ( /obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"qQ" = ( -/obj/structure/sign/warning/moving_parts{ - pixel_y = -32 - }, -/obj/machinery/conveyor{ - dir = 4; - id = "talonrefinery" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"qU" = ( -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"qV" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"qW" = ( -/obj/machinery/atmospherics/omni/atmos_filter{ - name = "CO2 Filter"; - tag_east = 2; - tag_north = 1; - tag_south = 5 - }, -/obj/effect/catwalk_plated/dark, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"qX" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"rg" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"rh" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/closet/walllocker_double/hydrant/west, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"ri" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"rj" = ( -/obj/machinery/holoposter{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"rk" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 6 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"rl" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/engineering/starboard) -"rm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_port) -"rq" = ( -/obj/structure/bed, -/obj/item/weapon/bedsheet/mime, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"rt" = ( -/obj/effect/floor_decal/emblem/talon_big, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"ru" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/glass, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"rv" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/workroom) -"rw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"rx" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"rz" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/stack/material/algae, -/obj/item/stack/material/algae, -/obj/item/stack/material/algae, -/obj/item/stack/material/algae, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"rB" = ( -/obj/structure/railing/grey, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"rC" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/handcuffs, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"rF" = ( -/obj/machinery/suit_cycler/vintage/tcrew, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"rG" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/adv{ - pixel_x = 2; - pixel_y = 5 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/closet/walllocker_double/medical/south, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"rI" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/glass{ - name = "Hangar Bay"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/hangar) -"rJ" = ( -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/catwalk, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"rL" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"rP" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/structure/railing/grey, -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"rQ" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"rR" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/obj/structure/railing/grey, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"rS" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/structure/railing/grey, -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"rT" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/engineering{ - name = "Talon Starboard Engines"; - req_one_access = list(301) - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"rU" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"rW" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"sc" = ( -/obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"se" = ( -/obj/structure/closet/crate/engineering, -/obj/fiftyspawner/cardboard, -/obj/fiftyspawner/floor, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/plastic, -/obj/fiftyspawner/steel, -/obj/fiftyspawner/wood, -/obj/item/stack/material/plasteel{ - amount = 30 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"sf" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"sh" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"sl" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, /turf/simulated/floor/plating, /area/talon_v2/engineering/star_store) -"sn" = ( +"cG" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/security{ + id_tag = "talon_secdoor"; + name = "Guard's Cabin"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/crew_quarters/sec_room) +"cH" = ( +/obj/machinery/fitness/punching_bag, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"cK" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/blast/regular/open{ + id = "talon_boat_cockpit" + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/shuttle/talonboat) +"cL" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"cN" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/sec{ + id_tag = "talon_secdoor"; + req_one_access = list(301) + }, +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/sec_room) +"cP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"cU" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"cV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/closet/walllocker_double/east, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device, +/obj/item/weapon/cell/device, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"cX" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"cZ" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/door/airlock{ + name = "Observation Room" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/meditation) +"db" = ( +/turf/simulated/wall/shull, +/area/talon_v2/brig) +"dd" = ( +/obj/structure/sign/warning/airlock{ + pixel_x = 32 + }, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"de" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"df" = ( +/obj/effect/landmark/start{ + name = "Talon Miner" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"di" = ( +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"dj" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/command{ id_tag = "talon_capdoor"; @@ -5666,856 +1157,147 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/crew_quarters/cap_room) -"so" = ( -/obj/item/weapon/storage/dicecup/loaded{ - pixel_x = 7; - pixel_y = 11 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black/diagonal, -/obj/structure/table/marble, -/obj/item/weapon/deck/cards{ - pixel_x = 3 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"ss" = ( -/obj/structure/sign/periodic{ - pixel_y = 32 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"sv" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon, -/obj/item/clothing/accessory/holster/waist, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"sw" = ( -/obj/machinery/power/apc/talon{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, +"dl" = ( /obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"sx" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"sz" = ( -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "talon_bridge_shields" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/dust, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/bridge) -"sC" = ( -/obj/structure/closet/walllocker_double/hydrant/west, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"sD" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/sign/directions/bar{ - dir = 1; - pixel_x = -32; - pixel_y = -3 - }, -/obj/structure/sign/directions/bridge{ - dir = 1; - pixel_x = -32; - pixel_y = 3 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"sE" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"sF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"sI" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"sJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"sK" = ( +/area/talon_v2/engineering/atmospherics) +"dn" = ( +/obj/machinery/door/firedoor/glass/talon, /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "talon_brig2"; - name = "Cell Shutters"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/plating, -/area/talon_v2/brig) -"sL" = ( -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"sM" = ( -/obj/effect/landmark/map_data/talon, -/turf/space, -/area/space) -"sT" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"sV" = ( -/obj/structure/catwalk, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"sZ" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"ta" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"tb" = ( -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"tc" = ( -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"td" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"te" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/engineering{ - id_tag = "talon_engdoor"; - name = "Engineer's Cabin"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/crew_quarters/eng_room) -"tf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"tg" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"ti" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = -26 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"tj" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"tk" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"tl" = ( -/obj/effect/floor_decal/emblem/talon_big{ - dir = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"tm" = ( -/obj/structure/lattice, -/turf/space, -/area/space) -"tn" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = 24 - }, -/obj/item/weapon/storage/backpack/dufflebag/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"to" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/directions/medical{ - dir = 4; - pixel_x = 32; - pixel_y = -3 - }, -/obj/structure/sign/directions/engineering{ - pixel_x = 32; - pixel_y = 3 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"tp" = ( -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"tu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"tw" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/medical{ - id_tag = "talon_meddoor"; - name = "Doctor's Cabin"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/med_room) -"tx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/directions/engineering{ - pixel_x = 32; - pixel_y = -6 - }, -/obj/structure/sign/directions/cargo{ - dir = 4; - pixel_x = 32 - }, -/obj/structure/sign/directions/science/xenoarch{ - dir = 4; - pixel_x = 32; - pixel_y = 6 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"ty" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"tz" = ( -/obj/structure/closet/secure_closet/talon_pilot, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/pilot_room) -"tA" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/closet/walllocker_double/hydrant/east, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"tB" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/closet/walllocker_double/east, -/obj/item/weapon/storage/toolbox/electrical, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"tC" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/aft_port) -"tD" = ( -/obj/structure/table/rack/shelf/steel, -/obj/random/maintenance/cargo, -/obj/random/maintenance/cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/gen_store) -"tE" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "talonboat_docker"; - pixel_y = 24 - }, -/obj/machinery/computer/shuttle_control/explore/talonboat{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"tJ" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/machinery/recharger, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"tK" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"tM" = ( -/obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"tQ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"tR" = ( -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black/diagonal, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"tU" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"tX" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"tY" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/wall{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"tZ" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 5 - }, -/turf/space, -/area/space) -"ub" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/turf/simulated/wall/rshull, -/area/shuttle/talonboat) -"uc" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"ud" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/machinery/airlock_sensor{ - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/structure/handrail, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"uf" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"uh" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"ui" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"uk" = ( -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"ul" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"um" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, /obj/machinery/door/blast/regular/open{ dir = 4; id = "talon_bridge_shields" }, /turf/simulated/floor/plating, /area/talon_v2/bridge) -"up" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 6 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"uv" = ( -/obj/structure/barricade, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"uw" = ( -/obj/structure/flora/pottedplant/tall, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/crew_quarters/restrooms) -"ux" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - locked = 0 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"uz" = ( -/obj/structure/catwalk, -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"uA" = ( -/obj/machinery/power/apc/talon{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/pilot_room) -"uB" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"uF" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/void/refurb/talon, -/obj/item/clothing/head/helmet/space/void/refurb/talon, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"uH" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/canister/empty, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, +"dp" = ( /obj/structure/railing/grey{ dir = 1 }, +/obj/machinery/oxygen_pump{ + dir = 8; + pixel_x = -30 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"dq" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"uI" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"uJ" = ( -/obj/structure/sign/warning/airlock{ - pixel_x = 32 - }, -/obj/structure/handrail, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"uK" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"uL" = ( -/obj/structure/hull_corner/long_vert{ - dir = 5 - }, -/turf/space, -/area/space) -"uM" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, +"dr" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"uO" = ( -/obj/structure/flora/pottedplant/shoot, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"uQ" = ( -/obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"uR" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/railing/grey, -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"uS" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/sign/department/biblio{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"uT" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"uU" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"uV" = ( -/obj/structure/closet/walllocker_double/south, -/obj/structure/handrail{ - dir = 1 - }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"uW" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/suit/space/void/refurb/talon, -/obj/item/clothing/head/helmet/space/void/refurb/talon, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/aft_starboard) +"dt" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"uZ" = ( -/obj/structure/closet/wardrobe/black{ - starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/weapon/storage/backpack/messenger/black = 4, /obj/item/weapon/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) +/obj/structure/window/reinforced, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/crew_quarters/restrooms) -"va" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"dv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/junction, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/fore) +"dw" = ( +/obj/machinery/vending/wallmed1{ + emagged = 1; + pixel_y = 32; + shut_up = 0 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"dA" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"dB" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/port) +"dC" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"dD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/department/eng{ - pixel_y = -32 + dir = 10 }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"dH" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"vb" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/star_store) +"dI" = ( +/obj/machinery/light/small, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 2; + pixel_y = -28 + }, /obj/structure/cable/yellow{ d2 = 8; icon_state = "0-8" @@ -6525,1631 +1307,54 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering) -"vc" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +"dJ" = ( +/obj/machinery/conveyor{ + dir = 1; + id = "talonrefinery" }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"vd" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"ve" = ( -/obj/machinery/suit_cycler/vintage/tmedic, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"vh" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on, -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"vi" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"vp" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/brig) -"vs" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"vt" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/workroom) -"vw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/holoposter{ - dir = 4; +/obj/structure/sign/warning/moving_parts{ pixel_x = 32 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"vx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/refining) -"vy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/handrail, -/obj/structure/closet/autolok_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"vz" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/table/steel, -/obj/random/maintenance/engineering, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"vA" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/light, -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"vB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/catwalk, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"vC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/catwalk, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"vE" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"vF" = ( -/obj/effect/landmark/talon, -/obj/structure/handrail, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"vG" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"vH" = ( -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"vJ" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"vL" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"vP" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/visible, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"vR" = ( -/obj/structure/handrail{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"vU" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/medical{ - id_tag = "talon_meddoor"; - name = "Doctor's Cabin"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/med_room) -"vV" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/closet/crate/secure/phoron{ - req_one_access = list(301) - }, -/obj/item/weapon/tank/phoron/pressurized{ - pixel_x = -3 - }, -/obj/item/weapon/tank/phoron/pressurized{ - pixel_x = 3 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"vW" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"vY" = ( -/obj/structure/table/steel, -/obj/item/weapon/pickaxe/drill, -/obj/machinery/button/remote/blast_door{ - id = "talon_boat_cockpit"; - pixel_y = 28 - }, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"vZ" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/medical{ - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/medical) -"wa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/bed/chair/bay/chair, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/sec_room) -"wd" = ( -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"we" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"wg" = ( -/obj/structure/sign/directions/engineering{ - pixel_x = 32; - pixel_y = 3 - }, -/obj/structure/sign/directions/medical{ - pixel_x = 32; - pixel_y = -3 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"wh" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light, -/obj/structure/sign/department/armory{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"wi" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/fore_port) -"wj" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/turf/simulated/wall/rshull, -/area/talon_v2/engineering/starboard) -"wm" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"wo" = ( -/obj/machinery/suit_cycler/vintage/tcaptain, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"wr" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"ws" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"wu" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"wx" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/eng_room) -"wy" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"wz" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"wB" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"wF" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"wH" = ( -/obj/machinery/pointdefense_control{ - id_tag = "talon_pd" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"wM" = ( -/obj/structure/closet/walllocker/emerglocker/west, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) -"wN" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"wO" = ( -/obj/structure/bed/chair/bay/comfy/brown{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"wP" = ( -/obj/structure/catwalk, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/fore_port) -"wS" = ( -/obj/structure/catwalk, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"wU" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/sec{ - id_tag = "talon_secdoor"; - req_one_access = list(301) - }, -/turf/simulated/floor/plating, -/area/talon_v2/crew_quarters/sec_room) -"wV" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/flora/pottedplant/mysterious, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"wW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/engineeringatmos{ - name = "Talon Atmospherics"; - req_one_access = list(301) - }, -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = 26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/engineering/atmospherics) -"wX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"wZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"xb" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/item/weapon/paper/dockingcodes, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"xd" = ( -/obj/structure/bed/chair/bay/chair, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"xf" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/directions/security/armory{ - dir = 10; - pixel_x = -32; - pixel_y = -6 - }, -/obj/structure/sign/directions/security{ - dir = 1; - pixel_x = -32; - pixel_y = 6 - }, -/obj/structure/sign/directions/security/brig{ - dir = 1; - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"xh" = ( -/obj/machinery/computer/ship/helm{ - req_one_access = list(301) - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"xi" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"xk" = ( -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"xm" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/sign/department/bar{ - pixel_x = 29 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"xq" = ( -/obj/effect/floor_decal/corner/black/diagonal, -/obj/structure/table/marble, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"xr" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"xt" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"xu" = ( -/obj/structure/railing/grey, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"xv" = ( -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"xw" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/wall{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"xx" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 6 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"xB" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"xE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/handrail, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"xH" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/engineering/port_store) -"xJ" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"xL" = ( -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"xM" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "talon_quietroom" - }, -/turf/simulated/floor/plating, -/area/talon_v2/crew_quarters/meditation) -"xN" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"xP" = ( -/obj/structure/catwalk, -/obj/structure/barricade, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"xQ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/holoposter{ - dir = 1; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"xR" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"xW" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"xX" = ( -/obj/machinery/door/blast/regular{ - dir = 4; - id = "talon_cargo_star"; - name = "Cargo Loading Hatch" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"xZ" = ( -/obj/structure/bookcase/manuals/xenoarchaeology, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"ya" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"yc" = ( -/obj/machinery/light/small, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"yd" = ( -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"yf" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"yg" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"yh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/holoposter{ - pixel_y = -32 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"yj" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"ym" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/department/medbay{ - pixel_y = 32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/star) -"yo" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/catwalk, -/obj/structure/closet/walllocker_double/west, -/obj/item/weapon/cell/apc, -/obj/item/weapon/cell/apc, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/head/radiation, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"yp" = ( -/obj/item/modular_computer/console/preset/talon{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"yq" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"yr" = ( -/obj/effect/overmap/visitable/ship/talon, -/turf/space, -/area/space) -"yu" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/fore_starboard) -"yv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 10 - }, -/obj/structure/handrail, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_starboard) -"yw" = ( -/obj/structure/catwalk, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/wing_port) -"yx" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"yA" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"yC" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"yD" = ( -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"yF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"yJ" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_port) -"yN" = ( -/obj/structure/trash_pile, -/obj/machinery/camera/network/talon, -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"yO" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/table/rack/steel, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"yP" = ( -/obj/machinery/vending/food{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"yR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/directions/security/armory{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"yU" = ( -/obj/structure/table/woodentable, -/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/engineer, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/eng_room) -"yV" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/hangar) -"yW" = ( -/turf/simulated/wall/shull{ - can_open = 1 - }, -/area/talon_v2/engineering/atmospherics) -"yX" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"yY" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"yZ" = ( -/obj/structure/closet/crate, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/machinery/camera/network/talon{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"zd" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"zj" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/camera/network/talon, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"zm" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/engineering/starboard) -"zn" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/closet/walllocker_double/hydrant/east, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"zo" = ( -/obj/machinery/media/jukebox, -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"zq" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/fore_port) -"zs" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/engineering{ - name = "Talon Port Engines & Spare Fuel"; - req_one_access = list(301) - }, -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = -26 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"zu" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"zv" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/oxygen, -/obj/item/weapon/tank/oxygen, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"zw" = ( -/obj/effect/floor_decal/emblem/talon_big{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"zy" = ( -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"zz" = ( -/obj/structure/table/rack/shelf/steel, -/obj/random/maintenance/cargo, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/random/maintenance/cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/gen_store) -"zB" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/head/helmet/space/void/refurb/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"zC" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"zF" = ( -/obj/structure/catwalk, -/obj/structure/handrail{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/wing_starboard) -"zH" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"zI" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"zJ" = ( -/obj/machinery/vending/tool{ - req_log_access = 301 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"zK" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"zL" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/powered/pump/filled, -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"zM" = ( -/obj/machinery/door/window/brigdoor/eastright{ - req_access = list(); - req_one_access = list(301) - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"zQ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"zT" = ( -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/fore_port) -"zV" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"zW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"zX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"zZ" = ( -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"Ad" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"Ag" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"Aj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"An" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) -"Aq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/department/telecoms{ - pixel_y = -31 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"As" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"At" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"Av" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"Aw" = ( +"dK" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/glass{ - name = "Flight Control" + name = "Cantina" }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"Ax" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/bar) +"dL" = ( +/obj/structure/railing/grey{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"Az" = ( -/obj/structure/table/steel, -/obj/item/device/radio/off{ - channels = list("Talon" = 1); - pixel_y = 6 - }, -/obj/item/device/radio/off{ - channels = list("Talon" = 1); - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/device/radio/off{ - channels = list("Talon" = 1); - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"AD" = ( +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"dN" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/suit/space/void/refurb/talon, /obj/item/clothing/head/helmet/space/void/refurb/talon, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) -"AE" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"AH" = ( -/obj/machinery/power/apc/talon{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/disposalpipe/segment{ +"dO" = ( +/obj/machinery/light_switch{ dir = 4; - icon_state = "pipe-c" + pixel_x = -26; + pixel_y = 24 }, /turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"AI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"AJ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"AL" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/area/talon_v2/crew_quarters/bar) +"dP" = ( +/obj/effect/shuttle_landmark/premade/talon_v2_near_fore_port, +/turf/space, +/area/space) +"dT" = ( +/obj/machinery/light{ dir = 8 }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"AN" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/machinery/door/blast/regular/open{ - id = "talon_boat_east" - }, -/obj/machinery/button/remote/blast_door{ - dir = 1; - id = "talon_boat_east"; - pixel_y = -28; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"AO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/sign/department/medbay{ - name = "DOCTOR'S QUARTERS"; - pixel_x = 32 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"AQ" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/item/weapon/paper/talon_doctor, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/med_room) -"AR" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/tank/jetpack/carbondioxide, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"AS" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"dW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -8158,849 +1363,44 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/bridge) -"AT" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"AU" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/random/multiple/corp_crate/talon_cargo, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"AV" = ( -/obj/effect/floor_decal/industrial/warning{ +"dX" = ( +/obj/structure/bed/chair/bay/comfy/brown{ dir = 1 }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"AW" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"AX" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/talon_v2/crew_quarters/bar) -"AY" = ( -/obj/machinery/mineral/unloading_machine, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"AZ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/catwalk, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Bb" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Bc" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/engineering/port) -"Bd" = ( -/obj/machinery/computer/ship/sensors, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"Be" = ( -/turf/simulated/wall/shull{ - can_open = 1 - }, -/area/talon_v2/gen_store) -"Bf" = ( -/obj/machinery/shipsensors{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/bridge) -"Bi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"Bk" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on{ - dir = 4 - }, -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Bn" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Bq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"Br" = ( -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/wing_port) -"Bs" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/sec{ - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"Bt" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"Bu" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"Bv" = ( -/obj/machinery/button/remote/blast_door{ - id = "talon_cargo_port"; - name = "Cargo Loading Hatches"; - pixel_y = -28 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/window/brigdoor/northleft{ - req_access = list(); - req_one_access = list(301) - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"Bw" = ( -/turf/simulated/wall/shull, -/area/talon_v2/workroom) -"By" = ( -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"BB" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_port) -"BC" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"BF" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"BH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/structure/closet/walllocker/medical/south, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"BJ" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/junction{ dir = 2; - icon_state = "pipe-j2" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway) -"BK" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/wall, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"BN" = ( -/turf/simulated/wall/shull{ - can_open = 1 - }, -/area/talon_v2/crew_quarters/restrooms) -"BO" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/binary/pump/on{ - dir = 8; - name = "Waste Compresser" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"BT" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"BU" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 + icon_state = "pipe-c" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"BV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"BW" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 1; - id_tag = "talon_starboard_fore"; - pixel_y = -30; - req_one_access = list(301) - }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_starboard) -"BX" = ( -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, +/area/talon_v2/bridge) +"dZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"ec" = ( /obj/machinery/power/apc/talon{ dir = 1; name = "north bump"; pixel_y = 28 }, -/obj/structure/table/rack/steel, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"BY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"BZ" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/item/weapon/paper/talon_power, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/eng_room) -"Cb" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_centcom{ - name = "Talon Storage"; - req_one_access = list(301) - }, /obj/structure/cable/green{ - d1 = 1; d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) -"Cd" = ( -/obj/structure/closet/secure_closet/personal/cabinet{ - locked = 0 - }, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"Ce" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 10 - }, -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"Cf" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "talon_anomalystorage" - }, -/turf/simulated/floor/plating, -/area/talon_v2/anomaly_storage) -"Cg" = ( -/obj/structure/bed/chair/office/light, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/workroom) -"Ck" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/catwalk, -/obj/structure/closet/walllocker/medical/south, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/fire, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Cq" = ( -/obj/effect/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"Cr" = ( -/obj/structure/trash_pile, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Cs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/obj/structure/closet/walllocker_double/east, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device, -/obj/item/weapon/cell/device, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Cw" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/light, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 8; - pixel_y = -26 - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_x = -6; - pixel_y = -24 + icon_state = "0-2" }, /turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"Cx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/department/shield{ - pixel_y = -31 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Cy" = ( -/obj/machinery/light/small{ +/area/talon_v2/ofd_ops) +"ed" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"CA" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/structure/catwalk, -/obj/structure/railing/grey, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"CB" = ( -/obj/machinery/suit_cycler/vintage/tpilot, -/obj/machinery/button/remote/airlock{ - id = "talon_pilotdoor"; - name = "Door Bolts"; - pixel_y = 28; - specialfunctions = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/pilot_room) -"CC" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"CD" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"CE" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"CF" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock{ - id_tag = "talon_charger"; - name = "Cyborg Recharging Station" - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"CH" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/item/weapon/paper/talon_pilot, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"CI" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"CL" = ( -/obj/machinery/light/small, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"CN" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"CO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"CP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/network/talon, -/obj/machinery/atm{ - pixel_y = 31 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"CS" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/medical{ - req_one_access = list(301) - }, -/turf/simulated/floor/plating, -/area/talon_v2/medical) -"CU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/anomaly_storage) -"CV" = ( -/obj/structure/catwalk, -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"CX" = ( -/turf/simulated/wall/shull, -/area/talon_v2/maintenance/fore_port) -"CY" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"Dc" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/gen_store) -"Dd" = ( -/turf/simulated/wall/shull, -/area/talon_v2/secure_storage) -"Dg" = ( -/obj/structure/hull_corner/long_vert{ - dir = 9 - }, -/turf/space, -/area/space) -"Dh" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Di" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/structure/closet/walllocker/medical/east, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"Dj" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Dm" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Dp" = ( -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/wing_port) -"Dq" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/aft_starboard) -"Ds" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 4 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Du" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_port) -"Dx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"Dy" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"DB" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/hangar) -"DC" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/blast/regular/open{ - id = "talon_boat_cockpit" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/shuttle/talonboat) -"DD" = ( -/turf/simulated/wall/shull, -/area/talon_v2/maintenance/aft_starboard) -"DG" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/obj/structure/closet/walllocker_double/hydrant/west, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"DH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/camera/network/talon{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"DI" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/grey, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"DK" = ( -/obj/machinery/vending/nifsoft_shop, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"DM" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/catwalk, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"DP" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"DR" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 9 - }, -/obj/structure/catwalk, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"DU" = ( +/area/talon_v2/bridge) +"eg" = ( /obj/machinery/vending/boozeomat{ density = 0; pixel_y = 32; @@ -9025,246 +1425,260 @@ }, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/bar) -"DW" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"DX" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"DY" = ( -/obj/machinery/light/small{ - dir = 4 - }, +"eh" = ( +/obj/structure/flora/pottedplant/shoot, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"ei" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"ej" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"Ea" = ( -/obj/machinery/computer/ship/sensors{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"Eb" = ( -/obj/structure/reagent_dispensers/watertank/high, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/gen_store) -"Ef" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Ek" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock{ - id_tag = "talon_pilotdoor"; - name = "Pilot's Cabin"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/crew_quarters/pilot_room) -"En" = ( -/obj/structure/table/standard, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"Eo" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/blast/regular/open{ - dir = 4; - id = "talon_boat_cockpit" - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/shuttle/talonboat) -"Ep" = ( -/obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Eq" = ( -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"Er" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Et" = ( -/obj/structure/catwalk, -/obj/structure/trash_pile, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"Ev" = ( -/obj/effect/floor_decal/emblem/talon_big{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"Ew" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"Ey" = ( -/obj/structure/table/rack/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"EB" = ( +/area/talon_v2/central_hallway/fore) +"ek" = ( +/obj/structure/table/woodentable, +/obj/item/modular_computer/tablet/preset/custom_loadout/advanced, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"el" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/item/weapon/paper/dockingcodes, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"ep" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table/steel, +/obj/machinery/recharger, +/obj/item/device/geiger{ + pixel_x = -7 + }, +/obj/machinery/alarm/talon{ + pixel_y = 24 + }, +/obj/machinery/camera/network/talon{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"eq" = ( +/obj/machinery/light/small, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 2; + pixel_y = -28 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) -"ED" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, +"er" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/railing/grey, +/obj/random/multiple/corp_crate/talon_cargo, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"EF" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/catwalk_plated, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/structure/disposalpipe/junction, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/fore) -"EH" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/area/talon_v2/maintenance/wing_starboard) +"et" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"EI" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/catwalk, -/obj/structure/railing/grey, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"EJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 - }, -/turf/simulated/wall/rshull, -/area/shuttle/talonboat) -"EL" = ( +/area/talon_v2/crew_quarters/eng_room) +"eu" = ( +/obj/item/modular_computer/console/preset/talon, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"ex" = ( +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"EN" = ( -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/structure/closet/walllocker/medical/north, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) +/area/talon_v2/central_hallway/fore) +"ey" = ( +/obj/structure/bed/chair/wood, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/sign/painting/public{ + pixel_x = 30 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"ez" = ( +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/table/marble, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"eA" = ( +/obj/machinery/atmospherics/unary/engine/bigger{ + dir = 1 + }, +/turf/space, +/area/talon_v2/engineering/port) +"eB" = ( +/obj/structure/sign/warning/pods{ + dir = 4; + pixel_x = 32 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"eC" = ( +/obj/structure/closet/walllocker_double/hydrant/west, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"eD" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"eF" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"eG" = ( +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"eH" = ( +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"eI" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"eK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"eL" = ( +/obj/structure/railing/grey, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) -"EO" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 1 +"eM" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/railing/grey{ +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/hatch{ + name = "Generator Room"; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/sign/warning/radioactive{ + pixel_y = 32 + }, /turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"EP" = ( +/area/talon_v2/engineering/generators) +"eN" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"eP" = ( +/obj/structure/cable/yellow, +/obj/machinery/light/small, +/obj/machinery/power/port_gen/pacman/super/potato, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"eQ" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -9281,22 +1695,352 @@ }, /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_starboard) -"ES" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"eR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/item/weapon/stool/baystool/padded{ dir = 4 }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"eS" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light, +/obj/structure/sign/department/armory{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"eU" = ( +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_bridge_shields" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/dust, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/bridge) +"eX" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/table/marble, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"eY" = ( +/obj/structure/table/marble, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/machinery/camera/network/talon{ + dir = 8 + }, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/structure/closet/walllocker_double/kitchen/east{ + name = "Ration Cabinet" + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"eZ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"fa" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"ET" = ( +/area/talon_v2/central_hallway/star) +"fb" = ( +/turf/simulated/wall/shull, +/area/talon_v2/engineering/star_store) +"fc" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"fd" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"ff" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"fg" = ( +/obj/structure/table/woodentable, +/obj/item/clothing/accessory/talon{ + pixel_x = 4; + pixel_y = 7 + }, +/obj/item/clothing/head/caphat/talon{ + pixel_x = -5 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"fh" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/fore) +"fi" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/east, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"fj" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"fm" = ( +/obj/structure/catwalk, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"fn" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"fo" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/bar) +"fp" = ( +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) +"fq" = ( +/obj/structure/catwalk, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"fr" = ( +/obj/structure/catwalk, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"fs" = ( +/obj/structure/bed/chair/bay/chair, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"ft" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = -26 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"fu" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/power/smes/buildable/offmap_spawn{ + RCon_tag = "Talon Port SMES" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"fw" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"fx" = ( +/obj/structure/table/woodentable, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"fA" = ( +/obj/machinery/atmospherics/pipe/tank/air/full{ + dir = 8 + }, +/obj/structure/railing/grey, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"fF" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) +"fG" = ( +/obj/machinery/atmospherics/portables_connector/aux, +/obj/effect/floor_decal/industrial/outline, +/obj/structure/railing/grey, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"fM" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/bluedouble, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"fN" = ( +/obj/structure/table/woodentable, +/obj/machinery/firealarm{ + dir = 4; + layer = 3.3; + pixel_x = 26 + }, +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green, +/obj/item/weapon/paper/talon_captain, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"fQ" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/table/steel, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/item/weapon/paper/talon_shields, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"fR" = ( +/obj/structure/sign/warning/airlock{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"fS" = ( +/obj/structure/sign/warning/airlock{ + pixel_y = -32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"fU" = ( /obj/structure/railing/grey{ dir = 1 }, @@ -9314,118 +2058,116 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) -"EU" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/fore_starboard) -"EV" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/table/rack/steel, -/obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/device/spaceflare, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"EX" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/handrail{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"Fc" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/suit/space/void/refurb/talon, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"Fd" = ( -/obj/effect/floor_decal/industrial/warning, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "talon_boatbay"; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/techfloor/grid, +"fV" = ( +/turf/simulated/wall/shull, /area/talon_v2/hangar) -"Fe" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/anomaly_storage) -"Ff" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"Fg" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Fj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ +"fW" = ( +/turf/simulated/wall/shull, +/area/talon_v2/refining) +"fX" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/ofd_ops) +"gb" = ( +/obj/machinery/light{ dir = 4 }, -/obj/structure/closet/walllocker/medical/north, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) +/obj/structure/sign/department/bar{ + pixel_x = 29 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"gd" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"ge" = ( +/obj/machinery/vending/coffee{ + dir = 1 }, /turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"Fk" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" +/area/talon_v2/crew_quarters/bar) +"gh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/small{ + dir = 8 }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"gi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"gj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/power/shield_generator/charged, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"gk" = ( +/obj/machinery/media/jukebox, +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"gm" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green, /obj/structure/cable/green{ d2 = 4; icon_state = "0-4" }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 10 +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"gn" = ( +/turf/simulated/wall/shull{ + can_open = 1 }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Fn" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/medical{ - req_one_access = list(301) +/area/talon_v2/workroom) +"go" = ( +/obj/structure/closet/walllocker/emerglocker/west, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) +"gr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_port) +"gs" = ( /obj/structure/disposalpipe/segment{ dir = 1 }, @@ -9434,99 +2176,1432 @@ d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Fo" = ( -/obj/structure/railing/grey{ - dir = 8 +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/catwalk_plated/dark, /turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Fq" = ( -/obj/effect/landmark/talon, -/obj/structure/handrail, -/obj/machinery/computer/cryopod{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"Ft" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 6 - }, -/turf/space, -/area/space) -"Fv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"Fx" = ( -/obj/structure/catwalk, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Fy" = ( -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/area/talon_v2/central_hallway/fore) +"gu" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 8 + }, /turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"Fz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/structure/sign/painting/public{ - pixel_x = -30 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"FB" = ( -/obj/effect/landmark/start{ - name = "Talon Engineer" - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/eng_room) -"FG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"FH" = ( -/obj/structure/sign/painting/public{ - pixel_x = -30 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"FJ" = ( -/obj/machinery/light/small{ +/area/talon_v2/maintenance/wing_port) +"gx" = ( +/obj/effect/floor_decal/industrial/warning/dust{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 +/obj/effect/floor_decal/industrial/warning/dust, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_bridge_shields" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/ofd_ops) +"gA" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"gC" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"gF" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"gH" = ( +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; + frequency = 1380; + id_tag = "talon_podbay"; + pixel_x = 26 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"gI" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"gK" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"gL" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 5 }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"gM" = ( +/obj/machinery/disposal/deliveryChute{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/talon_v2/ofd_ops) +"gN" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/talon_v2/ofd_ops) +"gO" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/ofd_ops) +"gR" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/loading{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"gS" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"gU" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"gV" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"gW" = ( +/obj/machinery/computer/ship/sensors, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/ofd_ops) +"gX" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/ofd_ops) +"ha" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/closet/walllocker_double/east, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"hb" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"hd" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/aft_port) +"hg" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/ofd_ops) +"hh" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"hi" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"hj" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/star_store) +"hk" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"hp" = ( +/obj/structure/catwalk, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"hq" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"hr" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"hs" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/bar) +"hu" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/map_helper/airlock/door/simple, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/angled_tgmc/wide/generic_steel{ + density = 0; + icon_state = "door_open"; + name = "Escape Pod Hatch" + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonpod) +"hw" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"hz" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"hA" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/fuel_port{ + dir = 1; + pixel_x = 8; + pixel_y = -28 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 1; + frequency = 1380; + id_tag = "talonpod_docker"; + pixel_x = -8; + pixel_y = -24; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonpod) +"hD" = ( +/obj/machinery/atmospherics/portables_connector/aux{ + dir = 4 + }, +/obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"hG" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"hH" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"hK" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"hL" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"hM" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_y = -28; + req_one_access = list(301) + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/ofd_ops) +"hO" = ( +/obj/structure/sign/directions/bridge{ + dir = 1; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"hP" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + id_tag = "talon_ofd"; + pixel_y = -30; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/ofd_ops) +"hQ" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass_security{ + name = "Talon Armory"; + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) +"hT" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/map_helper/airlock/door/simple, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Escape Pod"; + req_one_access = list(301) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/central_hallway/fore) +"hW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"hY" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"ia" = ( +/obj/machinery/vending/dinnerware{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"ib" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"ie" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 5 + }, +/turf/space, +/area/space) +"ig" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/engineering{ + name = "Talon Engineering"; + req_one_access = list(301) + }, +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"ii" = ( +/obj/machinery/vending/engivend{ + products = list(/obj/item/device/geiger = 4, /obj/item/clothing/glasses/meson = 2, /obj/item/device/multitool = 4, /obj/item/weapon/cell/high = 10, /obj/item/weapon/airlock_electronics = 10, /obj/item/weapon/module/power_control = 10, /obj/item/weapon/circuitboard/airalarm = 10, /obj/item/weapon/circuitboard/firealarm = 10, /obj/item/weapon/circuitboard/status_display = 2, /obj/item/weapon/circuitboard/ai_status_display = 2, /obj/item/weapon/circuitboard/newscaster = 2, /obj/item/weapon/circuitboard/holopad = 2, /obj/item/weapon/circuitboard/intercom = 4, /obj/item/weapon/circuitboard/security/telescreen/entertainment = 4, /obj/item/weapon/stock_parts/motor = 2, /obj/item/weapon/stock_parts/spring = 2, /obj/item/weapon/stock_parts/gear = 2, /obj/item/weapon/circuitboard/atm, /obj/item/weapon/circuitboard/guestpass, /obj/item/weapon/circuitboard/keycard_auth, /obj/item/weapon/circuitboard/photocopier, /obj/item/weapon/circuitboard/fax, /obj/item/weapon/circuitboard/request, /obj/item/weapon/circuitboard/microwave, /obj/item/weapon/circuitboard/washing, /obj/item/weapon/circuitboard/scanner_console, /obj/item/weapon/circuitboard/sleeper_console, /obj/item/weapon/circuitboard/body_scanner, /obj/item/weapon/circuitboard/sleeper, /obj/item/weapon/circuitboard/dna_analyzer, /obj/item/weapon/circuitboard/partslathe); + req_access = list(301); + req_log_access = 301 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"ik" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/ofd_ops) +"il" = ( +/obj/structure/ship_munition/disperser_charge/emp, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/talon_v2/ofd_ops) +"im" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"in" = ( +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"io" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"iq" = ( +/obj/machinery/light/small, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"ir" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_port) +"is" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"it" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"ix" = ( +/obj/structure/table/woodentable, +/obj/machinery/recharger, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"iy" = ( +/obj/structure/catwalk, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"iz" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -26; + pixel_y = -25 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"iB" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/ofd_ops) +"iC" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"iD" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 28; + req_one_access = list(301) + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"iE" = ( +/obj/structure/catwalk, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/fore_starboard) +"iF" = ( +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/fore_port) +"iH" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty/phoron, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"iI" = ( +/obj/structure/table/steel, +/obj/structure/closet/autolok_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"iJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + id_tag = "talon_port_fore"; + pixel_y = -30; + req_one_access = list(301) + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_port) +"iK" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"iL" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_port) +"iM" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"iN" = ( +/obj/structure/table/woodentable, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/engineer, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/eng_room) +"iO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/camera/network/talon{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"iP" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass_security{ + name = "O.F.D. Ops"; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/ofd_ops) +"iQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"iR" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"iS" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"iU" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"jg" = ( +/obj/effect/floor_decal/emblem/talon_big{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"jh" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/railing/grey, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"jj" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"jk" = ( +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/airlock_sensor{ + pixel_y = 24; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"jn" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"jr" = ( +/obj/machinery/light/small, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"ju" = ( +/obj/effect/floor_decal/emblem/talon_big{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"jv" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"jx" = ( +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"jy" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "talon_cargo_port"; + name = "Cargo Loading Hatch" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"jC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"jF" = ( +/obj/structure/table/bench/wooden, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"jG" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/blue{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"jJ" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"jM" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/hangar) +"jN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/camera/network/talon{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"jO" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"jQ" = ( +/turf/simulated/wall/shull{ + can_open = 1 + }, +/area/talon_v2/gen_store) +"jS" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_starboard) +"jY" = ( +/obj/structure/closet/crate, +/obj/structure/railing/grey, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"jZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"kc" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"kd" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + id_tag = "talon_starboard_fore"; + pixel_y = -30; + req_one_access = list(301) + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_starboard) +"ke" = ( +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/fore_starboard) +"kf" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"kg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/bed/chair/bay/chair{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"kh" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 9 + }, +/turf/space, +/area/space) +"ki" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"kj" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_starboard) +"kk" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/reagent_dispensers/fueltank/high, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) +"kl" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"kn" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"kt" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"kv" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/fuel, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/shuttle/talonboat) +"kw" = ( +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_alc/full{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"kx" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) -"FK" = ( +"kz" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"kC" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/obj/machinery/light, +/obj/structure/closet/walllocker_double/survival/south, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonpod) +"kD" = ( +/obj/machinery/vending/food{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"kG" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"kH" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"kI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/shuttle/talonboat) +"kJ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"kM" = ( +/obj/machinery/light/small, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/machinery/power/apc/talon/hyper{ + pixel_y = -24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"kP" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/railing/grey, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"kQ" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"kR" = ( +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"kS" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"kV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"kW" = ( +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"kX" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/fore_port) +"kZ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"lc" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/airlock/maintenance/engi{ + name = "Engine Crawlway Access"; + req_one_access = list(301) + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"le" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"lf" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty/phoron, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"lk" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/walllocker_double/hydrant/east, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"ll" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "talontrash" + }, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "talontrashblast" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"lm" = ( +/obj/machinery/computer/ship/helm{ + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"lq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9546,63 +3621,1464 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) -"FM" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +"lr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"FN" = ( -/obj/effect/floor_decal/industrial/outline/yellow, +/area/talon_v2/central_hallway/fore) +"ls" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /obj/machinery/camera/network/talon{ dir = 1 }, -/obj/structure/vehiclecage/quadbike, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"lv" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"lw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"lx" = ( +/obj/machinery/light, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"FO" = ( +/area/talon_v2/central_hallway/fore) +"ly" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"lA" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/refining) +"lB" = ( +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"lC" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/flora/pottedplant/mysterious, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"lD" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"lF" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"lG" = ( +/obj/structure/sign/warning/airlock{ + pixel_x = -31 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"lI" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atm{ + pixel_y = 31 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"lJ" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/glass_centcom{ + name = "Talon Storage"; + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"lK" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_anomalystorage" + }, +/turf/simulated/floor/plating, +/area/talon_v2/anomaly_storage) +"lM" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"lN" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"lQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"lR" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/medical{ + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"lS" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/fore_starboard) +"lT" = ( +/obj/structure/hull_corner, +/turf/space, +/area/space) +"lU" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/pilot_room) +"lX" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"lY" = ( +/obj/structure/barricade, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"lZ" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"ma" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"mb" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 28; + pixel_y = -28; + req_one_access = list(301) + }, +/obj/structure/sign/warning/airlock{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/fore_starboard) +"mc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"md" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"mg" = ( +/obj/structure/mopbucket, +/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"mk" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"ml" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"mm" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"mo" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "talon_cargo_port"; + name = "Cargo Loading Hatch" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"mq" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, /obj/structure/cable/green{ d1 = 1; d2 = 4; icon_state = "1-4" }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"mr" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"mu" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/cargo, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/random/maintenance/cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) +"mw" = ( +/turf/simulated/wall/shull, +/area/talon_v2/maintenance/wing_starboard) +"mx" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/security, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/sec_room) +"mE" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"mG" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"mH" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"mI" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"mL" = ( +/obj/machinery/mineral/unloading_machine, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"mN" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"mO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"mS" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"mT" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/crate/secure/phoron{ + req_one_access = list(301) + }, +/obj/item/weapon/tank/phoron/pressurized{ + pixel_x = -3 + }, +/obj/item/weapon/tank/phoron/pressurized{ + pixel_x = 3 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"mV" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"mX" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/binary/pump/on{ + dir = 8; + name = "Waste Compresser" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"mZ" = ( +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"na" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"nb" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/medical{ + id_tag = "talon_meddoor"; + name = "Doctor's Cabin"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/med_room) +"ne" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"ng" = ( +/obj/structure/closet/secure_closet/talon_guard, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/obj/item/weapon/storage/box/nifsofts_security, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"nh" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/structure/railing/grey, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"nk" = ( +/obj/machinery/suit_cycler/vintage/tguard, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"nl" = ( /obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"nn" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway) +"no" = ( +/obj/machinery/suit_cycler/vintage/tmedic, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"np" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"FR" = ( +/area/talon_v2/engineering/port_store) +"nq" = ( +/obj/structure/closet/secure_closet/talon_doctor, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/obj/item/weapon/storage/box/nifsofts_medical, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"ns" = ( +/obj/effect/floor_decal/emblem/talon_big/center, +/obj/structure/cable/green, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"nt" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/table/rack/steel, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"nw" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"nz" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/airlock_sensor{ + pixel_y = 28; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_port) +"nB" = ( +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"nC" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"nD" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"nE" = ( +/obj/machinery/power/apc/talon{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"nH" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/table/standard, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"nI" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"nJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"nK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"nL" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/wall{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/pilot_room) +"nM" = ( +/obj/machinery/power/apc/talon{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/pilot_room) +"nN" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"nP" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"nV" = ( +/obj/machinery/power/apc/talon{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"nW" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"nY" = ( +/obj/machinery/door/blast/regular/open{ + id = "talon_boat_east" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 4; + pixel_x = 11; + pixel_y = 24; + req_one_access = list(301) + }, +/obj/machinery/button/remote/airlock{ + id = "tal_shuttle_sb"; + name = "Starboard Airlock Control"; + pixel_x = -9; + pixel_y = 24; + specialfunctions = 4 + }, +/obj/machinery/door/airlock/glass_external{ + frequency = 1420; + id_tag = "tal_shuttle_sb"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"od" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"oh" = ( +/obj/item/weapon/storage/dicecup/loaded{ + pixel_x = 7; + pixel_y = 11 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/table/marble, +/obj/item/weapon/deck/cards{ + pixel_x = 3 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"ok" = ( +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/brown, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"ol" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/landmark/start{ + name = "Talon Guard" + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "talon_secdoor"; + name = "Door Bolts"; + pixel_x = 28; + specialfunctions = 4 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/sec_room) +"on" = ( +/obj/effect/floor_decal/emblem/talon_big, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"oo" = ( +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"op" = ( +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "talon_meddoor"; + name = "Door Bolts"; + pixel_x = -28; + specialfunctions = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Talon Doctor" + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/med_room) +"oq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/med_room) +"or" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/refining) +"ot" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"ov" = ( +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 2; + pixel_y = -28 + }, +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/medical, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/med_room) +"ow" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"oA" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"oB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/catwalk, /obj/structure/cable/green{ d1 = 2; - d2 = 4; - icon_state = "2-4" + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"oE" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty/phoron, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"oF" = ( +/obj/structure/table/standard, +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/crew_quarters/restrooms) +"oN" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/table/standard, +/obj/machinery/photocopier/faxmachine/talon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"oO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"oS" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"oV" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/item/weapon/paper/talon_doctor, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/med_room) +"oW" = ( +/obj/structure/sign/directions/medical{ + pixel_y = -32 + }, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"pa" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/handrail{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"pb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"pc" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"pf" = ( +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"pg" = ( +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"pi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 28; + pixel_y = 28; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"pk" = ( +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"pl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/sec_room) +"pn" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/airlock/security{ + id_tag = "talon_secdoor"; + name = "Guard's Cabin"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/sec_room) +"pp" = ( +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"pq" = ( +/obj/effect/landmark/start{ + name = "Talon Engineer" + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/eng_room) +"pr" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + name = "Waste to Filter" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"ps" = ( +/obj/structure/catwalk, +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"pt" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"pv" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"pw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/holoposter{ + dir = 4; + pixel_x = 32 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"px" = ( +/obj/machinery/camera/network/talon{ dir = 1 }, -/obj/effect/catwalk_plated, -/turf/simulated/floor/plating, +/obj/structure/safe/floor{ + name = "smuggling compartment" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"pz" = ( +/obj/effect/floor_decal/emblem/talon, +/turf/simulated/floor/reinforced/airless, +/area/space) +"pA" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"pB" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"pC" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"pE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"pG" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"pH" = ( +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/obj/structure/bed/pod, +/obj/item/weapon/bedsheet/blue, +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -32 + }, +/obj/machinery/light, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"pK" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/airlock_sensor{ + pixel_y = 28; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_starboard) +"pL" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) -"FS" = ( +"pM" = ( +/turf/space, +/area/talon_v2/engineering/starboard) +"pN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/pilot_room) +"pR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"pS" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/wall{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"pU" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/weapon/storage/box/mousetraps, +/obj/item/weapon/storage/box/lights/mixed, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/reagent_containers/glass/rag, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 2; + pixel_y = -28 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"pV" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"pY" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"pZ" = ( +/obj/structure/closet/crate/engineering, +/obj/fiftyspawner/cardboard, +/obj/fiftyspawner/floor, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/plastic, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/wood, +/obj/item/stack/material/plasteel{ + amount = 30 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"qa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"qb" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"qe" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"qf" = ( +/obj/structure/table/rack/steel, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"qg" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 }, @@ -9617,118 +5093,274 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"FT" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/engineering{ - name = "Talon Engineering"; - req_one_access = list(301) +"qi" = ( +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 }, -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = -26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"FU" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/structure/catwalk, +/obj/machinery/camera/network/talon, /turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"FX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -32 +/area/talon_v2/engineering/port_store) +"qk" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/bed/chair/bay/chair, +/obj/machinery/camera/network/talon, +/obj/machinery/button/remote/blast_door{ + id = "talon_brig2"; + name = "Cell 2 Shutters"; + pixel_x = 7; + pixel_y = 28; + req_one_access = list(301) + }, +/obj/machinery/button/remote/blast_door{ + id = "talon_brig1"; + name = "Cell 1 Shutters"; + pixel_x = -8; + pixel_y = 28; + req_one_access = list(301) }, /turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"qm" = ( +/obj/machinery/vending/security{ + req_access = list(301); + req_log_access = 301 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"qo" = ( +/obj/machinery/cryopod/talon{ + dir = 4 + }, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway) -"FY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +"qq" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 1; + pixel_y = -23; + req_one_access = list(301) + }, +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"qr" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/med_room) +"qs" = ( +/obj/effect/landmark/talon, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"qt" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"qu" = ( +/obj/structure/railing/grey, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty/phoron, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"qv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) +"qw" = ( +/obj/structure/railing/grey, +/obj/machinery/atmospherics/pipe/manifold/visible/blue, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"qx" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/port) -"FZ" = ( -/obj/structure/catwalk, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/wing_port) -"Ga" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Gb" = ( +"qy" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "talon_cargo_star"; + name = "Cargo Loading Hatch" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"qz" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/ofd_ops) +"qA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/mine_room) +"qC" = ( /obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/engineering{ - name = "Talon Starboard Engines & Trash Management"; +/obj/machinery/door/airlock/engineeringatmos{ + name = "Talon Atmospherics"; req_one_access = list(301) }, -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = 26 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"Ge" = ( +/area/talon_v2/engineering/port_store) +"qD" = ( +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "talon_engdoor"; + name = "Door Bolts"; + pixel_x = -28; + specialfunctions = 4 + }, +/obj/item/weapon/bedsheet/orange, +/obj/structure/bed/pod, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/eng_room) +"qE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"qG" = ( +/obj/structure/hull_corner, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/ofd_ops) +"qH" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"qI" = ( +/obj/structure/bed/chair/bay/chair, +/obj/machinery/alarm/talon{ + pixel_y = 24 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"qJ" = ( +/obj/structure/reagent_dispensers/watertank/high, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) +"qK" = ( +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"qL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"qM" = ( /obj/structure/closet/secure_closet/personal/cabinet{ locked = 0 }, /turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"Gg" = ( -/obj/machinery/vending/sovietsoda, +/area/talon_v2/crew_quarters/eng_room) +"qO" = ( +/obj/machinery/cryopod/robot/talon, /turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"qP" = ( +/obj/effect/landmark/talon, +/obj/structure/handrail, +/obj/machinery/computer/cryopod{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"qQ" = ( +/obj/effect/floor_decal/industrial/loading{ + dir = 4 + }, +/obj/machinery/mineral/input, +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/warning/moving_parts{ + pixel_y = -31 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"qU" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) -"Gh" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 6 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Gj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/network/talon{ - dir = 1 +"qV" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /obj/structure/cable/green{ d1 = 1; @@ -9736,75 +5368,338 @@ icon_state = "1-4" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Gl" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/sign/directions/engineering/atmospherics{ - pixel_x = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway) -"Gm" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "talonrefinery" - }, -/obj/structure/sign/warning/moving_parts{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"Gn" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Go" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/machinery/airlock_sensor{ - pixel_y = 28; - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/structure/handrail, -/turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/maintenance/wing_port) -"Gp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"qW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 10 + }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"Gq" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/mirror{ - pixel_y = 32 - }, -/obj/machinery/button/remote/airlock{ - dir = 1; - id = "talon_charger"; - name = "Door Bolts"; - pixel_y = -28; - specialfunctions = 4 +/area/talon_v2/engineering/atmospherics) +"rc" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/restrooms) -"Gs" = ( +"rg" = ( +/obj/item/modular_computer/console/preset/talon{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"rh" = ( +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"ri" = ( +/obj/structure/table/standard, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"rj" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"rk" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"rl" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"rm" = ( +/obj/structure/sign/warning/airlock{ + pixel_x = -31 + }, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"rn" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty/phoron, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"rq" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"rt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/fore) +"ru" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/sign/department/medbay{ + name = "DOCTOR'S QUARTERS"; + pixel_x = 32 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"rw" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass{ + name = "Flight Control" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"rx" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"rz" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"rG" = ( +/obj/structure/table/standard, +/obj/machinery/reagentgrinder, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"rI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"rJ" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/stack/material/algae, +/obj/item/stack/material/algae, +/obj/item/stack/material/algae, +/obj/item/stack/material/algae, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"rK" = ( +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"rL" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"rP" = ( +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"rQ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/toilet, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/restrooms) +"rR" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"rS" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 1; + req_access = list(301) + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "talontrashblast"; + pixel_y = -28 + }, +/obj/machinery/conveyor_switch/oneway{ + id = "talontrash" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"rT" = ( +/obj/structure/sign/directions/engineering{ + pixel_x = 32; + pixel_y = 3 + }, +/obj/structure/sign/directions/medical{ + pixel_x = 32; + pixel_y = -3 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"rU" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/wall{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"rW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"rZ" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/structure/cable/green, +/obj/machinery/power/apc/talon{ + dir = 4; + name = "east bump"; + pixel_x = 24 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"sc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"se" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/table/steel, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"sf" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock{ + id_tag = "talon_pilotdoor"; + name = "Pilot's Cabin"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/crew_quarters/pilot_room) +"sh" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/brig) +"sk" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -22 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"sl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, @@ -9821,104 +5716,7 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/brig) -"Gv" = ( -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"Gw" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/door/airlock{ - id_tag = "talon_pilotdoor"; - name = "Pilot's Cabin"; - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/pilot_room) -"Gx" = ( -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"Gy" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/engineering/starboard) -"GC" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 9 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"GE" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/engi{ - name = "Port Eng. Storage"; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"GF" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/gen_store) -"GH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"GJ" = ( -/obj/structure/sink{ - pixel_y = 22 - }, -/obj/structure/medical_stand/anesthetic, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"GK" = ( +"sn" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/glass_security{ name = "Talon Brig/Sec"; @@ -9940,113 +5738,149 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/brig) -"GQ" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"GT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"GU" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/light/small{ +"so" = ( +/obj/effect/floor_decal/corner/black/diagonal, +/obj/structure/table/marble, +/obj/random/pizzabox, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"sq" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"GV" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -22 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/railing/grey{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"GW" = ( -/obj/machinery/atmospherics/omni/atmos_filter{ - name = "N2/O2 Filter"; - tag_east = 4; - tag_north = 3; - tag_south = 2; - tag_west = 1 - }, -/obj/effect/catwalk_plated/dark, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"GY" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/catwalk, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/obj/structure/closet/walllocker_double/hydrant/south, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Ha" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ dir = 4 }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway) +"ss" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Hb" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_starboard) -"Hc" = ( /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"su" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Hf" = ( +/area/talon_v2/engineering/atmospherics) +"sv" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/clothing/accessory/holster/waist, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"sw" = ( +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"sx" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"sz" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"sB" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 9 }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"Hg" = ( +/area/talon_v2/engineering/star_store) +"sC" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/walllocker_double/east, +/obj/item/weapon/storage/toolbox/electrical, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"sD" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"sE" = ( +/obj/machinery/atmospherics/binary/pump/high_power/on{ + dir = 8 + }, /obj/structure/railing/grey{ dir = 4 }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/table/steel, -/obj/item/stack/marker_beacon/thirty, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"Hh" = ( +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"sF" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -10055,183 +5889,781 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"sG" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"sI" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_starboard) +"sJ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/rshull, +/area/shuttle/talonboat) +"sK" = ( +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"sL" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/closet/walllocker_double/hydrant/east, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"sM" = ( +/obj/effect/landmark/map_data/talon, +/turf/space, +/area/space) +"sP" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/engi{ + name = "Port Eng. Storage"; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"sR" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/obj/structure/vehiclecage/quadbike, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"sT" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/railing/grey, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"sZ" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"ta" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/star) +"tb" = ( +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"tc" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"td" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/wall/shull, +/area/talon_v2/central_hallway) +"tf" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/obj/structure/closet/walllocker_double/hydrant/west, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"tg" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"th" = ( +/obj/machinery/camera/network/talon{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"ti" = ( +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"tj" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/junction, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"tk" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 32 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"tm" = ( +/obj/structure/lattice, +/turf/space, +/area/space) +"tn" = ( +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"to" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"tp" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red{ + dir = 9 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"tq" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"tu" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"tw" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/medical{ + id_tag = "talon_meddoor"; + req_one_access = list(301) + }, +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/med_room) +"tx" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"tz" = ( +/obj/effect/floor_decal/emblem/talon_big{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"tA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"tB" = ( +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = 26 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"tC" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/aft_port) +"tE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/closet/walllocker/medical/east, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"tJ" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/ore_box, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"tK" = ( +/obj/structure/table/woodentable, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/medical, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/med_room) +"tM" = ( +/obj/structure/table/woodentable, +/obj/machinery/camera/network/talon{ + dir = 8 + }, +/obj/machinery/recharger, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"tQ" = ( +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) -"Hj" = ( -/obj/structure/catwalk, +"tS" = ( +/obj/structure/railing/grey, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty/phoron, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"tU" = ( /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/wing_starboard) -"Hl" = ( -/obj/effect/floor_decal/corner/black/diagonal, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"Hn" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"tX" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"Ho" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/computer/ship/engines{ - dir = 1 - }, -/obj/structure/railing/grey, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"Hq" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/table/standard, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/machinery/camera/network/talon{ - dir = 4 - }, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/crew_quarters/restrooms) -"Hr" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"Ht" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/airlock_sensor{ - pixel_y = 28; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_port) -"Hu" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"Hw" = ( -/obj/structure/railing/grey, -/obj/effect/floor_decal/emblem/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"Hz" = ( -/obj/structure/hull_corner, -/turf/space, -/area/space) -"HA" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/glass_security{ - name = "Talon Armory"; - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"HC" = ( +/area/talon_v2/central_hallway/star) +"tZ" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock{ + name = "Restrooms & Charger" + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"HD" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/area/talon_v2/crew_quarters/restrooms) +"ub" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"uc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"uf" = ( +/obj/machinery/light/small{ + dir = 4 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"HE" = ( -/obj/item/modular_computer/console/preset/talon, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"HF" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, -/obj/structure/sign/directions/medical{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/crew_quarters/restrooms) -"HG" = ( -/obj/machinery/mineral/stacking_unit_console{ - pixel_y = -6; - req_one_access = list(301) - }, -/obj/structure/girder, -/obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"HH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/effect/catwalk_plated/dark, +/obj/structure/catwalk, /turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"uh" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock{ + id_tag = "talon_restroom1"; + name = "Unisex Restroom" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/restrooms) +"ui" = ( +/obj/structure/bed, +/obj/item/weapon/bedsheet/mime, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"uk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/restrooms) +"ul" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/gen_store) +"um" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"uo" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/ofd_ops) +"up" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/anomaly_storage) +"uu" = ( +/obj/structure/hull_corner/long_vert{ + dir = 9 + }, +/turf/space, +/area/space) +"uv" = ( +/obj/machinery/shower, +/obj/item/weapon/soap/deluxe, +/obj/structure/curtain, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/restrooms) +"uw" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"uz" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"uA" = ( +/obj/effect/floor_decal/emblem/talon_big{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"uC" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, /area/talon_v2/engineering/port) -"HI" = ( -/obj/structure/disposalpipe/segment, +"uF" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 1; + req_access = list(301) + }, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access = list(301) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "talon_brig1"; + name = "Cell Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"uG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"uH" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"uI" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj/structure/catwalk, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"uJ" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"uL" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/aft_port) +"uM" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"uO" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"uQ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/alarm/talon{ + pixel_y = 28 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"uR" = ( +/obj/structure/table/steel, +/obj/machinery/cell_charger, +/obj/item/weapon/cell/apc, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"uS" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/gen_store) +"uU" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"uV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/handrail{ + dir = 1 + }, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 8; + pixel_y = -26 + }, +/obj/structure/fuel_port/heavy{ + dir = 1; + pixel_y = -28 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"uW" = ( +/obj/structure/table/standard, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"uY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/wall/shull, +/area/talon_v2/ofd_ops) +"uZ" = ( +/obj/structure/catwalk, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"va" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "talon_boatbay"; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"vb" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering) -"HK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +"vc" = ( +/obj/structure/catwalk, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"vd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"ve" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"vh" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"vi" = ( /obj/machinery/alarm/talon{ dir = 8; pixel_x = 22 @@ -10243,99 +6675,647 @@ icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/talon_v2/engineering) -"HN" = ( -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = 26 - }, -/obj/structure/table/rack/shelf/steel, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"HS" = ( -/turf/simulated/wall/shull, -/area/talon_v2/anomaly_storage) -"HT" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/table/rack/steel, -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/mining_scanner, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"HU" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"HW" = ( -/obj/machinery/disposal/wall{ +/area/talon_v2/maintenance/fore_port) +"vj" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ dir = 4 }, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/aft_port) +"vk" = ( +/obj/machinery/atmospherics/unary/engine/bigger{ + dir = 1 + }, +/turf/space, +/area/talon_v2/engineering/starboard) +"vp" = ( +/obj/structure/bed/chair/bay/chair, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"vr" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"vs" = ( +/obj/machinery/smartfridge/chemistry{ + req_access = list(301); + req_one_access = list(301) }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"HX" = ( -/obj/structure/table/standard, -/obj/item/device/defib_kit/jumper_kit/loaded, -/obj/item/device/defib_kit/loaded, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/device/sleevemate, /turf/simulated/floor/tiled/white, /area/talon_v2/medical) -"HZ" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) +"vt" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_starboard) -"Ia" = ( -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Hangar Bay"; - req_one_access = list(301) - }, -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/tiled/techfloor, /area/talon_v2/hangar) -"Id" = ( +"vx" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/refining) +"vy" = ( +/obj/machinery/computer/ship/engines, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"vz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/hydrant/south, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"vB" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"vC" = ( +/obj/machinery/shipsensors{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/talonboat) +"vE" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/talonboat) +"vF" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"vG" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"vH" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"vJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"vK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"vL" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"vO" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"vP" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"vR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_port) +"vU" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/sec{ + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"vV" = ( +/obj/machinery/computer/shuttle_control/explore/talonboat{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"vY" = ( +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"vZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"wa" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, /area/talon_v2/maintenance/fore_port) -"Ie" = ( +"wc" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"we" = ( +/obj/structure/catwalk, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"wf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"wg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/bed/chair/bay/chair, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/med_room) +"wh" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"wi" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/ofd_ops) +"wm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"wn" = ( +/obj/structure/disposaloutlet, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/engineering) +"wp" = ( +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor{ + pixel_x = -28; + pixel_y = 28; + req_one_access = list(301) + }, +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/aft_port) +"wr" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"ws" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/multiple/corp_crate/talon_cargo, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"wu" = ( +/obj/structure/catwalk, +/obj/structure/trash_pile, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"wv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"ww" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"wx" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/holoposter{ + dir = 4; + pixel_x = 32 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"wy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment, /obj/machinery/light/small{ dir = 4 }, -/obj/structure/flora/pottedplant/thinbush, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"wz" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + req_access = list(); + req_one_access = list(301) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"wF" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"wG" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"wI" = ( +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = 26 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"wK" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/structure/catwalk, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"wM" = ( +/obj/machinery/suit_cycler/vintage/tguard, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"If" = ( -/obj/effect/map_helper/airlock/door/int_door, +/area/talon_v2/brig) +"wN" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/medical{ + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/medical) +"wP" = ( +/obj/machinery/disperser/back{ + dir = 1 + }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 28; + pixel_y = 28; + req_one_access = list(301) + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/ofd_ops) +"wQ" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"wS" = ( +/obj/structure/closet/wardrobe/black{ + starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/weapon/storage/backpack/messenger/black = 4, /obj/item/weapon/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"wT" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"wV" = ( +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"wX" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"wY" = ( +/obj/machinery/light_switch{ + pixel_x = -5; + pixel_y = 26 + }, +/obj/machinery/button/remote/airlock{ + id = "talon_minerdoor"; + name = "Door Bolts"; + pixel_x = 5; + pixel_y = 28; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"xa" = ( /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/aft_starboard) +"xb" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"xd" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"xf" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"xg" = ( +/obj/machinery/button/remote/blast_door{ + id = "talon_cargo_star"; + name = "Cargo Loading Hatches"; + pixel_y = -28 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/door/window/brigdoor/northright{ + req_access = list(); + req_one_access = list(301) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"xh" = ( +/obj/structure/bed/chair/bay/comfy/brown{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"xj" = ( +/obj/machinery/vending/engineering{ + products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/orange = 4, /obj/item/clothing/head/hardhat = 4, /obj/item/weapon/storage/belt/utility = 4, /obj/item/clothing/glasses/meson = 4, /obj/item/clothing/gloves/yellow = 4, /obj/item/weapon/tool/screwdriver = 12, /obj/item/weapon/tool/crowbar = 12, /obj/item/weapon/tool/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/weapon/tool/wrench = 12, /obj/item/device/t_scanner = 12, /obj/item/stack/cable_coil/heavyduty = 8, /obj/item/weapon/cell = 8, /obj/item/weapon/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/weapon/light/tube = 10, /obj/item/clothing/head/hardhat/red = 4, /obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5, /obj/item/weapon/stock_parts/micro_laser = 5, /obj/item/weapon/stock_parts/matter_bin = 5, /obj/item/weapon/stock_parts/manipulator = 5, /obj/item/weapon/stock_parts/console_screen = 5); + req_access = list(301); + req_log_access = 301; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"xk" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/empty/carbon_dioxide, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"xm" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"Ig" = ( +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"xo" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"xr" = ( /obj/machinery/light/small{ dir = 4 }, @@ -10346,7 +7326,980 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/refining) -"Ih" = ( +"xs" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/dust/corner, +/turf/simulated/floor/reinforced/airless, +/area/space) +"xu" = ( +/obj/item/modular_computer/console/preset/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"xv" = ( +/obj/machinery/oxygen_pump{ + dir = 4; + pixel_x = 30 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"xw" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_port) +"xx" = ( +/obj/structure/table/rack/steel, +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"xB" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"xE" = ( +/obj/structure/catwalk, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"xH" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/port_store) +"xK" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"xL" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/fore_port) +"xM" = ( +/obj/structure/bookcase/manuals/medical, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"xN" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_starboard) +"xP" = ( +/obj/structure/closet/walllocker/emerglocker/west, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"xQ" = ( +/obj/machinery/suit_cycler/vintage/tmedic, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"xR" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/wall{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"xV" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/railing/grey, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"xW" = ( +/obj/machinery/conveyor{ + id = "talontrash" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"xY" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/engineering{ + name = "Talon Starboard Engines"; + req_one_access = list(301) + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"xZ" = ( +/obj/structure/closet/walllocker/emerglocker/east, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"ya" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/toolbox/electrical, +/obj/item/weapon/pipe_dispenser, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"yc" = ( +/obj/structure/catwalk, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"yd" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 + }, +/obj/item/device/mass_spectrometer/adv, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"yh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/wall/rshull, +/area/shuttle/talonboat) +"yi" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"yj" = ( +/obj/structure/table/standard, +/obj/machinery/chemical_dispenser/full, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"yl" = ( +/obj/structure/sign/warning/airlock{ + pixel_x = 32 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"ym" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/disposalpipe/junction{ + dir = 4; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"yn" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"yo" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"yq" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/suit/space/syndicate/black, +/obj/item/clothing/head/helmet/space/syndicate/black, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"yr" = ( +/obj/effect/overmap/visitable/ship/talon, +/turf/space, +/area/space) +"ys" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/space, +/area/space) +"yt" = ( +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/obj/structure/closet/walllocker/medical/north, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"yu" = ( +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + pixel_y = 28; + req_one_access = list(301) + }, +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/fore_starboard) +"yv" = ( +/obj/machinery/computer/shuttle_control/explore/talon_escape{ + dir = 8 + }, +/obj/machinery/alarm/talon{ + pixel_y = 24 + }, +/obj/item/weapon/paper/talon_escape_pod, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonpod) +"yw" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"yx" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/random/medical, +/obj/structure/closet/walllocker_double/medical/west, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"yz" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/aft_starboard) +"yA" = ( +/obj/effect/landmark/start{ + name = "Talon Captain" + }, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"yC" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"yD" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"yF" = ( +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv, +/obj/structure/closet/walllocker_double/medical/east, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"yH" = ( +/obj/machinery/disposal/wall{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"yJ" = ( +/obj/structure/table/standard, +/obj/fiftyspawner/glass, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"yK" = ( +/obj/machinery/light/small, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"yM" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"yN" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"yO" = ( +/obj/structure/bed/chair/office/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/workroom) +"yR" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/table/standard, +/obj/machinery/cell_charger, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/obj/structure/closet/walllocker/medical/north, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"yS" = ( +/turf/simulated/wall/shull{ + can_open = 1 + }, +/area/talon_v2/engineering/port_store) +"yU" = ( +/obj/machinery/suit_cycler/vintage/tminer, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"yV" = ( +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"yW" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/railing/grey, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"yY" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"yZ" = ( +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/table/rack/steel, +/obj/item/weapon/shovel, +/obj/item/weapon/mining_scanner, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"zd" = ( +/obj/structure/fitness/weightlifter, +/obj/machinery/camera/network/talon{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"ze" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"zh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"zj" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/suit/space/void/refurb/talon, +/obj/item/clothing/head/helmet/space/void/refurb/talon, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"zk" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/port_store) +"zm" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/starboard) +"zo" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"zq" = ( +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 28; + pixel_y = 28; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/structure/catwalk, +/obj/structure/handrail, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/fore_port) +"zs" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/visible, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"zu" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/wall{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"zv" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "talon_brig1"; + name = "Cell Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass/talon, +/turf/simulated/floor/plating, +/area/talon_v2/brig) +"zw" = ( +/obj/machinery/door/airlock/medical{ + name = "Medical Storage"; + req_one_access = list(301) + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"zz" = ( +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"zA" = ( +/obj/machinery/suit_cycler/vintage/tengi, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"zB" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/suit/space/void/refurb/talon, +/obj/item/clothing/head/helmet/space/void/refurb/talon, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"zC" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"zE" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"zH" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/wall{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"zI" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/random/multiple/corp_crate/talon_cargo, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"zJ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/camera/network/talon{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"zK" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"zL" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"zM" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"zQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"zT" = ( +/obj/machinery/disperser/middle{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/ofd_ops) +"zV" = ( +/obj/machinery/atmospherics/pipe/simple/visible/universal{ + dir = 8; + name = "Air to Distro" + }, +/obj/machinery/camera/network/talon, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"zX" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"zZ" = ( +/obj/structure/table/standard, +/obj/item/clothing/gloves/sterile/nitrile, +/obj/item/clothing/mask/surgical, +/obj/item/clothing/suit/surgicalapron, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = 26 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Af" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/camera/network/talon, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Ag" = ( +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Ak" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass, +/obj/structure/sign/directions/bar{ + dir = 1; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"An" = ( +/obj/structure/bed/chair/office/light, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/workroom) +"Aq" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/flora/pottedplant/thinbush, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"As" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/walllocker_double/hydrant/west, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"Au" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"Av" = ( +/obj/effect/floor_decal/emblem/talon, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/wing_port) +"Aw" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/wing_port) +"Ax" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/closet/secure_closet/personal/cabinet{ + locked = 0 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Az" = ( +/obj/structure/table/rack/steel, +/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"AB" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"AD" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"AE" = ( +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/gen_store) +"AH" = ( +/obj/machinery/atmospherics/portables_connector/aux, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"AI" = ( +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/gen_store) +"AJ" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/reagent_dispensers/foam, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) +"AL" = ( +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"AN" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/head/beret/talon, +/obj/item/clothing/head/beret/talon, +/obj/item/clothing/head/beret/talon, +/obj/item/clothing/head/beret/talon, +/obj/item/clothing/suit/storage/hooded/wintercoat/talon, +/obj/item/clothing/suit/storage/hooded/wintercoat/talon, +/obj/item/clothing/suit/storage/hooded/wintercoat/talon, +/obj/item/clothing/suit/storage/hooded/wintercoat/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"AO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/fore) +"AQ" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"AS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"AT" = ( +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/terminal{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"AU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_starboard) +"AV" = ( /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, @@ -10362,30 +8315,513 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/talonboat) -"Ii" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +"AY" = ( +/obj/machinery/conveyor{ + dir = 4; + id = "talonrefinery" }, -/obj/structure/railing/grey{ - dir = 8 +/obj/machinery/mineral/output, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"AZ" = ( +/obj/machinery/telecomms/allinone/talon{ + id = "talon_aio"; + network = "Talon" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/structure/railing/grey, -/obj/structure/table/steel, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"Ij" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/machinery/light/small{ dir = 1 }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"Ba" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/device/suit_cooling_unit, +/obj/item/weapon/tank/oxygen, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"Bb" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"Il" = ( +/area/talon_v2/engineering) +"Bc" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/structure/railing/grey, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"Bd" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/bed/chair/bay/chair, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"Be" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/talon_v2/ofd_ops) +"Bf" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"Bi" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/suit/space/void/refurb/talon, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"Bj" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"Bm" = ( +/obj/structure/hull_corner{ + dir = 8 + }, +/turf/space, +/area/space) +"Bn" = ( +/obj/machinery/atmospherics/binary/pump/on{ + dir = 8; + name = "Air to Distro" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Bq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"Bt" = ( +/obj/structure/table/steel, +/obj/item/device/radio/off{ + channels = list("Talon" = 1); + pixel_y = 6 + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1); + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1); + pixel_x = 6; + pixel_y = 4 + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"Bu" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/portable_atmospherics/canister/carbon_dioxide, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"Bv" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Bw" = ( +/turf/simulated/wall/shull, +/area/talon_v2/workroom) +"By" = ( +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"Bz" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"BC" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/obj/structure/railing/grey, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"BD" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/engi{ + name = "Talon Atmospherics Maintenance Access"; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"BH" = ( +/obj/structure/closet/wardrobe/black{ + starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/weapon/storage/backpack/messenger/black = 4, /obj/item/weapon/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/crew_quarters/restrooms) +"BI" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"BK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"BO" = ( +/obj/machinery/power/apc/talon{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/table/standard, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/recharger, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"BT" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"BU" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 2; + pixel_y = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/medical/south, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"BV" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"BW" = ( +/obj/structure/panic_button, +/obj/structure/table/steel, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonpod) +"BX" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/firstaid/surgery, +/obj/item/stack/nanopaste{ + pixel_x = -7; + pixel_y = -4 + }, +/obj/item/stack/nanopaste{ + pixel_x = 9; + pixel_y = -4 + }, +/obj/item/device/robotanalyzer{ + pixel_y = -8 + }, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"BY" = ( +/obj/structure/bed/chair/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"BZ" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Cb" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"Cd" = ( +/obj/structure/closet/secure_closet/talon_pilot, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/pilot_room) +"Cf" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/suit/space/anomaly, +/obj/item/clothing/head/helmet/space/anomaly, +/obj/item/clothing/mask/breath, +/obj/item/weapon/storage/belt/archaeology, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"Ck" = ( +/obj/machinery/ntnet_relay, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"Cq" = ( +/obj/structure/table/standard, +/obj/machinery/chemical_dispenser/biochemistry/full, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Cr" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/empty/phoron, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Cv" = ( +/obj/structure/disposaloutlet{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/ofd_ops) +"Cy" = ( +/obj/structure/table/standard, +/obj/item/device/defib_kit/jumper_kit/loaded, +/obj/item/device/defib_kit/loaded, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/device/sleevemate, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"CA" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/sign/directions/engineering/atmospherics{ + pixel_x = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway) +"CB" = ( +/obj/effect/floor_decal/emblem/talon_big{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"CC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"CE" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/handrail{ + dir = 4 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"CF" = ( +/obj/item/weapon/storage/box/bodybags, +/obj/item/roller, +/obj/item/roller{ + pixel_y = 8 + }, +/obj/structure/table/standard, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"CH" = ( +/obj/structure/table/standard, +/obj/machinery/recharger, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"CI" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"CJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"CK" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/catwalk, +/obj/structure/closet/walllocker_double/west, +/obj/item/weapon/cell/apc, +/obj/item/weapon/cell/apc, +/obj/random/maintenance/engineering, +/obj/random/maintenance/engineering, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/obj/item/clothing/suit/radiation, +/obj/item/clothing/head/radiation, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"CM" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"CN" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/noticeboard{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"CO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"CP" = ( +/obj/machinery/suit_cycler/vintage/tcrew, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"CR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -10394,8 +8830,981 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"CS" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/workroom) +"CU" = ( +/obj/item/modular_computer/console/preset/talon{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"CV" = ( +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/table/standard, +/obj/item/weapon/paper_bin, +/obj/item/weapon/pen, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"CX" = ( +/obj/machinery/disperser/front{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/ofd_ops) +"CY" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Dd" = ( +/turf/simulated/wall/shull, +/area/talon_v2/secure_storage) +"Dg" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/aft_starboard) +"Di" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"Dj" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"Dk" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/holoposter{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"Dl" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"Dm" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/wing_starboard) +"Dq" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/aft_starboard) +"Ds" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Du" = ( +/obj/effect/floor_decal/emblem/talon, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/wing_starboard) +"Dx" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/workroom) +"Dy" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"DB" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"DC" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/blast/regular/open{ + id = "talon_boat_cockpit" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/shuttle/talonboat) +"DD" = ( +/turf/simulated/wall/shull, +/area/talon_v2/maintenance/aft_starboard) +"DG" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"DH" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/ofd_ops) +"DI" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/camera/network/talon, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"DK" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/ofd_ops) +"DM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"DN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"DP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"DR" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"DU" = ( +/obj/effect/floor_decal/corner/black/diagonal, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"DV" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/turf/simulated/floor/reinforced/airless, /area/talon_v2/engineering/starboard) -"Im" = ( +"DW" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"DX" = ( +/obj/machinery/camera/network/talon{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"DY" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/railing/grey, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"DZ" = ( +/obj/structure/closet/secure_closet/talon_captain, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"Ea" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"Ec" = ( +/obj/machinery/door/airlock/maintenance/cargo{ + id_tag = talon_minerdoor; + req_one_access = list(301) + }, +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/mine_room) +"Ee" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Ef" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/gun/energy/gun/burst, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/clothing/accessory/holster/waist, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"Ei" = ( +/obj/machinery/door/airlock/mining{ + id_tag = talon_minerdoor; + name = "Miner's Cabin"; + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/mine_room) +"Ej" = ( +/obj/structure/table/rack/steel, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"Ek" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/pilot_room) +"En" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"Eo" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"Ep" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/closet/walllocker_double/hydrant/west, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Eq" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"Er" = ( +/obj/structure/loot_pile/maint/boxfort, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Eu" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/closet/secure_closet/talon_miner, +/obj/item/weapon/storage/box/nifsofts_mining, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Ev" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"Ew" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/network/talon, +/obj/machinery/atm{ + pixel_y = 31 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Ey" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "talon_brig2"; + name = "Cell Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass/talon, +/turf/simulated/floor/plating, +/area/talon_v2/brig) +"EB" = ( +/obj/effect/shuttle_landmark/premade/talon_v2_wing_port, +/turf/simulated/floor/reinforced/airless, +/area/space) +"ED" = ( +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 1; + req_access = list(301) + }, +/obj/machinery/door/window/brigdoor/eastleft{ + dir = 2; + req_access = list(301) + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "talon_brig2"; + name = "Cell Shutters"; + opacity = 0 + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"EE" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"EF" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"EH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"EI" = ( +/obj/structure/catwalk, +/obj/structure/railing/grey, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"EJ" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"EL" = ( +/obj/machinery/power/apc/talon{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"EN" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/command{ + id_tag = "talon_capdoor"; + name = "Captain's Cabin"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"EO" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"EP" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"ES" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"ET" = ( +/obj/structure/railing/grey, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"EV" = ( +/obj/structure/table/rack/steel, +/obj/item/clothing/shoes/leg_guard/combat, +/obj/item/clothing/gloves/arm_guard/combat, +/obj/item/clothing/under/syndicate/combat, +/obj/item/clothing/suit/armor/combat, +/obj/item/clothing/head/helmet/combat, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"EX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"EY" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Fa" = ( +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor{ + pixel_x = 28; + pixel_y = 28; + req_one_access = list(301) + }, +/obj/structure/catwalk, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/aft_starboard) +"Fc" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/tank/oxygen, +/obj/item/weapon/tank/oxygen, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"Fd" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/sign/directions/bar{ + dir = 1; + pixel_x = -32; + pixel_y = -3 + }, +/obj/structure/sign/directions/bridge{ + dir = 1; + pixel_x = -32; + pixel_y = 3 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Fe" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/star) +"Ff" = ( +/turf/simulated/wall/tgmc/rwall, +/area/shuttle/talonpod) +"Fg" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Fh" = ( +/obj/structure/sign/warning/airlock{ + pixel_x = 32 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"Fj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/walllocker/medical/north, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"Fk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Fn" = ( +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Fo" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Fq" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"Fr" = ( +/obj/machinery/mineral/processing_unit{ + points_mult = 0 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"Ft" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Fv" = ( +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/handrail{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"Fw" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"Fx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Fy" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/voidcraft{ + name = "Cabin Access"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"Fz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/ship_munition/disperser_charge/emp, +/turf/simulated/floor/reinforced, +/area/talon_v2/ofd_ops) +"FB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"FC" = ( +/obj/machinery/drone_fabricator/talon, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"FG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"FK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"FM" = ( +/obj/machinery/washing_machine, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/crew_quarters/restrooms) +"FN" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"FO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/hydrant/north, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"FP" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/structure/catwalk, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"FT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"FU" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"FX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/sign/directions/security{ + dir = 8; + pixel_x = -32; + pixel_y = 3 + }, +/obj/structure/sign/directions/security/brig{ + dir = 8; + pixel_x = -32; + pixel_y = -3 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"FY" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"FZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Ga" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/directions/security/armory{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Gb" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -10412,276 +9821,685 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering) -"In" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +"Gg" = ( +/obj/machinery/computer/ship/disperser{ dir = 8 }, +/obj/item/weapon/paper/talon_cannon, +/obj/machinery/alarm/talon{ + pixel_y = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/ofd_ops) +"Gi" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"Io" = ( -/obj/machinery/atmospherics/portables_connector/aux, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"Ip" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/floor_decal/corner/black/diagonal, -/obj/item/weapon/stool/baystool/padded{ +/obj/structure/catwalk, +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"Iq" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Gl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/holoposter{ + dir = 8; + pixel_x = -32 }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) -"Ir" = ( -/obj/structure/loot_pile/maint/boxfort, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Is" = ( -/obj/machinery/camera/network/talon{ - dir = 1 +"Gm" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/structure/safe/floor{ - name = "smuggling compartment" - }, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"It" = ( -/obj/structure/closet/crate, -/obj/structure/railing/grey, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"Iu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/workroom) -"Iv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"Ix" = ( -/obj/structure/bed/chair/bay/chair, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"Iz" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"IC" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/railing/grey{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"ID" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/engineering/port) -"IE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"IF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 +/area/talon_v2/central_hallway/port) +"Gn" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 }, /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Gp" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Gq" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Gr" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"Gs" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"Gu" = ( +/obj/structure/table/rack/steel, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Gv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_starboard) +"Gw" = ( +/obj/effect/floor_decal/emblem/talon_big{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"Gx" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Gy" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/structure/railing/grey, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Gz" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"GA" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"GC" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"GE" = ( +/obj/machinery/atmospherics/binary/algae_farm/filled{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"GH" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/gen_store) +"GJ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/table/standard, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/camera/network/talon{ + dir = 4 + }, +/obj/machinery/recharger, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/crew_quarters/restrooms) +"GK" = ( +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/sec_room) +"GP" = ( +/obj/machinery/power/smes/buildable/offmap_spawn{ + RCon_tag = "Talon Port SMES" }, /obj/structure/cable/green{ d2 = 4; icon_state = "0-4" }, /turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"IG" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - name = "Waste to Filter" +/area/talon_v2/engineering) +"GQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"GU" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"GV" = ( +/obj/machinery/light/small, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"IJ" = ( +"GW" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, /obj/structure/catwalk, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, +/obj/structure/railing/grey, /turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"IK" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/engineering/generators) -"IL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1 +/area/talon_v2/engineering/atmospherics) +"GY" = ( +/obj/structure/girder, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"GZ" = ( +/obj/machinery/light/small{ + dir = 8 }, -/turf/simulated/wall/rshull, -/area/shuttle/talonboat) -"IM" = ( +/obj/structure/table/rack/steel, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"Ha" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Hb" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"Hc" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal/wall, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"Hf" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 6 }, /obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Hg" = ( +/obj/machinery/conveyor{ dir = 8; - icon_state = "pipe-c" + id = "talonrefinery" }, -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"IN" = ( -/obj/structure/table/steel, -/obj/machinery/camera/network/talon, -/obj/machinery/cell_charger, -/obj/item/weapon/cell/apc, +/obj/structure/plasticflaps, /turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"IP" = ( -/obj/structure/catwalk, -/obj/structure/barricade, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"IR" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ +/area/talon_v2/refining) +"Hh" = ( +/obj/structure/table/woodentable, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/structure/handrail{ - dir = 1 +/obj/item/weapon/paper/talon_guard, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/sec_room) +"Hj" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_port) -"IS" = ( -/obj/effect/floor_decal/industrial/warning/corner{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/obj/machinery/door/firedoor/glass/talon, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"IU" = ( -/obj/structure/bookcase/manuals/research_and_development, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"IW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/department/armory{ - name = "GUARD'S QUARTERS"; +/area/talon_v2/hangar) +"Hn" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj/structure/catwalk, +/obj/machinery/camera/network/talon, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"Hq" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; pixel_x = -32 }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"Hr" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/airlock_sensor{ + pixel_y = 24; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"Ht" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/talon_v2/ofd_ops) +"Hu" = ( +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + id_tag = "talon_boat"; + pixel_y = 24 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 1 + }, +/obj/structure/handrail, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"Hv" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"Hw" = ( +/obj/machinery/computer/ship/navigation, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/button/remote/blast_door{ + id = "talon_bridge_shields"; + name = "bridge blast shields"; + pixel_y = 16 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"Hx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Hy" = ( +/obj/structure/handrail, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/survival/north, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"Hz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/hangar) +"HA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"IX" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) -"IY" = ( +"HD" = ( +/obj/structure/disposaloutlet{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"HE" = ( +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"Jd" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"HF" = ( +/obj/machinery/power/apc/talon{ + dir = 8; + name = "west bump"; + pixel_x = -28 }, -/obj/machinery/suspension_gen{ - req_access = list(301) +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/restrooms) +"HG" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"HH" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"Jf" = ( /obj/machinery/door/firedoor/glass/talon, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = -26 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/machinery/door/airlock/engineering{ - id_tag = "talon_engdoor"; - name = "Engineer's Cabin"; + name = "Talon Port Engines"; req_one_access = list(301) }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"Ji" = ( +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"HI" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/loot_pile/maint/trash, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"HK" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/junction, +/obj/structure/sign/directions/engineering{ + pixel_x = 32; + pixel_y = -3 + }, +/obj/structure/sign/directions/engineering/atmospherics{ + dir = 8; + pixel_x = 32; + pixel_y = 3 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway) +"HN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"HS" = ( +/turf/simulated/wall/shull, +/area/talon_v2/anomaly_storage) +"HT" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway) +"HU" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"HV" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/structure/table/rack/steel, +/obj/item/weapon/grenade/spawnergrenade/manhacks/mercenary{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/device/spaceflare, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"HW" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -10695,17 +10513,1352 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering/port) -"Jk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +"HX" = ( +/obj/machinery/vending/blood{ + req_access = list(301); + req_log_access = 301 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"HY" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"HZ" = ( +/turf/simulated/wall/tgmc/window/rwall, +/area/shuttle/talonpod) +"Ia" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holoposter{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Id" = ( +/obj/structure/catwalk, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"Ie" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"If" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 10 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Ig" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/mineral/input, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"Ih" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Ij" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Il" = ( +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Im" = ( +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"In" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, -/obj/structure/bed/chair/bay/chair{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"Ip" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/item/weapon/stool/baystool/padded{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/bar) +"Iq" = ( +/obj/machinery/camera/network/talon{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Ir" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Is" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"It" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/closet/crate, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"Iu" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"Iv" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"Ix" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/box/donut, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"Iz" = ( +/obj/structure/handrail, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"IA" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"IB" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/mine_room) +"IC" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"ID" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"IF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_starboard) +"IJ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"IK" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/generators) +"IL" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"IM" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"IN" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"IO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/catwalk, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"IP" = ( +/turf/simulated/wall/shull, +/area/talon_v2/maintenance/aft_port) +"IS" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass_research{ + name = "Anomaly Storage"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/anomaly_storage) +"IU" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"IW" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/fore) +"IY" = ( +/obj/structure/sign/warning/moving_parts{ + pixel_y = -32 + }, +/obj/machinery/disposal/wall{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Jd" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"Je" = ( +/obj/structure/handrail{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"Jf" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"Ji" = ( +/obj/effect/shuttle_landmark/premade/talon_v2_wing_star, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Jk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"Jl" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + id_tag = "talon_starboard_aft"; + pixel_y = -30; + req_one_access = list(301) + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + req_one_access = list(301) + }, +/obj/machinery/light/small, +/obj/structure/handrail{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/aft_starboard) +"Jm" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 1; + id_tag = "talon_port"; + pixel_y = -30; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"Jp" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"Jr" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"Jt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Ju" = ( +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Jv" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Jw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/engineeringatmos{ + name = "Talon Atmospherics"; + req_one_access = list(301) + }, +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/engineering/atmospherics) +"Jy" = ( +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + dir = 1; + id_tag = "talon_port_aft"; + pixel_y = -30; + req_one_access = list(301) + }, +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 28; + req_one_access = list(301) + }, +/obj/machinery/light/small, +/obj/structure/handrail{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/aft_port) +"Jz" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"JA" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_boat_cockpit" + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/shuttle/talonboat) +"JB" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"JC" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/computer/shuttle_control/explore/talonboat{ + dir = 4; + name = "boat remote control console" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"JI" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/restrooms) +"JJ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"JK" = ( +/obj/structure/table/woodentable, +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, /turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"Jm" = ( +/area/talon_v2/crew_quarters/mine_room) +"JL" = ( +/turf/simulated/wall/shull, +/area/talon_v2/ofd_ops) +"JM" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/turf/simulated/wall/rshull, +/area/talon_v2/engineering/starboard) +"JN" = ( +/obj/structure/catwalk, +/obj/structure/barricade, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"JO" = ( +/obj/machinery/computer/ship/sensors{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"JQ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"JR" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"JU" = ( +/obj/machinery/atmospherics/binary/pump/high_power/on, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"JV" = ( +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"JZ" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"Ke" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Kf" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Cargo Bay"; + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Kg" = ( +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"Kk" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_port) +"Km" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/handrail{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/aft_starboard) +"Kn" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Ko" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Kp" = ( +/obj/machinery/chem_master, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Ks" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/hangar) +"Kv" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Kw" = ( +/obj/machinery/alarm/talon{ + pixel_y = 28 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"Kx" = ( +/obj/machinery/recharger/wallcharger{ + pixel_x = 5; + pixel_y = 24 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/device/radio/off{ + channels = list("Talon" = 1); + pixel_y = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"Kz" = ( +/obj/machinery/holoposter{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"KB" = ( +/turf/simulated/wall/shull, +/area/talon_v2/maintenance/fore_port) +"KC" = ( +/obj/structure/closet/walllocker_double/hydrant/west, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"KE" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"KH" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"KI" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"KJ" = ( +/obj/structure/table/bench/wooden, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"KM" = ( +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"KN" = ( +/obj/structure/table/steel, +/obj/item/weapon/pickaxe/drill, +/obj/machinery/button/remote/blast_door{ + id = "talon_boat_cockpit"; + pixel_x = 6; + pixel_y = 28 + }, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "talonboat_docker"; + pixel_x = -6; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"KO" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"KQ" = ( +/obj/structure/railing/grey, +/obj/effect/floor_decal/emblem/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"KS" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"KT" = ( +/obj/machinery/atmospherics/portables_connector/aux, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/railing/grey, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"KU" = ( +/turf/simulated/wall/shull, +/area/talon_v2/engineering/port_store) +"KX" = ( +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Hangar Bay"; + req_one_access = list(301) + }, +/obj/machinery/door/firedoor/glass/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/hangar) +"KY" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"KZ" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + req_one_access = list(301) + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"Lc" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"Le" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Lg" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Li" = ( +/obj/structure/flora/pottedplant/minitree, +/obj/machinery/holoposter{ + dir = 1; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway) +"Lj" = ( +/obj/structure/sign/directions/cargo/refinery{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Lk" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"Ll" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/item/weapon/paper/talon_power, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/eng_room) +"Ln" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/powered/scrubber, +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/railing/grey, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Lo" = ( +/obj/machinery/holoposter{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Lr" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"Ls" = ( +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Lu" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"Lv" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/rtg/advanced, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"Lw" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/engi{ + name = "Starboard Eng. Storage"; + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"Lx" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass{ + name = "Workroom" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/workroom) +"Ly" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/hydrant/north, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Lz" = ( +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"LA" = ( +/obj/machinery/alarm/talon{ + dir = 1; + pixel_y = -25 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"LB" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"LC" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"LD" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/directions/medical{ + dir = 4; + pixel_x = 32; + pixel_y = -3 + }, +/obj/structure/sign/directions/engineering{ + pixel_x = 32; + pixel_y = 3 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"LF" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"LH" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/regular/open{ + id = "talon_windows" + }, +/obj/machinery/door/firedoor/glass/talon, +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/bar) +"LI" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/multi_tile/glass{ + dir = 1; + name = "Cargo Bay"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"LJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"LL" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"LM" = ( +/obj/machinery/atmospherics/binary/pump/fuel, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"LN" = ( +/obj/structure/table/steel, +/obj/machinery/camera/network/talon, +/obj/machinery/cell_charger, +/obj/item/weapon/cell/apc, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"LO" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"LQ" = ( /obj/effect/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) @@ -10733,1387 +11886,149 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/talonboat) -"Jp" = ( -/obj/structure/closet/excavation, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"Jr" = ( +"LR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4 +/obj/machinery/alarm/talon{ + pixel_y = 28 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"LT" = ( +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/cargo, +/obj/random/maintenance/cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) +"LU" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"Jt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/effect/catwalk_plated, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/workroom) -"Ju" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "talonrefinery" - }, -/obj/structure/plasticflaps, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"Jv" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Jw" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 9 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Jz" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"JA" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/voidcraft{ - name = "Cabin Access"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"JB" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/light/small{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"JC" = ( -/obj/machinery/computer/ship/helm{ - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"JE" = ( -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/table/standard, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"JF" = ( -/obj/structure/catwalk, -/obj/structure/trash_pile, -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"JG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/gen_store) -"JH" = ( -/obj/structure/extinguisher_cabinet{ - dir = 1; +/obj/structure/sign/department/medbay{ pixel_y = 32 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"JI" = ( -/obj/machinery/door/airlock/medical{ - name = "Medical Storage"; - req_one_access = list(301) - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"JJ" = ( -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -28; - pixel_y = 28; - req_one_access = list(301) - }, -/obj/structure/catwalk, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/fore_starboard) -"JK" = ( -/obj/machinery/suit_cycler/vintage/tengi, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"JL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"JO" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/bridge) -"JP" = ( -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "talon_bridge_shields" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/bridge) -"JQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, /turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"JT" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/suit/space/syndicate/black, -/obj/item/clothing/head/helmet/space/syndicate/black, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"JV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_starboard) -"JW" = ( -/obj/structure/catwalk, -/obj/structure/handrail, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/aft_starboard) -"JX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/plating, -/area/talon_v2/secure_storage) -"Ka" = ( -/turf/simulated/wall/shull, -/area/talon_v2/maintenance/fore_starboard) -"Kc" = ( -/obj/structure/table/steel, -/obj/structure/closet/autolok_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"Kd" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"Ke" = ( -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/obj/structure/flora/pottedplant, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"Kf" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/catwalk, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"Kg" = ( -/obj/structure/closet/secure_closet/talon_captain, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"Kh" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/sign/directions/bridge{ - dir = 1; - pixel_x = 32; - pixel_y = 3 - }, -/obj/structure/sign/directions/bar{ - dir = 1; - pixel_x = 32; - pixel_y = -3 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"Kj" = ( -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"Kk" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"Kl" = ( -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Ko" = ( -/obj/machinery/suit_cycler/vintage/tmedic, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Kp" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/firstaid/surgery, -/obj/item/stack/nanopaste{ - pixel_x = -7; - pixel_y = -4 - }, -/obj/item/stack/nanopaste{ - pixel_x = 9; - pixel_y = -4 - }, -/obj/item/device/robotanalyzer{ - pixel_y = -8 - }, -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Kr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/gen_store) -"Ks" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/hangar) -"Kt" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"Kv" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Kx" = ( -/obj/structure/closet/wardrobe/black{ - starts_with = list(/obj/item/clothing/under/color/black = 4, /obj/item/clothing/accessory/storage/black_vest = 4, /obj/item/clothing/accessory/storage/black_drop_pouches = 4, /obj/item/clothing/gloves/black = 4, /obj/item/clothing/head/soft/black = 4, /obj/item/clothing/mask/balaclava = 4, /obj/item/clothing/mask/bandana = 4, /obj/item/clothing/mask/gas/commando = 4, /obj/item/weapon/storage/backpack/messenger/black = 4, /obj/item/weapon/storage/backpack/dufflebag = 4, /obj/item/clothing/shoes/black = 4, /obj/item/clothing/shoes/boots/duty = 4) - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"Kz" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/command{ - name = "Bridge"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"KA" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"KB" = ( -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"KC" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"KD" = ( -/obj/machinery/atmospherics/pipe/tank/air/full{ +/area/talon_v2/central_hallway/star) +"LV" = ( +/obj/machinery/atmospherics/pipe/manifold/visible{ dir = 8 }, /obj/structure/railing/grey, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"KE" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/camera/network/talon, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"KI" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"KM" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/engineering/port_store) -"KN" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 - }, -/obj/structure/closet/walllocker/medical/east, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/extinguisher/mini, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"KO" = ( -/turf/simulated/wall/shull{ - can_open = 1 - }, -/area/talon_v2/engineering/port_store) -"KS" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"KT" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/aft_starboard) -"KU" = ( -/turf/simulated/wall/shull, -/area/talon_v2/engineering/port_store) -"KX" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/airlock/engineeringatmos{ - name = "Talon Atmospherics"; - req_one_access = list(301) - }, -/obj/structure/sign/directions/engineering/atmospherics{ - dir = 8; - pixel_y = 35 - }, -/obj/structure/sign/directions/engineering{ - dir = 4; - pixel_y = 29 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"KY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"KZ" = ( -/obj/structure/catwalk, -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/aft_starboard) -"Lc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Le" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"Li" = ( -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Lj" = ( -/obj/effect/map_helper/airlock/door/ext_door, -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"Lk" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/aft_starboard) -"Ll" = ( -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"Lo" = ( -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = -26 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"Lr" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Lt" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"Lu" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"Lx" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/suit/space/anomaly, -/obj/item/clothing/head/helmet/space/anomaly, -/obj/item/clothing/mask/breath, -/obj/item/weapon/storage/belt/archaeology, -/obj/machinery/light_switch{ - pixel_y = 24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/anomaly_storage) -"Ly" = ( -/obj/machinery/conveyor{ - dir = 1; - id = "talonrefinery" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"Lz" = ( -/obj/effect/floor_decal/emblem/talon, -/turf/simulated/floor/reinforced/airless, -/area/space) -"LA" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"LB" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"LD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"LF" = ( -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"LI" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/door/airlock/maintenance/engi{ - name = "Engine Crawlway Access"; - req_one_access = list(301) - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"LL" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/reagent_dispensers/fueltank/high, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/gen_store) -"LM" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"LN" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"LO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"LT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"LU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/refining) -"LV" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/portable_atmospherics/canister/empty, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) "LX" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_port) "LY" = ( -/turf/simulated/wall/shull, -/area/talon_v2/engineering) -"Mb" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/obj/structure/railing/grey{ +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/floor_decal/industrial/warning/cee, +/obj/structure/handrail, +/turf/simulated/floor/reinforced, +/area/shuttle/talonboat) +"Mb" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/walllocker/medical/west, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/tiled/techmaint, /area/talon_v2/maintenance/wing_starboard) "Mc" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing/grey, +/obj/machinery/camera/network/talon, /obj/random/multiple/corp_crate/talon_cargo, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/maintenance/wing_port) "Mf" = ( -/obj/machinery/atmospherics/portables_connector/aux, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/obj/structure/railing/grey, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) "Mg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) "Mh" = ( -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) "Mi" = ( -/obj/structure/catwalk, -/obj/structure/trash_pile, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -24 + }, +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/whetstone, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) "Mj" = ( -/obj/machinery/computer/ship/navigation{ - dir = 4 +/obj/structure/railing/grey{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) +"Mk" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/mine_room) "Ml" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/vending/medical_talon{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) "Mm" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) "Mo" = ( -/obj/machinery/atmospherics/binary/pump/high_power/on{ - dir = 8 - }, -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Mp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"Mr" = ( -/obj/structure/disposaloutlet, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/engineering) -"Mu" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Mv" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"MA" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"MB" = ( -/obj/structure/sign/directions/medical{ - pixel_y = -32 - }, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"MD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"ME" = ( -/obj/structure/handrail, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"MG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"ML" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/fore_port) -"MO" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"MP" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"MQ" = ( -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_alc/full{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black/diagonal, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"MR" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"MT" = ( -/obj/machinery/light/small, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"MU" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock{ - id_tag = "talon_restroom1"; - name = "Unisex Restroom" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"MV" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 1 - }, -/obj/effect/catwalk_plated/dark, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"MX" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/handrail{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"Na" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"Nb" = ( -/obj/machinery/smartfridge/chemistry{ - req_access = list(301); - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Nc" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/camera/network/talon{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Nf" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Nh" = ( -/obj/structure/railing/grey, -/obj/machinery/atmospherics/pipe/manifold/visible/blue, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Nj" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/aux, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"Nk" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"Nl" = ( -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/meditation) -"Nm" = ( -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"Nn" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/visible, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Nq" = ( -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/cap_room) -"Ns" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Nt" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 9 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"Nv" = ( -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = 24 - }, -/obj/structure/table/rack/shelf/steel, -/obj/item/device/radio/off{ - channels = list("Talon" = 1); - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"Nw" = ( -/obj/structure/sign/directions/science/xenoarch{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"Nz" = ( -/obj/structure/table/standard, -/obj/item/clothing/gloves/sterile/nitrile, -/obj/item/clothing/mask/surgical, -/obj/item/clothing/suit/surgicalapron, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/sign/warning/nosmoking_1{ - pixel_x = 26 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"NB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"NC" = ( -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/sec_room) -"NE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/holoposter{ - dir = 8; - pixel_x = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"NI" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"NK" = ( -/obj/machinery/suit_cycler/vintage/tguard, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/sec_room) -"NM" = ( -/obj/structure/table/rack/steel, -/obj/item/clothing/shoes/leg_guard/combat, -/obj/item/clothing/gloves/arm_guard/combat, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/suit/armor/combat, -/obj/item/clothing/head/helmet/combat, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"NO" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/wall{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"NQ" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"NR" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"NS" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_port) -"NT" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/structure/handrail, -/obj/effect/floor_decal/industrial/warning/corner, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"NU" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/wall/shull, -/area/talon_v2/central_hallway) -"NV" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/crew_quarters/cap_room) -"NW" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon, -/obj/item/clothing/accessory/holster/waist, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"NZ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"Ob" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 - }, -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"Od" = ( -/obj/structure/table/standard, -/obj/machinery/reagentgrinder, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Og" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"Oi" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/powered/pump/filled, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Oj" = ( -/turf/simulated/wall/shull, -/area/talon_v2/armory) -"Ok" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/ore_box, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"Om" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"On" = ( -/obj/machinery/chem_master, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Oo" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"Op" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 }, @@ -12125,271 +12040,230 @@ /obj/structure/railing/grey, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"Oq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +"Mp" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/black/diagonal, -/obj/item/weapon/stool/baystool/padded{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"Ot" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/maintenance/wing_starboard) -"Ow" = ( -/obj/machinery/vending/coffee{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"OB" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/handrail{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"OD" = ( -/obj/machinery/light{ +"Mr" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light/small{ dir = 8 }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/wall{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"OE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 5 - }, +/obj/structure/railing/grey, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"Ms" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, /obj/effect/floor_decal/industrial/warning{ - dir = 4 + dir = 8 }, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/port) -"OH" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, +"Mt" = ( /obj/effect/floor_decal/industrial/warning/dust{ dir = 9 }, /turf/simulated/floor/reinforced/airless, -/area/space) -"OI" = ( -/obj/effect/floor_decal/industrial/loading, +/area/talon_v2/engineering/port) +"Mu" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "talon_cargo_star"; + name = "Cargo Loading Hatch" + }, /turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"OJ" = ( -/obj/machinery/atmospherics/pipe/simple/visible, +/area/talon_v2/maintenance/wing_starboard) +"Mv" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"My" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass{ + name = "Cantina" + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/bar) +"Mz" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/regular/open{ + id = "talon_windows" + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/cap_room) +"MB" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 1; + id_tag = "talon_starboard"; + pixel_y = -30; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"MD" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"ME" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/obj/structure/bed/chair/bay/shuttle, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"MF" = ( +/obj/machinery/light/small{ + dir = 1 + }, /obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"OK" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/port) -"OL" = ( /obj/structure/railing/grey{ dir = 1 }, -/obj/machinery/power/smes/buildable/offmap_spawn{ - RCon_tag = "Talon Port SMES" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, /turf/simulated/floor/plating, -/area/talon_v2/engineering) -"OM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/area/talon_v2/engineering/atmospherics) +"MG" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock{ + id_tag = "talon_restroom2"; + name = "Unisex Restroom" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"ON" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"OP" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"OQ" = ( -/turf/simulated/wall/shull, -/area/talon_v2/gen_store) -"OR" = ( -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"OS" = ( -/obj/structure/sign/department/bridge{ - name = "PILOT'S QUARTERS"; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"OT" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"OU" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"OW" = ( -/obj/effect/shuttle_landmark/premade/talon_v2_near_aft_star, -/turf/space, -/area/space) -"OX" = ( -/obj/structure/bed/chair/bay/chair, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"OY" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/effect/floor_decal/corner/black/diagonal, -/obj/structure/table/marble, -/obj/item/device/radio/off{ - channels = list("Talon" = 1) - }, /turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"OZ" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/area/talon_v2/crew_quarters/restrooms) +"ML" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"MO" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"MP" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"MU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"MV" = ( /obj/structure/cable/green{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"Pb" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = 26 }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) -"Pd" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/engineering{ + name = "Talon Starboard Engines"; + req_one_access = list(301) + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"MW" = ( +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"MZ" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 8 }, /turf/simulated/floor/reinforced/airless, /area/space) -"Pe" = ( -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"Pf" = ( -/obj/structure/railing/grey, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"Pg" = ( -/obj/machinery/vending/fitness, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"Ph" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ +"Na" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_port) -"Pj" = ( +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Nb" = ( /obj/machinery/light/small{ dir = 4 }, @@ -12403,651 +12277,59 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/crew_quarters/restrooms) -"Pk" = ( -/obj/effect/floor_decal/corner/black/diagonal, -/obj/structure/table/marble, -/obj/random/pizzabox, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"Pl" = ( +"Nc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"Ne" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/aft_port) +"Nf" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"Nh" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/engi{ - name = "Talon Atmospherics Maintenance Access"; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/turf/simulated/floor/plating, +/area/talon_v2/armory) +"Nl" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/meditation) +"Nn" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/simple/visible, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"Pm" = ( -/obj/structure/table/rack/shelf/steel, -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = 24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"Po" = ( -/obj/effect/map_helper/airlock/door/simple, -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"Pr" = ( -/obj/machinery/shower, -/obj/item/weapon/soap/deluxe, -/obj/structure/curtain, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"Ps" = ( -/obj/machinery/power/apc/talon{ - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/obj/structure/table/standard, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/recharger, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Pt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"Pu" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Pv" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"Px" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/grey{ - dir = 1 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"Py" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow, -/turf/simulated/wall/rshull, -/area/talon_v2/engineering/port) -"PB" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"PC" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/multi_tile/glass{ - dir = 1; - name = "Cargo Bay"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"PE" = ( -/obj/effect/floor_decal/emblem/talon_big{ - dir = 9 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"PF" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"PG" = ( -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"PH" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ - dir = 1 - }, -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"PI" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/mineral/input, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"PK" = ( -/obj/effect/shuttle_landmark/premade/talon_v2_near_fore_port, -/turf/space, -/area/space) -"PL" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"PO" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"PP" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway) -"PR" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/wall{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/pilot_room) -"PU" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"PV" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"PW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +"Nq" = ( /turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/bar) -"PX" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock{ - name = "Restrooms & Charger" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"PZ" = ( -/obj/structure/bed/chair/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/blucarpet, /area/talon_v2/crew_quarters/cap_room) -"Qa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/railing/grey, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/table/steel, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"Qb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/restrooms) -"Qc" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"Qi" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/structure/sign/warning/airlock{ - pixel_y = 32 - }, -/obj/machinery/airlock_sensor{ - dir = 4; - pixel_x = -28; - pixel_y = -28; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/fore_port) -"Qj" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/port) -"Qk" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"Qm" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"Qn" = ( -/obj/structure/closet/secure_closet/chemical{ - req_access = list(301) - }, -/obj/item/weapon/reagent_containers/spray/cleaner{ - desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; - name = "Chemistry Cleaner" - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Qo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"Qq" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/railing/grey, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"Qu" = ( -/obj/machinery/firealarm{ - dir = 4; - pixel_x = 26 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"Qv" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Qx" = ( -/obj/structure/catwalk, -/obj/structure/closet/walllocker_double/west, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/stack/cable_coil/green, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Qy" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/medical{ - id_tag = "talon_meddoor"; - req_one_access = list(301) - }, -/turf/simulated/floor/plating, -/area/talon_v2/crew_quarters/med_room) -"Qz" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"QA" = ( -/obj/structure/hull_corner/long_horiz{ - dir = 9 - }, -/turf/space, -/area/space) -"QB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"QC" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"QD" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/machinery/portable_atmospherics/canister/carbon_dioxide, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"QE" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction{ - dir = 4; - icon_state = "pipe-j2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"QF" = ( -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"QG" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/donut, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"QH" = ( -/obj/machinery/recharge_station, -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"QI" = ( -/obj/effect/floor_decal/industrial/warning/dust/corner{ - dir = 1 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"QJ" = ( -/obj/structure/catwalk, -/obj/structure/disposalpipe/junction/yjunction, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"QM" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/shuttle/talonboat) -"QN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/sec_room) -"QR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"QS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"QV" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"QY" = ( -/obj/structure/catwalk, -/obj/structure/trash_pile, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"Rb" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"Rd" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"Re" = ( -/obj/structure/closet/crate, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/obj/random/maintenance/clean, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/gen_store) -"Rf" = ( -/turf/simulated/wall/shull{ - can_open = 1 - }, -/area/talon_v2/engineering/star_store) -"Rg" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"Ri" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 6 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"Rj" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/engineeringatmos{ - name = "Talon Atmospherics"; - req_one_access = list(301) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Rp" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"Rs" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal/wall{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"Rt" = ( -/obj/machinery/drone_fabricator/talon, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Ru" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"Rx" = ( -/turf/space, -/area/talon_v2/engineering/port) -"Ry" = ( -/obj/machinery/mineral/processing_unit{ - points_mult = 0 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"RA" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"RB" = ( +"Ns" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment{ @@ -13068,511 +12350,14 @@ }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) -"RC" = ( -/obj/effect/floor_decal/emblem/talon_big/center, -/obj/structure/cable/green, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"RD" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"RE" = ( -/obj/structure/trash_pile, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"RF" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, -/area/talon_v2/bridge) -"RG" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 2; - pixel_y = -28 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"RI" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"RJ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"RK" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"RL" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"RO" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"RP" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/airlock_sensor{ - pixel_y = 24; - req_one_access = list(301) - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/obj/structure/handrail, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"RQ" = ( -/turf/simulated/wall/shull, -/area/talon_v2/medical) -"RV" = ( -/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"RW" = ( -/obj/structure/table/rack/shelf/steel, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"Sa" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Sb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"Sd" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/engineering{ - name = "Talon Port Engines"; - req_one_access = list(301) - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"Sg" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/table/standard, -/obj/machinery/cell_charger, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, -/obj/structure/closet/walllocker/medical/north, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"Si" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/cell/device/weapon{ - pixel_x = -5; - pixel_y = 2 - }, -/obj/item/weapon/cell/device/weapon, -/obj/item/clothing/accessory/holster/waist, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/armory) -"Sj" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Sk" = ( -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/restrooms) -"Sn" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/crew_quarters/meditation) -"So" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"Sr" = ( +"Nt" = ( +/obj/machinery/light/small, /obj/structure/railing/grey{ - dir = 4 - }, -/obj/structure/table/steel, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/obj/item/weapon/paper/talon_shields, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"Ss" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"St" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/computer/shuttle_control/explore/talonboat{ - dir = 4; - name = "boat remote control console" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"Su" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/light/small, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Sv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/closet/walllocker_double/hydrant/south, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Sx" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ dir = 1 }, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "talon_brig1"; - name = "Cell Shutters"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/plating, -/area/talon_v2/brig) -"Sz" = ( -/obj/machinery/cryopod/talon{ - dir = 4 - }, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"SE" = ( -/obj/machinery/light/small, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 2; - pixel_y = -28 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"SG" = ( -/obj/machinery/button/remote/blast_door{ - id = "talon_cargo_star"; - name = "Cargo Loading Hatches"; - pixel_y = -28 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/door/window/brigdoor/northright{ - req_access = list(); - req_one_access = list(301) - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"SL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"SN" = ( -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 2; - pixel_y = -28 - }, -/obj/structure/bed/pod, -/obj/item/weapon/bedsheet/medical, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/med_room) -"SQ" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"ST" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/structure/handrail{ - dir = 8 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"SU" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) -"SW" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"SX" = ( -/obj/structure/closet/walllocker/emerglocker/west, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/armory) -"SY" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Ta" = ( -/obj/machinery/vending/blood{ - req_access = list(301); - req_log_access = 301 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Tb" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"Td" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway/star) -"Te" = ( -/obj/effect/shuttle_landmark/premade/talon_v2_wing_port, -/turf/space, -/area/space) -"Tf" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/catwalk, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, /turf/simulated/floor/plating, /area/talon_v2/engineering/starboard) -"Tg" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering/star_store) -"Ti" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/secure_storage) -"Tl" = ( +"Nu" = ( /obj/machinery/light/small{ dir = 4 }, @@ -13589,17 +12374,636 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/maintenance/aft_port) -"To" = ( -/obj/machinery/light{ +"Nv" = ( +/obj/structure/handrail{ dir = 1 }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 4 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker_double/survival/south, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"Nw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/workroom) +"Nz" = ( +/obj/structure/closet/walllocker_double/south, +/obj/structure/handrail{ + dir = 1 + }, +/obj/item/weapon/storage/toolbox/emergency, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"NB" = ( +/obj/structure/closet/walllocker_double/south, +/obj/machinery/light, +/obj/item/weapon/extinguisher, +/obj/item/stack/cable_coil/green, +/obj/item/stack/cable_coil/green, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/machinery/atmospherics/unary/vent_pump/high_volume, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"NC" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/sec_room) +"NE" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/directions/security/armory{ + dir = 10; + pixel_x = -32; + pixel_y = -6 + }, +/obj/structure/sign/directions/security{ + dir = 1; + pixel_x = -32; + pixel_y = 6 + }, +/obj/structure/sign/directions/security/brig{ + dir = 1; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"NF" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/engi{ + name = "Port Eng. Storage"; + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"NG" = ( +/obj/structure/closet/walllocker_double/south, +/obj/structure/handrail{ + dir = 1 + }, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"NH" = ( +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"NI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonpod) +"NK" = ( +/obj/structure/handrail{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 8 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/structure/closet/walllocker_double/survival/south, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"NO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc/talon{ + name = "south bump"; + pixel_y = -24 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"NR" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"NS" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"NT" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"NU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"NW" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor/glass/talon, +/turf/simulated/floor/plating, +/area/talon_v2/secure_storage) +"NZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Ob" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "talontrash" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Oc" = ( +/obj/structure/catwalk, +/obj/structure/barricade, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"Od" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/directions/engineering{ + pixel_x = 32; + pixel_y = -6 + }, +/obj/structure/sign/directions/cargo{ + dir = 4; + pixel_x = 32 + }, +/obj/structure/sign/directions/science/xenoarch{ + dir = 4; + pixel_x = 32; + pixel_y = 6 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Og" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/mining{ + name = "Refinery"; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/refining) +"Oi" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/clothing/accessory/holster/waist, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"Oj" = ( +/turf/simulated/wall/shull, +/area/talon_v2/armory) +"Ok" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/network/talon, /obj/machinery/atm{ pixel_y = 31 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"Tq" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"Ol" = ( +/turf/simulated/wall/shull{ + can_open = 1 + }, +/area/talon_v2/engineering/star_store) +"On" = ( /obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"Oo" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"Op" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"Ot" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/railing/grey, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"Ov" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/engineering/starboard) +"Oy" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Oz" = ( +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"OB" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"OD" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, +/obj/structure/sign/directions/medical{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/crew_quarters/restrooms) +"OE" = ( +/obj/machinery/door/window/brigdoor/eastright{ + req_access = list(); + req_one_access = list(301) + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"OF" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"OH" = ( +/obj/machinery/atmospherics/portables_connector/aux{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_port) +"OJ" = ( +/obj/machinery/atmospherics/pipe/simple/visible/blue{ + dir = 6 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"OK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) +"OL" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"OM" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock{ + id_tag = "talon_charger"; + name = "Cyborg Recharging Station" + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/restrooms) +"ON" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_port) +"OP" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) +"OQ" = ( +/turf/simulated/wall/shull, +/area/talon_v2/gen_store) +"OR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"OS" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"OT" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"OW" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"OX" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/structure/table/woodentable, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"OY" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"OZ" = ( +/obj/structure/handrail, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Pb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/light/small, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"Pd" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Pe" = ( +/obj/machinery/camera/network/talon{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"Pf" = ( +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = -26 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"Pg" = ( +/obj/machinery/power/apc/talon/hyper{ + dir = 1; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/shuttle_landmark/shuttle_initializer/talonpod, +/obj/effect/overmap/visitable/ship/landable/talon_pod, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonpod) +"Ph" = ( +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"Pi" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/engineering{ + name = "Talon Port Engines"; + req_one_access = list(301) + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"Pj" = ( +/obj/structure/sink{ + pixel_y = 22 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/machinery/button/remote/airlock{ + dir = 1; + id = "talon_charger"; + name = "Door Bolts"; + pixel_y = -28; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/restrooms) +"Pk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/catwalk, +/obj/machinery/power/apc/talon/hyper{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) +"Pl" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"Pm" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -13610,68 +13014,378 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, -/obj/machinery/door/airlock{ - name = "Observation Room" +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Po" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"Pq" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"Pr" = ( +/obj/structure/bookcase/manuals/research_and_development, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Ps" = ( +/obj/structure/sink{ + pixel_y = 22 + }, +/obj/structure/medical_stand/anesthetic, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Pt" = ( +/obj/structure/bookcase/manuals/xenoarchaeology, +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Pv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 5 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_starboard) +"Px" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"Py" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"PA" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/meditation) -"Tr" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/area/talon_v2/refining) +"PB" = ( +/obj/structure/table/rack/shelf/steel, +/obj/machinery/recharger/wallcharger{ + pixel_x = 5; + pixel_y = 24 }, +/obj/item/weapon/storage/backpack/dufflebag/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"PC" = ( +/obj/structure/table/rack/shelf/steel, +/obj/machinery/recharger/wallcharger{ + pixel_x = 5; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"PD" = ( +/obj/structure/extinguisher_cabinet{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/power/smes/buildable/offmap_spawn{ + RCon_tag = "Talon Port SMES" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"PF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/obj/structure/sign/directions/security{ - dir = 8; - pixel_x = -32; - pixel_y = 3 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/sign/directions/security/brig{ - dir = 8; - pixel_x = -32; - pixel_y = -3 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/department/eng{ + pixel_y = -32 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) -"Tt" = ( +"PH" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"PI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, /turf/simulated/wall/rshull, /area/shuttle/talonboat) -"Tw" = ( -/obj/machinery/atmospherics/binary/pump/fuel, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"Tz" = ( +"PK" = ( +/obj/machinery/conveyor{ + dir = 8; + id = "talonrefinery" + }, +/obj/structure/sign/warning/moving_parts{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"PL" = ( /obj/structure/hull_corner/long_horiz{ + dir = 6 + }, +/turf/space, +/area/space) +"PO" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock{ + name = "Storage Room" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/gen_store) +"PP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/holoposter{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"PR" = ( +/obj/effect/floor_decal/emblem/talon_big{ dir = 10 }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"PT" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, /turf/simulated/floor/reinforced/airless, /area/space) -"TA" = ( +"PX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/anomaly_storage) +"Qa" = ( /turf/simulated/wall/shull, -/area/talon_v2/maintenance/wing_port) -"TB" = ( -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/segment{ +/area/talon_v2/engineering) +"Qb" = ( +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"Qc" = ( +/obj/structure/table/steel, +/obj/item/device/measuring_tape, +/obj/item/weapon/tool/wrench, +/obj/item/weapon/storage/excavation, +/obj/item/stack/flag/yellow, +/obj/item/weapon/pickaxe, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"Qe" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/shull, +/area/talon_v2/ofd_ops) +"Qf" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 1 + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Qi" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/ofd_ops) +"Qj" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, -/area/talon_v2/central_hallway/port) -"TD" = ( -/obj/structure/bed/chair/bay/chair, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/area/talon_v2/maintenance/fore_port) +"Qk" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Qm" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"Qn" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"Qo" = ( +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/structure/sign/warning/airlock{ + pixel_y = 32 + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + pixel_y = -28; + req_one_access = list(301) + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/fore_port) +"Qq" = ( +/obj/structure/hull_corner/long_horiz{ dir = 10 }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"TE" = ( +/turf/space, +/area/space) +"Qt" = ( +/obj/machinery/power/apc/talon/hyper{ + pixel_y = -24 + }, +/obj/effect/catwalk_plated/dark, +/obj/structure/closet/walllocker_double/hydrant/west, +/obj/structure/cable/green, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"Qu" = ( +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"Qx" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"Qy" = ( +/turf/simulated/wall/shull, +/area/talon_v2/maintenance/fore_starboard) +"Qz" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/handrail{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"QA" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"QB" = ( /obj/structure/sink{ pixel_y = 22 }, @@ -13688,85 +13402,455 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/restrooms) -"TG" = ( -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, +"QC" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"QD" = ( +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"QE" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/central_hallway/fore) +"QF" = ( +/obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"TJ" = ( -/obj/structure/catwalk, +/area/talon_v2/engineering/atmospherics) +"QH" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_starboard) +"QI" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"QJ" = ( +/obj/machinery/atmospherics/portables_connector/aux{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_starboard) +"QM" = ( +/obj/effect/shuttle_landmark/shuttle_initializer/talonboat, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"TL" = ( -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 }, -/obj/structure/bed/pod, -/obj/item/weapon/bedsheet/blue, -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -32 - }, -/obj/machinery/light, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"TN" = ( -/obj/structure/catwalk, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"TO" = ( -/obj/structure/sign/warning/airlock{ - pixel_x = 32 - }, -/obj/effect/floor_decal/industrial/warning, -/obj/structure/handrail{ +/obj/effect/overmap/visitable/ship/landable/talon_boat, +/obj/structure/handrail, +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/survival/north, /turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"TP" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 28; - pixel_y = -28; +/area/shuttle/talonboat) +"QN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"QO" = ( +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "talon_bridge_shields" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/bridge) +"QP" = ( +/obj/effect/shuttle_landmark/premade/talon_v2_near_aft_port, +/turf/space, +/area/space) +"QR" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"QS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"QU" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/crew_quarters/bar) +"QV" = ( +/obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, -/obj/structure/sign/warning/airlock{ - pixel_y = 32 - }, +/obj/effect/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/fore_port) +"QW" = ( +/obj/machinery/atmospherics/pipe/manifold/visible/red{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Ra" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"Rb" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/engineering{ + name = "Talon Port Engines & Spare Fuel"; + req_one_access = list(301) + }, +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = -26 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"Rd" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/catwalk, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"Re" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/fore_port) +"Rf" = ( +/obj/structure/hull_corner/long_vert{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Rg" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/eng_room) +"Ri" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"Rj" = ( +/obj/machinery/atmospherics/binary/pump/high_power/on{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Rk" = ( +/obj/effect/shuttle_landmark/premade/talon_v2_near_aft_star, +/turf/space, +/area/space) +"Rn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Rp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Rs" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"Rt" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Ru" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Rx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/fore_starboard) -"TR" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/wing_port) -"TT" = ( -/mob/living/simple_mob/animal/passive/dog/corgi/puppy{ - desc = "That's Hendrickson, warden of the Talon's brig. No schemes can escape the watchful gleam of this corgi's deep, dark eyes."; - name = "Hendrickson" +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 }, -/obj/structure/dogbed, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"Ry" = ( +/obj/machinery/mineral/stacking_machine, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"RA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_port) +"RB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/computer/guestpass{ + dir = 4; + pixel_x = -26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"RC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 9 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_port) +"RE" = ( +/obj/structure/table/rack/steel, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"RF" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/flora/pottedplant/small, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"TW" = ( +/area/talon_v2/bridge) +"RG" = ( +/obj/machinery/light/small, +/obj/structure/sign/directions/engineering/engeqp{ + pixel_y = -24 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/eng_room) +"RI" = ( +/obj/machinery/vending/tool{ + req_log_access = 301 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering/star_store) +"RJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/ship_munition/disperser_charge/explosive, +/turf/simulated/floor/reinforced, +/area/talon_v2/ofd_ops) +"RK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/gen_store) +"RO" = ( +/obj/machinery/power/sensor{ + name = "Talon Power Generation"; + name_tag = "TLN-PWR-GEN" + }, +/obj/structure/cable/yellow{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + d2 = 2; + icon_state = "0-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"RP" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/handrail, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"RQ" = ( +/turf/simulated/wall/shull, +/area/talon_v2/medical) +"RT" = ( +/obj/machinery/atmospherics/omni/atmos_filter{ + name = "N2/O2 Filter"; + tag_east = 4; + tag_north = 3; + tag_south = 2; + tag_west = 1 + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"RV" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"RY" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/mine_room) +"RZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Sa" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/gun/energy/gun, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"Sb" = ( +/obj/structure/bed/chair/wood, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"Sd" = ( /obj/structure/cable/green{ d1 = 1; d2 = 4; @@ -13780,880 +13864,378 @@ }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/meditation) -"TX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, +"Sf" = ( /obj/structure/catwalk, -/turf/simulated/floor/plating, +/obj/structure/handrail, +/turf/simulated/floor/reinforced/airless, /area/talon_v2/maintenance/aft_port) -"TZ" = ( -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, -/obj/structure/railing/grey, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Ua" = ( -/obj/machinery/camera/network/talon{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Uf" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 6 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/structure/catwalk, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"Ug" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Uh" = ( -/obj/machinery/atmospherics/pipe/simple/visible/blue{ - dir = 10 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Uj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/bed/chair/bay/chair, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/med_room) -"Uk" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"Um" = ( -/obj/machinery/mineral/mint, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"Un" = ( -/obj/machinery/atmospherics/pipe/simple/visible{ - dir = 5 - }, +"Sg" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/fore_starboard) +"Si" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Uo" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/catwalk, -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_starboard) -"Up" = ( -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/wing_starboard) -"Ur" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/pilot_room) -"Us" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 1; - id_tag = "talon_starboard"; - pixel_y = -30; +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"Sj" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/medical{ req_one_access = list(301) }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning{ +/turf/simulated/floor/plating, +/area/talon_v2/medical) +"Sk" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/restrooms) +"Sn" = ( +/obj/structure/bookcase/manuals/engineering, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"So" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"Uu" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holoposter{ + dir = 1; + pixel_y = 32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Uw" = ( -/obj/structure/bed/chair/bay/chair, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 +/area/talon_v2/central_hallway/port) +"Sr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"Ux" = ( -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "talon_boat"; - pixel_y = 24 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/department/shield{ + pixel_y = -31 }, -/obj/structure/handrail, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/shuttle/talonboat) -"Uz" = ( -/obj/structure/catwalk, -/obj/structure/handrail{ - dir = 8 - }, -/turf/simulated/floor/reinforced/airless, -/area/talon_v2/maintenance/fore_port) -"UA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_starboard) -"UB" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"UC" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/toilet, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/restrooms) -"UF" = ( -/obj/structure/bookcase/manuals/medical, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"UG" = ( -/obj/machinery/camera/network/talon{ - dir = 8 - }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway) -"UI" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, +"Ss" = ( /obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"UJ" = ( -/obj/structure/railing/grey{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"UK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"St" = ( +/obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/light/small, +/obj/item/weapon/paper/talon_pilot, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"Su" = ( +/obj/machinery/atmospherics/pipe/simple/visible{ + dir = 9 + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"UL" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"UN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/area/talon_v2/engineering/atmospherics) +"Sv" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/wall/rshull, +/area/shuttle/talonboat) +"Sx" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Sy" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/engineering/starboard) +"Sz" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/visible/yellow, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"UR" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 10 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"UW" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"UX" = ( -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, /turf/simulated/floor/wood, /area/talon_v2/crew_quarters/sec_room) -"Va" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +"SC" = ( +/obj/machinery/button/remote/blast_door{ + id = "talon_cargo_port"; + name = "Cargo Loading Hatches"; + pixel_y = -28 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"Vc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/bridge) -"Vf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/computer/guestpass{ - dir = 4; - pixel_x = -26 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Vg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, -/obj/machinery/light/small{ +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"Vh" = ( -/obj/structure/hull_corner{ - dir = 1 - }, -/turf/space, -/area/space) -"Vi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Vj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"Vo" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"Vp" = ( -/obj/structure/table/woodentable, -/obj/item/modular_computer/tablet/preset/custom_loadout/advanced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"Vs" = ( -/obj/machinery/atmospherics/pipe/tank/nitrogen{ - dir = 8 - }, -/obj/structure/railing/grey, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"Vt" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/glass{ - name = "Workroom" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/workroom) -"Vv" = ( -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"Vw" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/alarm/talon{ - dir = 8; - pixel_x = 22 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/obj/structure/railing/grey, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"Vx" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/security{ - id_tag = "talon_secdoor"; - name = "Guard's Cabin"; +/obj/machinery/door/window/brigdoor/northleft{ + req_access = list(); req_one_access = list(301) }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/crew_quarters/sec_room) -"VD" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/random/multiple/corp_crate/talon_cargo, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/maintenance/wing_port) -"VE" = ( -/obj/item/weapon/storage/box/bodybags, -/obj/item/roller, -/obj/item/roller{ - pixel_y = 8 +"SE" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"VF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/floor_decal/corner/black/diagonal, -/obj/item/weapon/stool/baystool/padded{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/crew_quarters/bar) -"VH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"VI" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/wall/rshull, -/area/talon_v2/bridge) -"VK" = ( -/obj/machinery/atmospherics/omni/mixer{ - name = "Air Mixer"; - tag_north = 2; - tag_south = 1; - tag_south_con = 0.79; - tag_west = 1; - tag_west_con = 0.21 - }, -/obj/effect/catwalk_plated/dark, -/turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"VO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +"SG" = ( +/obj/machinery/light/small{ dir = 4 }, /obj/structure/cable/green{ + d1 = 1; d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/power/apc/talon{ - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 + icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"VQ" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/maintenance/common, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, /area/talon_v2/maintenance/wing_starboard) -"VS" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/refining) -"VT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"VX" = ( -/obj/machinery/alarm/talon{ - dir = 1; - pixel_y = -25 - }, -/obj/structure/reagent_dispensers/foam, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/gen_store) -"VY" = ( -/obj/structure/closet/walllocker/emerglocker/east, +"SJ" = ( /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) -"Wa" = ( -/obj/machinery/atmospherics/portables_connector/aux{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_port) -"Wb" = ( -/obj/machinery/shipsensors{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/shuttle/talonboat) -"Wc" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, /obj/structure/cable/green{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Wd" = ( -/obj/machinery/autolathe, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"Wf" = ( -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) - }, -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/aft_starboard) -"Wj" = ( -/obj/structure/table/standard, -/obj/machinery/chemical_dispenser/biochemistry/full, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Wk" = ( -/obj/structure/table/standard, -/obj/machinery/chemical_dispenser/full, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Wl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/gen_store) -"Wm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/closet/walllocker_double/hydrant/north, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"Wo" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular{ +/obj/machinery/power/apc/talon{ dir = 4; - id = "talon_cargo_star"; - name = "Cargo Loading Hatch" + name = "east bump"; + pixel_x = 24 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_starboard) -"Wp" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/security, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/sec_room) -"Wq" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/door/airlock/command{ - id_tag = "talon_capdoor"; - name = "Captain's Cabin"; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/bridge) -"Wr" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"SK" = ( +/obj/machinery/light/small, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/bed/chair/bay/chair, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"Ws" = ( -/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"SL" = ( +/obj/machinery/door/firedoor/glass/talon, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing/grey, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_starboard) -"Wt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/effect/catwalk_plated, -/obj/structure/disposalpipe/junction, -/obj/structure/sign/directions/engineering{ - pixel_x = 32; - pixel_y = -3 - }, -/obj/structure/sign/directions/engineering/atmospherics{ - dir = 8; - pixel_x = 32; - pixel_y = 3 +/obj/machinery/door/airlock{ + id_tag = "talon_pilotdoor"; + name = "Pilot's Cabin"; + req_one_access = list(301) }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/crew_quarters/pilot_room) +"SN" = ( +/obj/machinery/firealarm{ + dir = 4; + pixel_x = 26 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) +"SQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/department/armory{ + name = "GUARD'S QUARTERS"; + pixel_x = -32 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/fore) +"SS" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"ST" = ( /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating, -/area/talon_v2/central_hallway) -"Wu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Wy" = ( -/obj/machinery/cryopod/talon, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"Wz" = ( -/obj/machinery/button/remote/airlock{ - dir = 8; - id = "talon_engdoor"; - name = "Door Bolts"; - pixel_x = -28; - specialfunctions = 4 - }, -/obj/item/weapon/bedsheet/orange, -/obj/structure/bed/pod, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/carpet, -/area/talon_v2/crew_quarters/eng_room) -"WB" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/closet/walllocker_double/hydrant/north, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/star) -"WC" = ( -/obj/structure/hull_corner/long_vert{ - dir = 9 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"WF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ +/area/talon_v2/maintenance/wing_starboard) +"SU" = ( +/obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"WJ" = ( -/turf/simulated/wall/shull, -/area/talon_v2/crew_quarters/eng_room) -"WK" = ( -/obj/structure/table/woodentable, -/obj/item/clothing/accessory/talon{ - pixel_x = 4; - pixel_y = 7 - }, -/obj/item/clothing/head/caphat/talon{ - pixel_x = -5 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"WM" = ( -/obj/machinery/atmospherics/unary/engine/bigger{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/space, -/area/talon_v2/engineering/starboard) -"WN" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/blue{ - dir = 8 - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"WQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/machinery/camera/network/talon{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"WS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/alarm/talon{ - pixel_y = 28 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"WT" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway/fore) -"WU" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/star_store) -"WY" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"WZ" = ( -/turf/simulated/wall/shull, -/area/talon_v2/maintenance/aft_port) -"Xa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/catwalk, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) -"Xb" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"SV" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/power/sensor{ + name = "Talon Main Grid"; + name_tag = "TLN-MAIN-GRID" + }, /obj/structure/cable/green{ - d1 = 4; d2 = 8; - icon_state = "4-8" + icon_state = "0-8" }, -/turf/simulated/wall/rshull, -/area/talon_v2/maintenance/wing_starboard) -"Xf" = ( -/obj/machinery/telecomms/allinone/talon{ - id = "talon_aio"; - network = "Talon" +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, +/obj/structure/cable/green, +/obj/effect/catwalk_plated/dark, +/obj/structure/sign/department/eng{ + name = "ENGINEER'S QUARTERS"; + pixel_x = 32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"SW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"SX" = ( +/obj/structure/hull_corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/talonboat) +"SY" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/talonboat) +"SZ" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/engineering/port) +"Ta" = ( +/obj/structure/hull_corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/shuttle/talonboat) +"Tb" = ( +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"Td" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/workroom) +"Tf" = ( /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/engineering) -"Xh" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Tg" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"Ti" = ( +/obj/structure/table/standard, +/obj/item/weapon/storage/box/handcuffs, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"Tk" = ( /obj/machinery/door/firedoor/glass/talon, /obj/machinery/door/airlock/maintenance/engi{ name = "Starboard Eng. Storage"; @@ -14666,56 +14248,72 @@ }, /turf/simulated/floor/plating, /area/talon_v2/engineering/star_store) -"Xi" = ( +"Tl" = ( +/turf/simulated/wall/shull{ + can_open = 1 + }, +/area/talon_v2/engineering/atmospherics) +"Tm" = ( +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/aft_starboard) +"To" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/ofd_ops) +"Tq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_port) -"Xj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"Xl" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/camera/network/talon{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Xm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"Xn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/area/talon_v2/gen_store) +"Tr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ +/obj/structure/bed/chair/bay/chair, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/sec_room) +"Ts" = ( +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = 26 + }, +/obj/structure/table/rack/shelf/steel, +/obj/random/maintenance/engineering, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Tt" = ( +/turf/simulated/wall/rshull, +/area/shuttle/talonboat) +"Tw" = ( +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"Tz" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/sign/directions/bar{ - dir = 1; - pixel_x = 32; - pixel_y = -3 +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"TA" = ( +/turf/simulated/wall/shull, +/area/talon_v2/maintenance/wing_port) +"TB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/structure/sign/directions/bridge{ - dir = 1; - pixel_x = 32; - pixel_y = 3 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /obj/structure/cable/green{ d1 = 1; @@ -14723,30 +14321,590 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"Xo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 +/area/talon_v2/secure_storage) +"TD" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/handrail{ +/obj/structure/sign/department/biblio{ + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/port) +"TE" = ( +/obj/structure/railing/grey{ dir = 1 }, -/obj/machinery/light_switch{ - dir = 1; - pixel_x = 8; - pixel_y = -26 +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/structure/fuel_port/heavy{ +/obj/machinery/smartfridge/sheets/persistent_lossy{ + layer = 3.3 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"TF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"TG" = ( +/obj/machinery/atmospherics/omni/atmos_filter{ + name = "CO2 Filter"; + tag_east = 2; + tag_north = 1; + tag_south = 5 + }, +/obj/effect/catwalk_plated/dark, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"TH" = ( +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/mine_room) +"TJ" = ( +/obj/machinery/mineral/stacking_unit_console{ + pixel_y = -6; + req_one_access = list(301) + }, +/obj/structure/girder, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"TL" = ( +/obj/machinery/suit_cycler/vintage/tpilot, +/obj/machinery/button/remote/airlock{ + id = "talon_minerdoor"; + name = "Door Bolts"; + pixel_y = 28; + specialfunctions = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/pilot_room) +"TN" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"TO" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/multiple/corp_crate/talon_cargo, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"TP" = ( +/obj/structure/bed/chair/bay/shuttle, +/obj/structure/closet/walllocker_double/survival/north, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonpod) +"TR" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"TW" = ( +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/catwalk_plated, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/port) +"TX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"TY" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/item/modular_computer/console/preset/talon{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/engineering) +"TZ" = ( +/obj/machinery/conveyor{ dir = 1; - pixel_y = -28 + id = "talonrefinery" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"Ua" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"Uc" = ( +/obj/machinery/atmospherics/pipe/simple/visible/red, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Ud" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/obj/structure/panic_button{ + pixel_x = -32; + pixel_y = 32 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) -"Xp" = ( +"Ue" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Uf" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"Ug" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"Uh" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"Uj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/maintenance/common, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"Uk" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) +"Um" = ( +/obj/machinery/camera/network/talon{ + dir = 4 + }, +/obj/machinery/mineral/mint, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"Un" = ( +/obj/machinery/atmospherics/pipe/tank/oxygen{ + dir = 4 + }, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) -"Xq" = ( +"Uo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/anomaly_storage) +"Up" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Ur" = ( +/obj/structure/sign/department/bridge{ + name = "PILOT'S QUARTERS"; + pixel_y = -32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"Us" = ( +/obj/structure/hull_corner/long_horiz{ + dir = 10 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Ut" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/crew_quarters/cap_room) +"Uu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Uv" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"Uw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/department/telecoms{ + pixel_y = -31 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Ux" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/closet/autolok_wall{ + pixel_y = 32 + }, +/obj/structure/bed/chair/bay/shuttle, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"UA" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"UB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"UC" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"UD" = ( +/obj/machinery/atmospherics/binary/pump/high_power/on, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"UF" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"UG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 4 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/wing_starboard) +"UJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/bridge) +"UK" = ( +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"UL" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/central_hallway/fore) +"UM" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"UN" = ( +/obj/structure/hull_corner/long_vert{ + dir = 9 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"UQ" = ( +/obj/structure/sign/warning/airlock{ + pixel_x = -31 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"UR" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/crew_quarters/meditation) +"US" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"UW" = ( +/obj/effect/floor_decal/industrial/warning/dust, +/turf/simulated/floor/reinforced/airless, +/area/space) +"UX" = ( +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Va" = ( +/obj/structure/bed/chair/bay/chair, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Vc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/bridge) +"Vf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Vg" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/port) +"Vh" = ( +/obj/machinery/disposal/wall{ + dir = 4 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/sign/painting/public{ + pixel_x = -30 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Vi" = ( +/obj/structure/bed/chair/bay/chair, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Vj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"Vl" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/camera/network/talon{ + dir = 1 + }, +/obj/structure/vehiclecage/quadbike, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"Vp" = ( +/turf/simulated/floor/carpet/blucarpet, +/area/talon_v2/crew_quarters/cap_room) +"Vr" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"Vs" = ( +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/obj/structure/flora/pottedplant, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Vt" = ( +/obj/structure/sign/periodic{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/workroom) +"Vu" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ dir = 4 }, @@ -14755,84 +14913,747 @@ }, /turf/simulated/floor/reinforced/airless, /area/space) -"Xy" = ( +"Vv" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/accessory/holster/machete, +/obj/item/weapon/material/knife/machete, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/armory) +"Vw" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_port) +"Vx" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/conveyor_switch/oneway{ + id = "talonrefinery"; + name = "Conveyor Control"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/refining) +"Vy" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Vz" = ( +/obj/structure/catwalk, +/obj/structure/handrail, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/aft_starboard) +"VD" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/cap_room) -"XB" = ( -/obj/machinery/light_switch{ +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"VE" = ( +/obj/structure/closet/emergsuit_wall{ dir = 4; - pixel_x = -26; - pixel_y = 24 + pixel_x = 32 }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"XC" = ( -/obj/machinery/atmospherics/portables_connector/aux{ +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"VH" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"VJ" = ( +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/visible/yellow{ + dir = 1 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"VK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/hydrant/west, +/obj/machinery/light/small{ dir = 8 }, -/obj/effect/floor_decal/industrial/outline, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_starboard) -"XD" = ( -/obj/structure/table/standard, -/obj/fiftyspawner/glass, /turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"XE" = ( +/area/talon_v2/anomaly_storage) +"VL" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/closet/walllocker/medical/south, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2, +/obj/structure/catwalk, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"VM" = ( +/obj/machinery/atmospherics/pipe/tank/nitrogen{ + dir = 8 + }, +/obj/structure/railing/grey, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"VN" = ( +/obj/structure/hull_corner/long_vert{ + dir = 5 + }, +/turf/space, +/area/space) +"VO" = ( +/obj/structure/anomaly_container, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/anomaly_storage) +"VQ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/anomaly_storage) +"VS" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/refining) +"VT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/wall/shull, +/area/talon_v2/ofd_ops) +"VX" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"VY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/brig) +"VZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"Wa" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/machinery/airlock_sensor{ + pixel_y = 28; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"Wb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Wc" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"Wd" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Wf" = ( +/obj/structure/catwalk, +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"Wj" = ( +/obj/structure/closet/secure_closet/chemical{ + req_access = list(301) + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + desc = "Someone has crossed out the 'Space' from Space Cleaner and written in Chemistry. Scrawled on the back is, 'Okay, whoever filled this with polytrinic acid, it was only funny the first time. It was hard enough replacing the CMO's first cat!'"; + name = "Chemistry Cleaner" + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Wk" = ( +/obj/structure/sink{ + pixel_y = 22 + }, +/obj/structure/mirror{ + pixel_y = 32 + }, +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "talon_restroom2"; + name = "Door Bolts"; + pixel_x = -28; + specialfunctions = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/talon_v2/crew_quarters/restrooms) +"Wl" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Wm" = ( +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/secure_storage) +"Wo" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Wp" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/wing_port) +"Wq" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Wr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"Wt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"Wu" = ( +/turf/simulated/wall/shull{ + can_open = 1 + }, +/area/talon_v2/crew_quarters/restrooms) +"Wx" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 4; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Wy" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/med_room) +"Wz" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_y = 24 + }, +/obj/structure/disposalpipe/junction{ + dir = 8; + icon_state = "pipe-j2" + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"WB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"WC" = ( +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor{ + pixel_y = 24; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"WF" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"WI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"WJ" = ( +/turf/simulated/wall/shull, +/area/talon_v2/crew_quarters/eng_room) +"WK" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/regular/open{ + id = "talon_windows" + }, +/obj/machinery/door/firedoor/glass/talon, +/turf/simulated/floor/plating, +/area/talon_v2/crew_quarters/cap_room) +"WL" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/bridge) +"WM" = ( +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = -26 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"WN" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass{ + name = "Hangar Bay"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/hangar) +"WQ" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/structure/closet/walllocker_double/survival/south, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonpod) +"WS" = ( +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -26 + }, +/obj/structure/table/woodentable, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "talon_quietroom"; + name = "window blast shields"; + pixel_x = -28 + }, +/obj/machinery/recharger, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"WT" = ( +/obj/machinery/vending/nifsoft_shop, +/obj/machinery/item_bank{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/central_hallway/fore) +"WU" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"WV" = ( +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/reinforced/airless, +/area/talon_v2/maintenance/aft_port) +"WY" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/powered/pump/filled, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"WZ" = ( +/obj/structure/closet/walllocker/emerglocker/west, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) +"Xa" = ( +/obj/machinery/alarm/talon{ + dir = 8; + pixel_x = 22 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_port) +"Xb" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Xe" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/regular/open{ + dir = 2; + id = "talon_bridge_shields" + }, +/turf/simulated/floor/plating, +/area/talon_v2/bridge) +"Xf" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/hangar) +"Xh" = ( +/obj/structure/closet/secure_closet/talon_engineer, /obj/item/device/radio/off{ channels = list("Talon" = 1) }, +/obj/item/weapon/storage/box/nifsofts_engineering, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/eng_room) +"Xi" = ( +/obj/structure/table/woodentable, +/obj/item/device/paicard, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"Xl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/talon_v2/medical) +"Xm" = ( +/obj/machinery/light/small, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"Xn" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/fore) +"Xo" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/obj/machinery/light, +/obj/machinery/light_switch{ + dir = 1; + pixel_x = 8; + pixel_y = -26 + }, +/obj/machinery/firealarm{ + dir = 1; + pixel_x = -6; + pixel_y = -24 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"Xp" = ( +/obj/machinery/atmospherics/portables_connector, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"Xq" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/wing_starboard) +"Xr" = ( +/turf/space, +/area/talon_v2/engineering/port) +"Xw" = ( +/obj/structure/catwalk, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/aft_starboard) +"Xy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"XA" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"XB" = ( +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"XC" = ( +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, +/obj/machinery/airlock_sensor{ + pixel_y = 28; + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/structure/handrail, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_starboard) +"XD" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"XE" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/central_hallway/fore) "XG" = ( -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/secure_storage) +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) "XH" = ( /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) "XJ" = ( -/obj/structure/anomaly_container, +/obj/structure/sign/directions/science/xenoarch{ + pixel_y = -32 + }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/anomaly_storage) +/area/talon_v2/central_hallway/star) "XK" = ( -/obj/effect/map_helper/airlock/door/int_door, -/obj/machinery/door/airlock/glass_external{ - req_one_access = list(301) +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) "XO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/oxygen_pump{ + dir = 1; + pixel_y = -30 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/handrail{ + dir = 1 }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) @@ -14840,26 +15661,258 @@ /turf/simulated/floor/reinforced/airless, /area/space) "XQ" = ( -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) "XR" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/effect/catwalk_plated, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/central_hallway/star) +"XS" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/portable_atmospherics/canister/empty, +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"XT" = ( +/obj/structure/table/woodentable, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "talon_quietroom"; + name = "window blast shields"; + pixel_x = 28 + }, +/obj/structure/closet/walllocker/medical/south, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/meditation) +"XU" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/bar) +"XW" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/closet/walllocker_double/hydrant/east, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/armory) +"XX" = ( +/obj/effect/landmark/start{ + name = "Talon Pilot" + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/pilot_room) +"XY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"XZ" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/random/multiple/corp_crate/talon_cargo, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/maintenance/wing_starboard) +"Ya" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/weapon/storage/firstaid/regular, +/obj/item/weapon/storage/firstaid/o2, +/obj/structure/closet/walllocker/medical/east, +/obj/item/device/radio/off{ + channels = list("Talon" = 1) + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Yb" = ( +/obj/machinery/computer/ship/sensors, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonboat) +"Yc" = ( /turf/simulated/floor/tiled/techfloor, /area/talon_v2/refining) -"XS" = ( -/obj/machinery/door/window/brigdoor/eastleft{ - req_access = list(); +"Ye" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 10 + }, +/obj/machinery/airlock_sensor{ + dir = 4; + pixel_x = -28; + pixel_y = 28; req_one_access = list(301) }, -/obj/effect/floor_decal/industrial/warning{ +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"Yf" = ( +/obj/machinery/door/firedoor/glass/talon, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/talon_v2/hangar) +"Yg" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/atmospherics/pipe/simple/hidden/aux, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/aft_port) +"Yh" = ( +/obj/machinery/suit_cycler/vintage/tcaptain, +/turf/simulated/floor/wood, +/area/talon_v2/crew_quarters/cap_room) +"Yj" = ( +/obj/structure/catwalk, +/obj/structure/closet/walllocker_double/west, +/obj/item/weapon/storage/toolbox/electrical, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/stack/cable_coil/green, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"Yk" = ( +/turf/simulated/floor/reinforced, +/area/talon_v2/ofd_ops) +"Ym" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/bag/ore, +/obj/item/weapon/pickaxe/drill, +/obj/item/stack/marker_beacon/thirty, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"Yo" = ( +/obj/structure/catwalk, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"Yp" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/talon_v2/crew_quarters/mine_room) +"Yq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"Yr" = ( +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"Yt" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"Yu" = ( +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/wing_port) +"Yv" = ( +/mob/living/simple_mob/animal/passive/dog/corgi/puppy{ + desc = "That's Hendrickson, warden of the Talon's brig. No schemes can escape the watchful gleam of this corgi's deep, dark eyes."; + name = "Hendrickson" + }, +/obj/structure/dogbed, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/brig) +"Yw" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 10 + }, +/obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, /turf/simulated/floor/plating, /area/talon_v2/engineering/port) -"XT" = ( +"Yx" = ( +/obj/machinery/mineral/processing_unit_console{ + req_one_access = list(301) + }, +/obj/structure/girder, +/obj/structure/railing/grey{ + dir = 4 + }, +/obj/structure/railing/grey, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"Yy" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, @@ -14871,365 +15924,90 @@ }, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/anomaly_storage) -"XU" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/holoposter{ - dir = 1; - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/bar) -"XW" = ( -/obj/machinery/power/pointdefense{ - id_tag = "talon_pd" - }, -/obj/structure/cable/green{ - d2 = 2; - icon_state = "0-2" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 - }, -/turf/simulated/floor/reinforced/airless, -/area/space) -"XX" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/computer/ship/sensors{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/central_hallway) -"XY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"XZ" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/maintenance/wing_starboard) -"Ya" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, -/obj/random/multiple/corp_crate/talon_cargo, -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"Yb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/effect/catwalk_plated/dark, -/turf/simulated/floor/plating, -/area/shuttle/talonboat) -"Yc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/refining) -"Ye" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/wing_port) -"Yf" = ( -/turf/simulated/floor/tiled/techfloor, -/area/shuttle/talonboat) -"Ym" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/blast/regular{ - dir = 4; - id = "talon_cargo_port"; - name = "Cargo Loading Hatch" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/wing_port) -"Yo" = ( -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 32 - }, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"Yp" = ( -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal/wall{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"Yt" = ( -/obj/machinery/power/apc/talon{ - name = "south bump"; - pixel_y = -24 - }, -/obj/structure/table/standard, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) -"Yu" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/railing/grey, -/obj/random/multiple/corp_crate/talon_cargo, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/maintenance/wing_port) -"Yv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"Yx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/door/firedoor/glass/talon, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/hangar) -"Yy" = ( -/obj/item/modular_computer/console/preset/talon{ - dir = 1 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/workroom) "Yz" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/atmospherics/omni/mixer{ + name = "Air Mixer"; + tag_north = 2; + tag_south = 1; + tag_south_con = 0.79; + tag_west = 1; + tag_west_con = 0.21 }, -/obj/machinery/atmospherics/pipe/manifold/visible{ - dir = 8 - }, -/obj/structure/catwalk, +/obj/effect/catwalk_plated/dark, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "YA" = ( -/obj/structure/bed/chair/bay/comfy/brown{ +/obj/structure/railing/grey{ dir = 1 }, -/obj/structure/panic_button{ - pixel_x = 32; - pixel_y = 32 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/techfloor, /area/talon_v2/bridge) "YB" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/airlock_sensor{ - pixel_y = 28; - req_one_access = list(301) - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_starboard) -"YC" = ( -/obj/machinery/atmospherics/pipe/simple/visible/universal{ - dir = 8; - name = "Air to Distro" - }, -/obj/machinery/camera/network/talon, -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"YD" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/obj/random/medical, -/obj/random/medical, -/obj/random/medical, -/obj/random/medical, -/obj/structure/closet/walllocker_double/medical/west, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"YI" = ( -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 1; - req_access = list(301) - }, -/obj/machinery/door/window/brigdoor/eastleft{ - dir = 2; - req_access = list(301) - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "talon_brig2"; - name = "Cell Shutters"; - opacity = 0 - }, -/obj/machinery/door/firedoor/glass/talon, -/obj/machinery/light/small{ +/obj/structure/bed/chair/bay/shuttle{ dir = 4 }, +/obj/structure/closet/walllocker_double/survival/north, +/turf/simulated/floor/tiled/techfloor, +/area/shuttle/talonpod) +"YC" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway) +"YD" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"YG" = ( +/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"YH" = ( +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"YI" = ( +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, /turf/simulated/floor/tiled/techmaint, /area/talon_v2/brig) "YJ" = ( /obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" - }, -/obj/machinery/power/apc/talon{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/meditation) -"YL" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/eng_room) -"YN" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/anomaly_storage) -"YP" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/bluedouble, -/turf/simulated/floor/carpet/blucarpet, -/area/talon_v2/crew_quarters/cap_room) -"YQ" = ( -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/structure/closet/walllocker_double/medical/east, -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"YR" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway) -"YS" = ( -/turf/simulated/floor/tiled/white, -/area/talon_v2/medical) -"YT" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/alarm/talon{ - dir = 4; - pixel_x = -22 - }, -/obj/structure/closet/walllocker_double/east, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/obj/random/maintenance/engineering, -/turf/simulated/floor/plating, -/area/talon_v2/engineering) -"YW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/starboard) -"YX" = ( +/area/talon_v2/central_hallway/port) +"YL" = ( +/obj/structure/railing/grey, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/refining) +"YN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -15238,158 +16016,237 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/techmaint, +/area/talon_v2/central_hallway/star) +"YO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light/small, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port) +"YP" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"YQ" = ( +/obj/machinery/alarm/talon{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"YR" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/suspension_gen{ + req_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/anomaly_storage) +"YS" = ( +/obj/structure/flora/pottedplant/tall, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/crew_quarters/restrooms) +"YT" = ( +/obj/machinery/disposal/deliveryChute{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/plating, +/area/talon_v2/engineering) +"YW" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/engineering{ + name = "Talon Starboard Engines & Trash Management"; + req_one_access = list(301) + }, +/obj/structure/sign/warning/nosmoking_1{ + pixel_x = 26 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/starboard) +"YX" = ( +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc/talon{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/table/rack/steel, +/turf/simulated/floor/tiled/techfloor, /area/talon_v2/secure_storage) "YY" = ( -/obj/structure/reagent_dispensers/watertank, +/obj/machinery/autolathe, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/workroom) "YZ" = ( -/obj/machinery/power/apc/talon{ - dir = 4; - name = "east bump"; - pixel_x = 24 +/obj/machinery/atmospherics/portables_connector/aux, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/air, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_starboard) +"Zb" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table/steel, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" +/obj/fiftyspawner/uranium, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/turf/simulated/floor/wood, -/area/talon_v2/crew_quarters/med_room) +/turf/simulated/floor/plating, +/area/talon_v2/engineering/generators) "Zc" = ( /turf/simulated/wall/shull, /area/talon_v2/engineering/atmospherics) "Zd" = ( -/obj/effect/floor_decal/emblem/talon_big{ - dir = 10 - }, -/turf/simulated/floor/tiled/techfloor, +/obj/machinery/door/firedoor/glass/talon, +/obj/machinery/door/airlock/glass, +/turf/simulated/floor/tiled/techmaint, /area/talon_v2/central_hallway/fore) "Ze" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/railing/grey{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /obj/random/multiple/corp_crate/talon_cargo, /turf/simulated/floor/tiled/techfloor, /area/talon_v2/maintenance/wing_port) "Zf" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/flora/pottedplant/orientaltree, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/corner/black/diagonal, +/obj/item/weapon/stool/baystool/padded{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, /area/talon_v2/crew_quarters/bar) "Zg" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/light/small{ + dir = 8 }, -/obj/structure/catwalk, -/obj/machinery/alarm/talon{ +/obj/structure/closet/emergsuit_wall{ dir = 8; - pixel_x = 22 + pixel_x = -32 }, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/aft_port) +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_starboard) "Zh" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/hangar) "Zi" = ( -/turf/space, +/obj/machinery/atmospherics/pipe/simple/visible/yellow{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/talon_v2/engineering/starboard) "Zk" = ( /turf/simulated/wall/rshull, /area/talon_v2/engineering/port) -"Zm" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass/talon, +"Zl" = ( +/obj/structure/barricade, /turf/simulated/floor/plating, -/area/talon_v2/armory) +/area/talon_v2/engineering/port_store) +"Zm" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/head/helmet/space/void/refurb/talon, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) "Zn" = ( -/obj/structure/table/rack/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, /turf/simulated/floor/plating, /area/talon_v2/engineering/port_store) "Zo" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/pointdefense_control{ + id_tag = "talon_pd" }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/engineering) "Zp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Zr" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet{ - dir = 1; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"Zv" = ( /obj/structure/cable/green{ d1 = 1; d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/fore) -"Zx" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/canister/empty/phoron, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port_store) -"Zy" = ( +/area/talon_v2/maintenance/wing_starboard) +"Zr" = ( +/obj/machinery/door/airlock/glass_external{ + frequency = 1420; + id_tag = "tal_shuttle_sb"; + req_one_access = list(301) + }, +/obj/machinery/door/blast/regular/open{ + id = "talon_boat_east" + }, +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "talon_boat_east"; + pixel_y = -28; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"Zv" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/wall/rshull, +/area/talon_v2/maintenance/wing_starboard) +"Zw" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/firedoor/glass/talon, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -15399,141 +16256,159 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/brig) -"Zz" = ( -/obj/machinery/light/small, -/obj/structure/bed/chair/bay/shuttle{ +/obj/machinery/door/airlock/engineering{ + id_tag = "talon_engdoor"; + name = "Engineer's Cabin"; + req_one_access = list(301) + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/crew_quarters/eng_room) +"Zx" = ( +/obj/machinery/light/small{ dir = 1 }, -/obj/machinery/power/apc/talon/hyper{ - pixel_y = -24 +/obj/structure/table/rack/shelf/steel, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/port_store) +"Zz" = ( +/obj/structure/table/steel, +/obj/structure/closet/autolok_wall{ + dir = 1; + pixel_y = -32 }, -/obj/structure/cable/green{ - d2 = 8; - icon_state = "0-8" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/shuttle/talonboat) "ZA" = ( -/obj/machinery/light/small{ - dir = 4 - }, +/obj/machinery/mineral/input, /obj/machinery/conveyor{ - dir = 1; + dir = 4; id = "talonrefinery" }, -/obj/machinery/mineral/output, /turf/simulated/floor/tiled/techfloor/grid, /area/talon_v2/refining) "ZB" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/machinery/light/small{ + dir = 1 }, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/talon_v2/engineering/atmospherics) "ZC" = ( -/obj/machinery/door/firedoor/glass/talon, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "talon_bridge_shields" - }, -/obj/machinery/door/blast/regular/open{ - dir = 2; - id = "talon_bridge_shields" - }, -/turf/simulated/floor/plating, +/turf/simulated/wall/rshull, /area/talon_v2/bridge) -"ZE" = ( -/obj/machinery/atmospherics/pipe/simple/visible/yellow{ - dir = 10 - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, -/obj/structure/catwalk, -/obj/machinery/camera/network/talon, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/port) -"ZF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/techmaint, -/area/talon_v2/central_hallway/port) -"ZI" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - dir = 1; - id_tag = "talon_port_fore"; - pixel_y = -30; - req_one_access = list(301) - }, -/obj/structure/handrail{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/corner{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/maintenance/fore_port) -"ZJ" = ( -/obj/effect/floor_decal/industrial/warning/dust, -/turf/simulated/floor/reinforced/airless, -/area/space) -"ZK" = ( +"ZD" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_port) -"ZO" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/hangar) -"ZP" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/light/small{ dir = 8 }, -/obj/structure/railing/grey, /turf/simulated/floor/plating, +/area/talon_v2/engineering/star_store) +"ZE" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"ZF" = ( +/obj/structure/table/rack/shelf/steel, +/obj/item/weapon/tank/jetpack/carbondioxide, +/turf/simulated/floor/tiled/techfloor, +/area/talon_v2/secure_storage) +"ZH" = ( +/obj/machinery/atmospherics/binary/pump/high_power/on{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/turf/simulated/floor/plating, +/area/talon_v2/engineering/atmospherics) +"ZI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/aux{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/ofd_ops) +"ZJ" = ( +/obj/machinery/door/airlock/glass_external{ + req_one_access = list(301) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/maintenance/wing_port) +"ZK" = ( +/obj/machinery/power/pointdefense{ + id_tag = "talon_pd" + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"ZO" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/aux{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/shuttle/talonboat) +"ZP" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/rshull, /area/talon_v2/engineering) "ZQ" = ( +/obj/effect/floor_decal/industrial/warning/dust/corner{ + dir = 1 + }, +/obj/structure/hull_corner/long_vert{ + dir = 5 + }, +/turf/simulated/floor/reinforced/airless, +/area/space) +"ZR" = ( +/obj/machinery/mineral/output, +/obj/machinery/conveyor{ + dir = 8; + id = "talonrefinery" + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/talon_v2/refining) +"ZS" = ( +/obj/structure/handrail{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/talon_v2/maintenance/wing_port) +"ZW" = ( +/obj/structure/catwalk, +/obj/structure/trash_pile, +/turf/simulated/floor/plating, +/area/talon_v2/maintenance/fore_port) +"ZY" = ( /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -15541,46 +16416,19 @@ }, /turf/simulated/wall/rshull, /area/talon_v2/maintenance/fore_starboard) -"ZR" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/machinery/mineral/input, -/turf/simulated/floor/tiled/techfloor/grid, -/area/talon_v2/refining) -"ZS" = ( -/obj/machinery/atmospherics/portables_connector{ +"ZZ" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/portable_atmospherics/powered/scrubber, -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/railing/grey, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) -"ZW" = ( -/obj/machinery/vending/security{ - req_access = list(301); - req_log_access = 301 - }, -/turf/simulated/floor/tiled/techfloor, -/area/talon_v2/brig) -"ZY" = ( -/obj/structure/catwalk, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/door/blast/regular/open{ + dir = 4; + id = "talon_quietroom" }, /turf/simulated/floor/plating, -/area/talon_v2/maintenance/fore_starboard) -"ZZ" = ( -/obj/machinery/atmospherics/binary/pump/on{ - dir = 8; - name = "Air to Distro" - }, -/turf/simulated/floor/plating, -/area/talon_v2/engineering/atmospherics) +/area/talon_v2/crew_quarters/meditation) (1,1,1) = {" aa @@ -18821,11 +19669,11 @@ aa aa aa aa -eH aa aa aa aa +QP aa aa aa @@ -19484,7 +20332,7 @@ aa aa aa aa -Te +aa aa aa aa @@ -19756,24 +20604,24 @@ aa aa aa aa +aa +aa +aa +aa tm tm tm XP XP -Mu -uK -bA XP XP XP XP XP XP -aa -aa -aa -aa +XP +XP +XP aa aa aa @@ -19902,22 +20750,22 @@ aa aa aa aa -XP -ZJ -UW -nl -OT -OT -OT -OT -we -XP -XP -XP aa aa aa aa +XP +XP +XP +XP +XP +XP +XP +XP +XP +EB +XP +XP aa aa aa @@ -20015,7 +20863,11 @@ aa aa aa aa -PK +aa +aa +aa +aa +dP aa aa aa @@ -20045,25 +20897,21 @@ aa aa tm tm -mo -Fg -QI XP XP -Lz -FZ -Br -Dp -yw XP XP -Mu -uK -bA -aa -aa -aa -aa +XP +XP +XP +XP +XP +XP +XP +XP +Pd +hq +TR aa aa aa @@ -20188,25 +21036,25 @@ aa aa aa aa -XP -XP -XP +aa +aa +aa Pd -TR -TR -Lj -Qk +hq TR XP +Qk +Av +Yu jk ZJ -RD -Kl +Yu +XP +Rf +UW +Wl +Fg XP -aa -aa -aa -aa aa aa aa @@ -20332,18 +21180,22 @@ aa aa aa aa -XP -XP -TR +aa +aa +SS bh -mA Jz -TR -TR -TR -TR -gD -gP +Jz +Aw +Dy +EF +Jm +Yu +Yu +Yu +Yu +Wo +ZQ XP XP aa @@ -20405,10 +21257,6 @@ aa aa aa aa -aa -aa -aa -aa "} (35,1,1) = {" aa @@ -20474,21 +21322,25 @@ aa aa aa aa -Pd -TR -TR -Go -Nj -gc +aa +aa +aa +Up +Qk +Yu +Yu +Wa +EJ +Jp TA -Wa -Wa -TR -nk -TR -TR +OH +OH +Yu +Wp +Yu +Yu XP -jk +Rf XP aa aa @@ -20547,10 +21399,6 @@ aa aa aa aa -aa -aa -aa -aa "} (36,1,1) = {" aa @@ -20616,23 +21464,27 @@ aa aa aa aa +aa +aa +aa +aa XP -TR +Yu TA TA -XK -Kt -TA -Du Ph +Jr TA -ir vR +RA +TA +ws +ZS +Yu +Yu +Yu +Yu TR -TR -TR -TR -bA XP aa aa @@ -20689,10 +21541,6 @@ aa aa aa aa -aa -aa -aa -aa "} (37,1,1) = {" aa @@ -20757,24 +21605,28 @@ aa aa aa aa -Ft -TR -TR -kl -ty -Ce -mt +aa +aa +aa +aa +PL +Yu +Yu rm NS Ye -TA +Jt ir +ON +RC +TA +ws CY -ty -vR -mC -gJ -Kl +NS +ZS +UQ +mo +Fg XP XP XP @@ -20831,10 +21683,6 @@ aa aa aa aa -aa -aa -aa -aa "} (38,1,1) = {" aa @@ -20900,27 +21748,31 @@ aa aa aa aa -TR -VD -VD -dZ -uT -cE +aa +aa +aa +aa +Yu +QA +QA +DB +EP +Ju TA TA TA TA -ir -CY -Xi -CE ws -Ym +CY nl OT gu jy -bA +NT +Jz +xs +Gz +TR XP aa aa @@ -20973,10 +21825,6 @@ aa aa aa aa -aa -aa -aa -aa "} (39,1,1) = {" aa @@ -21040,29 +21888,33 @@ aa aa aa aa -Ft -TR -TR -kR +aa +aa +aa +aa PL -CY -vW +Yu +Yu OZ kf -le +CY OB qV EL CE pa Bv -TR -TR +Wq +OT QI +SC +Yu +Yu +Up XP -ZJ -UI -Kl +UW +ZK +Fg XP aa aa @@ -21115,10 +21967,6 @@ aa aa aa aa -aa -aa -aa -aa "} (40,1,1) = {" aa @@ -21183,32 +22031,32 @@ aa aa aa aa -TR -VD -VD -ek +aa +aa +aa +aa Yu -wB -At +QA +QA Px jh Ru -VD -VD -VD +JB +MO +OS +RV +QA +QA +QA CY -om -gJ -Kl -XP -XP +cA mo Fg -QI -aa -aa -aa -aa +XP +XP +Wd +Yr +Up aa aa aa @@ -21323,15 +22171,19 @@ aa aa aa aa -Ft -TR -TR -ri -CY -CY -CY +aa +aa +aa +aa +PL +Yu +Yu BV -uT +CY +CY +CY +EX +EP CY CY CY @@ -21339,13 +22191,9 @@ CY CY CY CY -oq -gJ -Kl -aa -aa -aa -aa +yl +mo +Fg aa aa aa @@ -21466,28 +22314,28 @@ aa aa aa aa -TR -KE -VD -VD -fv +aa +aa +aa +aa +Yu Mc -IE -PV +QA +QA Ze sT DW -VD -CY -CY +JJ +MP +OW FN -TR -TR -QI -aa -aa -aa -aa +QA +CY +CY +Vl +Yu +Yu +Up aa aa aa @@ -21606,29 +22454,29 @@ aa aa aa aa -Ft -TR -TR -kR -CY -CY -ew -CY -qk -uT -CY -CY -ew -CY -CY -VD -TR -TR -Vh aa aa aa aa +PL +Yu +Yu +OZ +CY +CY +AD +CY +Fk +EP +CY +CY +AD +CY +CY +QA +Yu +Yu +ys aa aa aa @@ -21749,11 +22597,11 @@ aa aa aa aa -TR -dP -CI -qP -zn +aa +aa +aa +aa +Yu Di Vw ba @@ -21761,15 +22609,15 @@ lk Ya BC VD -VD +JQ sx -VD -TR +Pl QA -aa -aa -aa -aa +QA +Wx +QA +Yu +kh aa aa aa @@ -21890,27 +22738,27 @@ aa aa aa aa -TR -TR -yJ -OQ -OQ -OQ -OQ -OQ -rg -gH -Nl -Nl -Nl -Nl -Nl -Sn -TR aa aa aa aa +Yu +Yu +xw +OQ +OQ +OQ +OQ +OQ +Ft +Kf +Nl +Nl +Nl +Nl +Nl +UR +Yu aa aa aa @@ -22031,28 +22879,28 @@ aa aa aa aa -OH -ML -ZK -Kf -OQ -tD +aa +aa +aa +aa +pc +xL LL -tD +xB OQ LT kk -Nl -hA +LT +OQ ay zK -bN +Nl Sn Vh -aa -aa -aa -aa +UX +WS +UR +ys aa aa aa @@ -22172,28 +23020,28 @@ aa aa aa aa -Hz -wi -wi -hS +aa +aa +aa +aa +lT +Re +Re +XQ OQ OQ -GF -Dc -lF -OQ GH -jL -Nl -UF +uS +AE +OQ OR xd -fM +Nl xM -aa -aa -aa -aa +RZ +Va +Xb +ZZ aa aa aa @@ -22313,16 +23161,16 @@ aa aa aa aa -Hz -wi -wi -Et -hS -OQ +aa +aa +aa +aa +lT Re -Kr -JG -Wl +Re +ZW +XQ +OQ fp OK RK @@ -22331,11 +23179,11 @@ PO TW QR cZ -xM -aa -aa -aa -aa +Pm +Sd +Vf +Xi +ZZ aa aa aa @@ -22454,30 +23302,30 @@ aa aa aa aa -Hz -wi -wi -hS -hS -hS -Be -Dc -bV -Dc +aa +aa +aa +aa +lT +Re +Re +XQ +XQ +XQ jQ -OQ +uS ul uS -Nl -IU +AI +OQ Rp TD -Bu -xM -aa -aa -aa -aa +Nl +Pr +Sx +Vi +XK +ZZ aa aa aa @@ -22595,32 +23443,32 @@ aa aa aa aa -Hz -wi -wi -Et -hS -hS -cT -OQ -tD -Eb +aa +aa +aa +aa +lT +Re +Re +ZW +XQ +XQ zz -VX OQ +LT qJ mu -Nl -xZ +AJ +OQ YJ Ke -jv -Sn -ql -aa -aa -aa -aa +Nl +Pt +SJ +Vs +XT +UR +bn aa aa aa @@ -22736,36 +23584,36 @@ aa aa aa aa -Hz -wi -wi -hS -hS -hS -hS -JF +aa +aa +aa +aa +lT +Re +Re +XQ +XQ +XQ +XQ +wu OQ OQ OQ OQ OQ OQ -KY -PB +FB +Kn Nl Nl Nl Nl Nl -Sn -tC -tC -tC UR -aa -aa -aa -aa +tC +tC +tC +hz aa aa aa @@ -22877,41 +23725,41 @@ aa aa aa aa -OH -ML -ML -NR -NR -cS +aa +aa +aa +aa +pc +xL xL NR NR Id -NR -KI +vi NR NR -lS +xE +NR Qj -Va -Iv +NR +NR gI Vg -gI -gI -yg +Ko +MU +TX qa TX -tC +TX aR +gh +wf tC -tC -aa uL +tC +tC aa -aa -aa -aa +VN aa aa aa @@ -23018,15 +23866,19 @@ aa aa aa aa -Hz -wi -wi -hS -MT +aa +aa +aa +aa +lT +Re +Re +XQ +Xm db db db -Bs +vU db Dd Dd @@ -23034,29 +23886,25 @@ Dd Dd Dd Dd -VO -ON +FK +Kv Oj Oj Oj Oj Oj Oj -WZ -NB -TX -LA IP +CJ +wf +ib +Oc tC tC tC tC aa -uL -aa -aa -aa -aa +VN aa aa aa @@ -23159,44 +24007,48 @@ aa aa aa aa -Hz -wi -wi -hS -hS +aa +aa +aa +aa +lT +Re +Re +XQ +XQ db db -rC -bq -Kj -db Ti wM -AR -fj +XG +db fd -Dd +xP ZF KC -Oj -tn +AN +Dd nK -gg -SX -RW +Si +Oj +PB WZ Mi go Qu -lV +IP iy Xa LO +xo +yn +vK +DN tC tC tC tC -Fk +ww XP XP XP @@ -23208,7 +24060,7 @@ XP XP XP XP -GC +PT tm tm tm @@ -23245,10 +24097,6 @@ aa aa aa aa -aa -aa -aa -aa "} (55,1,1) = {" aa @@ -23300,45 +24148,49 @@ aa aa aa aa -Hz -wi -wi -hS -hS +aa +aa +aa +aa +lT +Re +Re +XQ +XQ db db -hU -Kj -Kj -Mh -db -AR +th XG -zv XG -IX +vY +db +ZF +Wm +Fc +Wm +AQ Dd -lW -KC +So +Si Oj -Pm -So -me -So -RW +PC +OP +Vv +OP +Qu Zc Zc Zc Zc Zc -Pl +BD Zc -Jr -Xa -Xa -vC +uG +vK +vK +IO tC -aR +uL tC tC tC @@ -23350,7 +24202,7 @@ tC tC tC tC -aR +uL tC tC tC @@ -23387,10 +24239,6 @@ aa aa aa aa -aa -aa -aa -aa "} (56,1,1) = {" aa @@ -23441,72 +24289,76 @@ aa aa aa aa -Hz -wi -wi -hS -hS -db -db -tY +aa +aa +aa +aa +lT +Re +Re +XQ XQ db db +rU +tn +db +db db db -AD -XG -XG -XG dN -Dd Wm -KC -Oj -Pm -So -So -So -RW -Zc -oG -OP -OU -gx -pQ -Zc -Zc -yW -Zc -rw +Wm +Wm +Ba +Dd FO +Si +Oj +PC +OP +OP +OP +Qu +Zc +Ha +ti +zE +yW +pY +Zc +Zc Tl -LX +Zc +oB +it +Nu +bG rW rW rW rW -Qm -rW -rW -rW LX rW -JB +rW +rW +bG +rW +EE rW rW rW rW rW -DY -rW -rW -Zg uf rW -ez +rW hW bC +rW +SK +Ne +ly tm tm aa @@ -23529,10 +24381,6 @@ aa aa aa aa -aa -aa -aa -aa "} (57,1,1) = {" aa @@ -23575,53 +24423,57 @@ aa aa aa aa +XP +XP +XP +XP +XP +XP aa aa aa aa aa -aa -aa -Hz -wi -wi -hS -hS +lT +Re +Re +XQ +XQ db db -QG -Vo -Kj -Sx Ix En -db +XG zv -XG -ln -XG +vp +uW +db Fc -Dd +Wm ES -KC +Wm +Bi +Dd +FZ +Si Oj -Nv -So -RW -So Kx -Zc -oG +OP +Qu OP wS -dR +Zc Ha ti hp -FS +Jv +CR +ft +GE +qg Zc KU -GE +sP KU KU KU @@ -23639,22 +24491,18 @@ KU KU KU KU -KO +yS KU KU KU KU KU KU -cB -tC -tC -tC cw -aa -aa -aa -aa +tC +tC +tC +Sf aa aa aa @@ -23716,68 +24564,72 @@ aa aa aa aa +XP +qG +JL +JL +JL +JL +iB aa aa aa aa -aa -aa -aa -dK -wi -wi -Et -hS -MT -db +uO +Re +Re ZW -TT +XQ Xm -aN +db qm Yv rq -db +tA uF -XG +VY ui -XG +db zB -JX -ul -KC +Wm +yY +Wm Zm -NM -So -JT -So +NW +Rp +Si +Nh EV -Zc +OP yq -dR -dR -BT +OP +HV +Zc ZB Jv -hp +Jv aI pR -KU -FJ +Bz +GE jx se KU Ir Ep pZ -yY +KU Er -rB -XH +KM +iC Cr -XH +rn qu XH +wQ +XH +Zl +XH XH XH XH @@ -23787,12 +24639,12 @@ XH XH XH XH -eX -eY -tC -fn fG fR +tC +vj +hd +wp XP XP aa @@ -23813,10 +24665,6 @@ aa aa aa aa -aa -aa -aa -aa "} (59,1,1) = {" aa @@ -23858,59 +24706,63 @@ aa aa aa aa -aa -aa -Uz +XP +gx +CX zT wP -wi -wi +Cv +JL zq -wi -Om -hS -hS -Et -db -gB -yp -Zy +iF +Re +Re +kX +Re +mI XQ +XQ +ZW +db +qk +rg +sc +tn db db db db -BX -SU -eG -YX YX Cb TB -xt +HA HA lJ -lJ +Gm bz hQ qv -Zc +qv cc fF xx -ZS +Zc nP CC rz -CD +Ln yc -KU +lM rJ -Qv +Rt GV KU qi IC +sk +KU +Af +cL lN lN lN @@ -23925,20 +24777,16 @@ lN lN lN lN -Kv -kJ -CV -sc -eq +Gi eZ fm fq -tC +np iD -aa -aa -aa -aa +Yg +Jy +tC +WV aa aa aa @@ -23998,54 +24846,54 @@ aa aa aa aa -aa XP XP -XP -NV -BB +tc +fX +uY +Qe wi -wi -wd +bd +JL Kk -oU -hS +Re +Re +kR +kZ +lX +XQ NC NC NC NC -qO -jN -vp -Kj sK -Ix -En -db +ri +sh +XG Ey -XG +vp uW -XG +db Az -JX -ul -KC -Zm +Wm +zj +Wm +Bt NW -So +Rp Si -So +Nh sv -Zc +OP Oi -kA +OP Ef -Op -dR -Bk +Zc +BI +Ds md Mo -oz +Jv Rj dL sE @@ -24053,22 +24901,26 @@ dl qC kx TN -TN +zo +NF +KH +jj +jj FG FG FG FG FG -dA -EB -yO -ao Zn -Ep -pZ -pZ -xH +gS +nt +qf +Gu KM +iC +iC +xH +zk xH xH xH @@ -24076,7 +24928,7 @@ tC tC tC tC -Lz +pz XP XP XP @@ -24097,10 +24949,6 @@ aa aa aa aa -aa -aa -aa -aa "} (61,1,1) = {" aa @@ -24137,72 +24985,76 @@ aa aa aa aa -aa XP XP XP -NV -oC -oC -NV -iv +Ut +WK +Mz +Ut +gM +Ht ZI -CX -Io +hM +JL gr -NC -wU -NC +iJ +KB +AH qE -yd +NC cN -ad +NC zH Gs cG YI -Yv -rq -db +rj +sl +tE ED VY -rF -An +ui +db QD -Dd +xZ CP wh -Oj -eS +Bu +Dd Ew eS -tA -ji -Zc +Oj zL -kA +SN +zL +XW Sa -nC +Zc WY Ds qW -aI -KS -KU +QW +Uc +IA TG -XH +jx SE KU Gn -HN +XH eq -yY +KU Zx -rB -Ep -pZ -lf +Ts +np Cr +lf +qu +KM +iC +Oy +wQ xH xH xH @@ -24210,7 +25062,7 @@ xH xH xH xH -up +wT XP XP XP @@ -24239,10 +25091,6 @@ aa aa aa aa -aa -aa -aa -aa "} (62,1,1) = {" aa @@ -24269,7 +25117,6 @@ aa aa aa aa -aa tm tm tm @@ -24280,27 +25127,32 @@ XP XP XP XP -NV -oC -oC -NV +Ut WK -gm +WK +Ut +fg +fx Nq +Yk Ht -IR -CX -Io +qz +hP +JL nz -NC +iL KB AH zQ -UX +NC +mS +nE +nW +GK NC db db -GK +sn db db db @@ -24312,8 +25164,8 @@ Dd Dd Dd Dd -tU -qs +Gq +KE Oj Oj Oj @@ -24321,23 +25173,23 @@ Oj Oj Oj Zc -mk -yF -pE -BO DP DM -CD +EI mX GY -Zk +MF Rt xk +bi +Zk +FC +EY Zk Zk Zk Zk -Sd +Pi Zk Zk Zk @@ -24347,11 +25199,7 @@ xH xH xH aa -Dg -aa -aa -aa -aa +uu aa aa aa @@ -24416,55 +25264,55 @@ aa aa aa aa -aa XP -JO -JP -NV -NV -NV -uO -Pe -wo -jF +WL +QO +Ut +Ut +Ut +eh +Rs +Yh jF +KJ Nq -lg -CX -CX -CX +gN +JL +gX +ik +JL QV -NC -Ge -nu +KB +KB +KB wa -Wp NC +ne Sz Tr mx -yR -QS +NC +qo FX -QS +sq Ga QS Uu -hg QS -Vf +wv +QS xf PP -Dm +QS RB NE nn -nn -nn +KI +Ns Gl -wW XY -IG +XY +XY CA Jw jC @@ -24472,22 +25320,22 @@ pr GW tp Un +su +RT +QF +gL Zk XH -QF -Zk -vi -vi rP -at -Nk +Zk +Py Py ak ki -aa -aa -aa -aa +JR +dB +Mt +eA aa aa aa @@ -24557,35 +25405,39 @@ aa aa aa aa -aa XP XP -sz -Bf -NV +eU +aZ +Ut +cB +dT Rs -fz -Pe -Pe -Pe -Pe -Pe +Rs +Rs +Rs +yi Nq +ec Qi DH Fz VT Qo -NC +iO af -ai +EH QN -nE NC +ng vF pl Hh -nq +NC +qs +UB +hr +tQ pG pG pG @@ -24595,41 +25447,37 @@ pG pG pG pG -UG -YR -lB Iq -Iq -Iq -Iq -ox -Gj -Zc +GC +KO +YC +YC +YC YC Fo pE -AE +Zc zV DR EI Xp dq +wK +xV +UK +ZH Zk Zk Zk Zk -ZE -RV -gO -Pt Hn -Zk +Ms ID Rx -aa -aa -aa -aa +sz +Zk +SZ +Xr aa aa aa @@ -24696,37 +25544,41 @@ aa aa aa aa -aa XP XP -dK -JO -JO -JO -NV -NV +uO +WL +WL +WL +Ut +Ut Fj +dZ Sb -PZ +ek Vp -gt -gt -Is +Vp +px Nq +gO To -tb -tb -tb +hg +il +JL lI -NC -NK -xN +tb +tb +tb lD -eg NC +nk ma -pl +ol bp +NC +qO +UB +sF fV Ks Ks @@ -24738,40 +25590,36 @@ Ks Ks Ks fV -DB -Ia +Hj +KX fV Ks Ks Ks fV -FK +lq Zc -ZZ -Xp -dR -Gh Bn -Gh -kT -Xp +UK +Jv +uH Su -Zk +uH bY UK +kQ Zk -lr EO vh -iS +Zk iR -Py -ID -ki -aa -aa -aa -aa +VJ +UD +zh +NH +dB +SZ +eA aa aa aa @@ -24835,43 +25683,47 @@ aa aa aa aa -aa XP XP XP -JO -dz -VI -JO +WL +Xe +ZC +WL +yt EN -Wq +Rs Pe pb Xy BY -qb +el xb yA -lM -YP +fM Nq +gW DK -tb +uo RJ -tb +JL WT -NC -NC -Vx -NC +tb +kl +tb +le NC NC pn -pl -Hh -rI +NC +NC +NC br UB +hr +WN +uw +vt Nf Nf Nf @@ -24880,19 +25732,15 @@ Nf Nf Nf Nf -As -Ns -Zp -Ns Lr -jb +jO rI jO -Zc +SU Uh WN GQ -VK +Zc vP jG hw @@ -24907,13 +25755,13 @@ WF VH HH vB +lQ +nJ +Fw +mN Zk -ID -Rx -aa -aa -aa -aa +SZ +Xr aa aa aa @@ -24973,89 +25821,89 @@ aa aa aa aa -tm -tm -tm +aa +aa tm XP -JO -dz -dz +WL +Xe +Xe +WL JO dp bf dC -PU -JO +WL +DZ Kg Ss cp ey -gb +eu HE xv -px -bk +fN Nq +JL Gg -tb -FR +uo +bW JL ae -oo +tb IW ej -mc -mc +lr +lZ SQ Xn -Vi -pp -fV +mc +mc +mk an Wb -Tt -cK -cK -Tt -cK -cK -cK -Tt -Jm -Ih -Tt -Tt -Tt -AV +sL fV -jO -Zc +uJ +vC +Tt +cK +cK +Tt +cK +Tt +cK +Tt +LQ +AV +Tt +Tt +SX rk -Nh -Gh -TZ +fV +GQ +Zc OJ qw uH LV -LV -Zk +pg +rZ XS zM +zM Zk -yD wz OE -JQ +Zk FY -Py -ID -ki -aa -aa -aa -aa +Pq +qx +Yw +Yq +dB +SZ +eA aa aa aa @@ -25117,21 +25965,20 @@ aa aa aa aa -aa -dK +uO +zX um -ds +RF bB -eT -lZ -wO -wm +xu +xh +YA +aN XO -bZ -JO +WL Nq Nq -sn +dj Nq Nq Nq @@ -25139,11 +25986,16 @@ Nq Nq Nq Nq -JE +JL +Be iP -kU -tb +JL +JL nH +iS +kn +tb +lx lU lU lU @@ -25151,53 +26003,49 @@ lU lU lU lU -Aw -NU +rw +td fV -sf +Po Tt Tt -tE -Kc -Tt -lC vV iI Tt aW mT hD -EJ +Tt QM qt -yV +Nv yh -Zc +SY hY -KD +Yf bc -Vs +Zc KS +fA +yM +VM +SE IK IK IK IK IK -Vv -Vv +pf +pf Zk -pf -pf -cm -nN kz -Zk +kz Bc -Rx -aa -aa -aa -aa +wI +YO +Zk +uC +Xr aa aa aa @@ -25259,72 +26107,76 @@ aa aa aa aa -XP -di -ds +xm +um +am Mj dD -iV Bq Bq +Ra dW AS -hu +aS Kz as pL -LB -tb -QC -nB -FH -tb -nW -tc -tb -PE -zw +dA +ze +ex +eH +dA +CN +hO +dA +dA +LC +dA Zd -OS -lU +dA +jg tz PR Ur -CH -Cd lU +Cd +nL al St yV -sf +lU Eo JC -RL -Cw -Tt +Yf +Po +JA lm -uU +Ud Xo Tt RP wX uV -IL -QM -qt -yV -dF +Tt +Hr +KY +Nz +Sv +SY +hY +Yf +ci Zc Zc Zc Zc Zc -KX -IK -ap -az aJ IK +Zb +Pk +Lv +IK Zk Zk Zk @@ -25332,7 +26184,7 @@ Zk Zk Zk Zk -Ji +HW Zk Zk Zk @@ -25375,10 +26227,6 @@ aa aa aa aa -aa -aa -aa -aa "} (70,1,1) = {" aa @@ -25401,33 +26249,33 @@ aa aa aa aa -XP dn +ac xh -wO -ef -ef -ef +QC +QC +QC +KQ Hw dX ls -zX -eh -aU -sF -EF -mc -mc -mc -mc -gN -mc -Bt -mc +aT +bI +bP +dv +WI +WI +WI +WI +fh +WI +WI +WI +WI gs -RC +WI rt -Bi +WI Gw ns on @@ -25437,12 +26285,12 @@ pN Ek kg Wr -yV +pp sf -Eo +rK Bd Yf -zW +Po JA Yb Tw @@ -25452,17 +26300,17 @@ kI LM qL pk -Tt +kv Wc -fV +NB sJ LY gF -Qx +fV Fx -gl +Qa Ck -IK +Yj aq aA aK @@ -25470,18 +26318,18 @@ IK ei eK eP -eR +IK xW YT ZP HI eI -eP +ha Mr -aa -aa -aa -aa +vO +Hv +ZP +wn aa aa aa @@ -25543,80 +26391,84 @@ aa aa aa aa -XP -dr +yw dt +ao Ea UJ -jD Vc Vc +im ed In -aO -aS -aZ -MA -kH -tb -tb -tb -tb -CN -xm -Kh -tb -hc -Ev -tl -bI -lU +aU +bJ +bU +dA +dA +dA +dA +dA +fj +gb +dA +gH +qU +JZ +eB +Ak +dA +ju CB uA Eq -jg -TL lU -al +TL +nM +oo XX -yV -sf +pH +lU Eo bo -RL -vA -Tt +Yf +Po +JA vy -ho +uU hH Tt Ux zC qq -IL -QM +Tt +Hu ZO -yV +NG Sv -LY +SY Xf -mM +Yf vz -Ii +Qa AZ -IK +gC ar aD -aJ +VL IK ep +LJ +Lv +IK +ll zm zm zm zm zm zm -LI +lc zm zm zm @@ -25659,10 +26511,6 @@ aa aa aa aa -aa -aa -aa -aa "} (72,1,1) = {" aa @@ -25685,33 +26533,37 @@ aa aa aa aa -aa -hP +Ue +ad hh -RF +ap eL xu -lZ +at YA wm Fv -qU -JO -qp -PW -fo -AX -AX -AX -AX +WL hs -qp -qp +bZ +dK +fo +fo +fo +fo +My +hs +QU +QE UL hT QE -tb +QE ow +jv +kH +tb +lB lU lU lU @@ -25719,53 +26571,49 @@ lU lU lU lU -Aw -NU +rw +td fV -sf +Po Tt Tt -vY -Kc -Tt -xE KN Zz Tt ME aH kM -ub -QM -ZO -yV -jO -LY -wH -mM -nx +Tt +Hy +Lc +NK +PI +SY +Xf +Yf +GQ Qa Zo -IK -IK +gC +TY aE +GA IK IK -ex eM -zm -Ob +IK +IK Ob rS -Lo +zm +MD MD -wj nh WM -aa -aa -aa -aa +kV +JM +DV +vk aa aa aa @@ -25828,86 +26676,86 @@ aa aa aa aa -aa XP -JO -dG -dG -JO +WL +LB +LB +WL +az fU ET fw -Lt -JO -fC -HW +WL +bN +cg +dO XB -By -By -By -By +XB +XB +XB +iz kD -yP -qp +QU +Ff NI -tb -lj -mc +hu +Ff +QE mZ -SQ +tb AO -Zv -tj +mc tj +mk ru sD -oc DG -fV +DG +qb Fd od -Tt -DC -DC -Tt -Po -Tt -DC -Tt -ol -AN -Tt -Tt -Tt -Zr +tf fV -Aq -LY +va +vE +Tt +DC +DC +Tt +DC +Tt +DC +Tt +nY +Zr +Tt +Tt +Ta BK -wu +fV Uw -Ho +Qa Hc yo au aG aP -zm +CK eF eN +Qt zm -sL HD Nt -Ij -Il zm +Il +jJ rl Zi -aa -aa -aa -aa +cP +zm +Ov +pM aa aa aa @@ -25969,66 +26817,66 @@ aa aa aa aa -aa tm tm XP XP XP -JO +WL +aF ZC -VI -JO -cx -JO +WL +MW +WL dw +XB By Zf Ip -VF -VF -Oq +Ip +eR +OY ge -Ow -qp -Pg -tb +QU Ff -tb +Pg +hA +Ff +QE wV -qr -qr -vU -qr +tb +kJ +tb +lC qr qr nb -pG -Hh -rI +qr +qr +qr Li -pH -hr -hr -hr +pG hr +WN +ve +vH +Ug +Ug +Ug Ug -AW -AW -AW Zh -by qe -by +qe +qe oA Dj -rI -Cx -LY +NU +Dj +Tz IN -KA +WN Sr -jc +Qa LN Im fQ @@ -26043,13 +26891,13 @@ cU Gp MV vd -wj -rl -WM -aa -aa -aa -aa +Hx +TF +Qf +US +JM +Ov +vk aa aa aa @@ -26116,37 +26964,41 @@ aa aa aa aa -aa XP XP -hP -JO -JO -JO +Ue +WL +WL +WL +Dk XU -uB +QU oh so -Pk -xq -OY +ez +eX +fn ia -bd -qp -lO -tb -tb -tb +QU +Ff +TP +WQ +Ff +QE XE -qr -ve -oV +tb +tb +tb cf -SN qr -ma +no +nN +op +ov +qr +qO pG -bp +sF fV Ks jM @@ -26158,40 +27010,36 @@ jM jM jM fV -Yx -Ia +Hz +KX fV Ks jM jM fV -va -LY -HU -QJ PF -pT +Qa pA Bb pt vb aV -zm +wc AL AT +dI zm -nL PH pV -UN -Tf zm -rl -Zi -aa -aa -aa -aa +Tf +HY +JU +Ee +FP +zm +Ov +pM aa aa aa @@ -26261,35 +27109,39 @@ aa aa aa aa -aa -mI -JO -JO -qc +Bm +WL +WL qI -oh +cl +QU +eg DU -Hl -Hl -Hl -ia -zo -qp +DU +DU +fn +gk +QU +Ff TP WQ -dc -VT +Ff +QE mb -qr +jN ag EH iQ -AQ qr +nq Fq +oq +oV +qr +qP pG -Hh -SY +hr +tU pG pG pG @@ -26299,41 +27151,37 @@ pG pG pG pG -Ua -AI +DX +HN pG pG pG pG pG -SY -ng -LY -fx -KA +tU mO -Pu +Qa uR -Dh +Im OL nI kP +XA +fu +GP +PD zm zm zm zm -Uf -bJ -lX -lT uI -wj -rl -WM -aa -aa -aa -aa +YG +xK +gi +na +JM +Ov +vk aa aa aa @@ -26401,58 +27249,58 @@ aa aa aa aa -aa tm tm tm -qn -JO -iw -iw -oh -oh -MQ -tR +aO +WL +LH +LH +QU +QU +kw +eG +eY kG -iz -Ad -qp -dV -Ka -Ka -Ka +gm +QU +Ff +TP +WQ +Ff +QE kj -qr -ux -aw +Qy +Qy +Qy Uj -hM qr +nw Wy wg tK -rU -ce +qr ce +rT uM gV pC -cr -tk +pC tk +wx oS to -BJ +CO CO tx LD -CO -vw -CO +HT +FT +Od Wt FT pw -Cs +FT HK ig wy @@ -26460,22 +27308,22 @@ cV Nc tB Rd -zm +SV zJ sC +io zm RI -RI eC -gM -kS zm +kS +kS Gy -Zi -aa -aa -aa -aa +Rn +VZ +zm +Sy +pM aa aa aa @@ -26547,33 +27395,37 @@ aa aa aa aa -aa XP XP XP XP -oh -iw -iw -oh +QU +LH +LH +QU +fs OX -lc -qp +QU +Ff YB kC -Ka -nS +Ff +QE pK -qr -zy +jS +Qy YZ Pb -MB +qr +nB +nV +ot +oW qr Sk Sk Sk -PX +tZ Sk Sk Sk @@ -26584,32 +27436,32 @@ RQ RQ RQ RQ -kX -yj +HU +Le fW fW fW fW fW fW -LY -LY -LY -LY +Qa +Qa +Qa +Qa WJ -te +Zw WJ WJ WJ WJ zm -el -cl +xj +yH zm zm zm zm -rT +xY zm zm zm @@ -26619,11 +27471,7 @@ hj hj hj aa -uL -aa -aa -aa -aa +VN aa aa aa @@ -26693,72 +27541,76 @@ aa aa aa aa -aa XP XP XP -oh -iw -iw -oh +QU +LH +bt +QU +Ff yv BW -Ka -nS +Ff +QE IF -qr +kd Qy -qr +YZ NO -Og +qr tw -BU +qr zu sw bg Hq pB HF -RQ +ub GJ oF OD -aF -Ps RQ +Ps +yd ah Ml -fW -am +BO +RQ Ok -dh -HT +GU +fW yZ It jY -jY +Ym Um -WJ -ms +TH Ax +Eu yU -wx +IB Wz -fb +Vr iN Rg qD fb ii -oK +Lu ya -vE +fb WU Pf -fi -uQ -fi -uQ +cd +oE +bT +tS +aL +Tb +aL +Tb hj hj hj @@ -26766,7 +27618,7 @@ hj hj hj hj -Fk +ww XP XP XP @@ -26795,10 +27647,6 @@ aa aa aa aa -aa -aa -aa -aa "} (80,1,1) = {" aa @@ -26838,77 +27686,81 @@ aa aa aa aa -aa XP XP -XP -oh +wG +QU +Ff HZ -EU -EU -PG +HZ +Ff +QE sI -dY +Sg +Sg +kW +lF +mH rx qr qr qr qr -CF -Sk -pc -Qb OM -Mp +Sk FM vZ tu -tu +vJ eD -YS +wN +Xl Xl -RQ ym -kr +Fn qH -mS -LU -LU +RQ LU +Lg +Og vx or -VS -VS +or +PA lA -WJ -uk -MO +Ei +RY +jZ BZ -FB +IB hk -fb +mr Ll -Rg +pq RG fb yN Lu -ya +pU +fb +bx +cC +cd in in in in in -sl -in -fg -qo gA -fi -uQ +in +GZ RE -hj +Ej aL +Tb +YH +hj +dH hj hj hj @@ -26916,7 +27768,7 @@ Dq Dq Dq Dq -Lz +pz XP XP XP @@ -26937,10 +27789,6 @@ aa aa aa aa -aa -aa -aa -aa "} (81,1,1) = {" aa @@ -26983,56 +27831,60 @@ aa aa aa aa -aa -nw -JJ -eu -EU -EU +XP +XP +XP +XP +XP +iE yu -EU -Kd +ke +Sg +Sg +lS +Sg +nC rx rx -QY -Sk -Gq -Sk uZ -ju +Sk Pj -uw +Sk BH -RQ +uc Nb YS bQ -Lc +RQ vs Fn aB mE -fW +BT lR XR -VS -XR +Lj +fW gR Yc VS -OI +de qQ -WJ -WS +qA +wY gd IY -IY -IY +Mk +LR Jf Tg -wZ -yX +Tg +Tg ck +jn +fc +CM +Lw SW SW SW @@ -27041,28 +27893,24 @@ SW SW SW SW -RA -AJ +sB +Uv FU FU FU FU FU FU -Qz -tQ -iJ -mH -ya +ZD ff Wf fr -Dq +cd KZ -aa -aa -aa -aa +xa +Jl +Dq +Tm aa aa aa @@ -27131,56 +27979,60 @@ aa aa aa aa -hP -EU -EU +aa +aa +aa +aa +Ue +Sg +Sg rx rx -CL +jr Sk -QH +rc Sk Sk -MU +uh Sk Sk -nM -RQ -Od -YS MG -tf -rG RQ -ca +rG +Fn +NZ Na -fW -Gm +BU +RQ tX +lv +fW +PK +tJ VS -XR -gR -Yc -XR -mQ -ab -WJ -xJ YL +mL +IB +Kw +df iq -iq +IB nD -fb +et +pv pv -cM tM fb uQ fi -fi -vE +mg +fb Tb -Pf +aL +aL +oE +iH +tS in in in @@ -27190,17 +28042,17 @@ in in in in -uv +lY in in in in -Mf -fh -Dq -fs KT fS +Dq +Km +yz +Fa XP XP aa @@ -27221,10 +28073,6 @@ aa aa aa aa -aa -aa -aa -aa "} (83,1,1) = {" aa @@ -27274,46 +28122,50 @@ aa aa aa aa -mI -EU -EU +aa +aa +aa +aa +Bm +Sg +Sg rx rx Sk Sk Sk -TE QB +uk Sk -oW -QB -RQ -On Wk -MG -Nz -Kp +uk RQ +Kp +yj NZ -Na +zZ +BX +RQ +cX +lv fW -Ju -tX -VS -XR Hg tJ -kZ -mP +VS +YL AY -WJ +IB JK Yp ax -kn +IB +zA +pS +Xh +qM WJ fb -Xh +Tk fb fb fb @@ -27325,7 +28177,7 @@ fb fb fb fb -Rf +Ol fb fb fb @@ -27338,15 +28190,11 @@ fb fb fb fb -bP +Lk Dq Dq Dq -JW -aa -aa -aa -aa +Vz aa aa aa @@ -27417,72 +28265,76 @@ aa aa aa aa -mI -EU -EU +aa +aa +aa +aa +Bm +Sg +Sg rx rx -QY +uZ Sk -UC rQ +JI Sk -UC rQ -RQ -RQ -RQ JI RQ RQ RQ -ca -rj +zw +RQ +RQ +RQ +tX +Lo fW -jS -fk -VS -mQ ZR -Ly -kc -Ly +TE +VS +YL ZA -fW +IB +ix +di +ok +IB DD DD DD DD DD -ik -dv -Oo -bM +Oz +UM +mq +Au rL rL rL rL -vL -rL -rL -rL bM rL -EP +rL +rL +Au +rL +eQ rL rL rL rL rL -Cy -rL -rL -Uo tg rL -dj +rL hK Ri +rL +yK +dr +gK tm tm aa @@ -27505,10 +28357,6 @@ aa aa aa aa -aa -aa -aa -aa "} (85,1,1) = {" aa @@ -27560,45 +28408,49 @@ aa aa aa aa -mI -EU -EU +aa +aa +aa +aa +Bm +Sg +Sg rx rx Sk Sk -Pr +uv Sk Sk -Pr +uv RQ -Qn -YD -MG -op Wj +yx +NZ +Ag +Cq RQ -eo -Na -fW -iB HG lv -ac +fW Ry -fW -fW -fW -fW -fW -dJ -cg -IJ -Av +TJ +Vx +Yx +Fr +IB +IB +Ec +IB +IB vc -mm +ps +Xw +AB +tq +OF Dq -Lk +Dg Dq Dq Dq @@ -27610,7 +28462,7 @@ Dq Dq Dq Dq -Lk +Dg Dq Dq Dq @@ -27647,10 +28499,6 @@ aa aa aa aa -aa -aa -aa -aa "} (86,1,1) = {" aa @@ -27703,44 +28551,48 @@ aa aa aa aa -mI -EU -EU +aa +aa +aa +aa +Bm +Sg +Sg rx -CL +jr +Sk +Wu +Sk Sk -BN -Sk -Sk -BN -RQ -Ta -Mg Wu -uh -HX RQ +HX +yD WB bX -fW -PI +Cy +RQ Ly kc -Ly -Ig fW +Ig +TZ dJ -hL +TZ xr -Mm -vc +fW vc +hL mm +Bj +tq +tq +OF Dq Dq Dq Dq -up +wT XP XP XP @@ -27752,7 +28604,7 @@ XP XP XP XP -DX +Vy tm tm tm @@ -27789,10 +28641,6 @@ aa aa aa aa -aa -aa -aa -aa "} (87,1,1) = {" aa @@ -27846,24 +28694,28 @@ aa aa aa aa -mI -EU -EU +aa +aa +aa +aa +Bm +Sg +Sg rx rx rx -gE -zZ -rx -CS Yo YQ -Ko +rx Sj VE -RQ +yF xQ Gx +CF +RQ +Ia +Lz fW fW fW @@ -27873,18 +28725,14 @@ fW fW hL hL -TJ -xP +iK +JN Dq Dq Dq Dq aa -Dg -aa -aa -aa -aa +uu aa aa aa @@ -27989,14 +28837,18 @@ aa aa aa aa -xB -ZQ -ZQ -iM -iM +aa +aa +aa +aa iM ZY +ZY uz +uz +uz +Iu +we RQ RQ RQ @@ -28004,26 +28856,22 @@ RQ RQ RQ RQ -fN -Na -yx -hL LF +lv +On hL -hL -bP sZ hL -Dq +hL Lk +is +hL Dq -Dq -aa Dg +Dq +Dq aa -aa -aa -aa +uu aa aa aa @@ -28132,36 +28980,36 @@ aa aa aa aa -mI -EU -EU -QY +aa +aa +aa +aa +Bm +Sg +Sg +uZ rx -sV -CL -Bw -dT XD jr -xw -av Bw +av +yJ zd xR +CH +Bw +Ih +LA HS HS HS HS HS -ch -Dq -Dq -Dq up -aa -aa -aa -aa +Dq +Dq +Dq +wT aa aa aa @@ -28275,32 +29123,32 @@ aa aa aa aa -mI -EU -EU +aa +aa +aa +aa +Bm +Sg +Sg rx -sV -QY +XD +uZ Bw -Wd -cv -rv -Hu YY -Bw -NZ +yO +Dx oO -HS -Jp +CI +Bw cX rh -XT +HS ch -Vh -aa -aa -aa -aa +Ua +VK +Yy +up +ys aa aa aa @@ -28418,30 +29266,30 @@ aa aa aa aa -mI -EU -EU -wN -ZY -Bw -Bw +aa +aa +aa +aa +Bm +Sg +Sg ss Iu -Jt -vt +Bw +Bw Vt Td Nw -HS +CS Lx ta XJ -Hr +HS Cf -aa -aa -aa -aa +Uf +VO +YD +lK aa aa aa @@ -28561,29 +29409,29 @@ aa aa aa aa -mI -EU -EU -wN -ZY -qN +aa +aa +aa +aa +Bm Sg -eV -rv +Sg +ss +Iu gn -Bw +yR qK Dx oN -CU +Bw Fe YN IS -Cf -aa -aa -aa -aa +PX +Uo +VQ +YP +lK aa aa aa @@ -28704,28 +29552,28 @@ aa aa aa aa -mI -EU -EU -sV +aa +aa +aa +aa +Bm +Sg +Sg +XD Bw Bw -JH -Cg -Yy -Bw vG -Na -HS -vH +An +CU +Bw fa -XJ -Hr -Cf -aa -aa -aa -aa +lv +HS +Qb +UA +VO +YD +lK aa aa aa @@ -28847,28 +29695,28 @@ aa aa aa aa -XW -ZQ -Mv -lx -Bw -po +aa +aa +aa +aa +vL +ZY Ie Yt Bw cH -Ml -HS -bU +Aq +CV +Bw hi GU -Jd -ch -ql -aa -aa -aa -aa +HS +Qc +UC +VX +YR +up +bn aa aa aa @@ -28990,28 +29838,28 @@ aa aa aa aa -Up -Up -VQ -Bw -Bw -Bw -Bw -Bw -vJ -PC -HS -HS -HS -HS -HS -ch -Up -tZ aa aa aa aa +Xq +Xq +xN +Bw +Bw +Bw +Bw +Bw +Ij +LI +HS +HS +HS +HS +HS +up +Xq +ie aa aa aa @@ -29132,27 +29980,27 @@ aa aa aa aa -gX -Up -sh -uc -ku -lP +aa +aa +aa +aa +Qq +Xq mG rR zI -yC +As Mb aj -BF -BF +Is +yC wr -BF -Up -aa -aa -aa -aa +Qm +XZ +XZ +Zg +XZ +Xq aa aa aa @@ -29275,28 +30123,28 @@ aa aa aa aa -Up -Up -aT -yC -yC -jI -yC -td -yC -yC -yC -jI -yC -yC -BF -Up -Up -ql aa aa aa aa +Xq +Xq +Iz +yC +yC +Dl +yC +Iv +yC +yC +yC +Dl +yC +yC +XZ +Xq +Xq +bn aa aa aa @@ -29417,29 +30265,29 @@ aa aa aa aa -gX -Up -zj -BF -BF -xi +aa +aa +aa +aa +Qq +Xq DI XZ -Aj +XZ ct er wF -BF -yC -yC +Mf +Oo +Qn hb -Up -Up -bA -aa -aa -aa -aa +XZ +yC +yC +sR +Xq +Xq +TR aa aa aa @@ -29560,28 +30408,28 @@ aa aa aa aa -Up -Up -Le -yC -yC -yC +aa +aa +aa +aa +Xq +Xq cn yC yC yC +IJ yC yC yC yC yC -dO -xX -Kl -aa -aa -aa -aa +yC +yC +yC +lG +Mu +Fg aa aa aa @@ -29702,33 +30550,33 @@ aa aa aa aa -gX -Up -BF -BF -MR -Ws -yf -GT +aa +aa +aa +aa +Qq +Xq +XZ +XZ ml Ot iU -BF -BF -BF +Mg +Op +Qx +UF +XZ +XZ +XZ yC -Nm -xX -Kl -XP -XP +Bf Mu -uK -bA -aa -aa -aa -aa +Fg +XP +XP +Pd +hq +TR aa aa aa @@ -29845,28 +30693,32 @@ aa aa aa aa -Up -Up -aT -MP -yC -dQ +aa +aa +aa +aa +Xq +Xq Iz gU -EX +yC ST Uk bK -Iz +Qz mV SG -Up -Up -bA +Zp +Uk +vr +xg +Xq +Xq +TR XP -ZJ -RD -Kl +UW +Wl +Fg XP aa aa @@ -29919,10 +30771,6 @@ aa aa aa aa -aa -aa -aa -aa "} (102,1,1) = {" aa @@ -29987,28 +30835,32 @@ aa aa aa aa -gX -Up -BF -BF +aa +aa +aa +aa Qq -HC -nc +Xq +XZ +XZ +DY +IL +Mh mw mw mw mw -AU +TO yC -Qc -Iz -MX -Wo -nl -OT +Gr +Uk hG qy -QI +NT +Jz +MZ +sG +Up XP aa aa @@ -30061,10 +30913,6 @@ aa aa aa aa -aa -aa -aa -aa "} (103,1,1) = {" aa @@ -30130,23 +30978,27 @@ aa aa aa aa -Up -Up -uJ -Pv -kY -Xj +aa +aa +aa +aa +Xq +Xq dd Hb pi -mw +Mm AU -yC +QH Pv -Gv +mw TO -xX -Kl +yC +Hb +Je +Fh +Mu +Fg XP XP XP @@ -30203,10 +31055,6 @@ aa aa aa aa -aa -aa -aa -aa "} (104,1,1) = {" aa @@ -30272,23 +31120,27 @@ aa aa aa aa -Tz -Up -mw -mw +aa +aa +aa +aa If -da +Xq +mw mw -UA JV +Mp mw -AU Gv +UG +mw +TO +Je +Xq +Xq +Xq +Xq Up -Up -Up -Up -QI XP aa aa @@ -30345,10 +31197,6 @@ aa aa aa aa -aa -aa -aa -aa "} (105,1,1) = {" aa @@ -30414,21 +31262,25 @@ aa aa aa aa +aa +aa +aa +TR XP -Up -Up -ud -Ag -NQ +Xq +Xq +XC +IU +Mv mw -XC -XC -Up -Xb -Up -Up +QJ +QJ +Xq +Zv +Xq +Xq XP -WC +UN XP aa aa @@ -30487,10 +31339,6 @@ aa aa aa aa -aa -aa -aa -aa "} (106,1,1) = {" aa @@ -30556,18 +31404,22 @@ aa aa aa aa -XP -Tz -Up +aa +aa +Ls NT -oT +Jz Us -Up -Up -Up -Up -qX +Dm +Ev +Jd +MB Xq +Xq +Xq +Xq +ZE +Vu XP XP aa @@ -30629,10 +31481,6 @@ aa aa aa aa -aa -aa -aa -aa "} (107,1,1) = {" aa @@ -30696,25 +31544,25 @@ aa aa aa aa -XP -XP -XP -XP -Up -Up -Cq -Dy +aa +aa +aa +aa +Yr Up XP +XP +Du +Xq WC -ZJ -UI -Kl +ML +Xq +XP +UN +UW +ZK +Fg XP -aa -aa -aa -aa aa aa aa @@ -30835,27 +31683,27 @@ aa aa aa aa +aa +aa +aa +aa tm tm -Mu -uK -bA XP XP -Lz -zF -iF -ke -Hj XP XP -mo -Fg -QI -aa -aa -aa -aa +XP +XP +XP +XP +XP +XP +XP +XP +Wd +Yr +Up aa aa aa @@ -30978,22 +31826,22 @@ aa aa aa aa -XP -ZJ -UW -nl -OT -OT -OT -OT -ne -XP -XP -XP aa aa aa aa +XP +XP +XP +XP +XP +XP +XP +XP +Ji +XP +XP +XP aa aa aa @@ -31089,7 +31937,11 @@ aa aa aa aa -kW +aa +aa +aa +aa +cy aa aa aa @@ -31121,19 +31973,15 @@ tm tm XP XP -mo -Fg -QI XP XP XP XP XP XP -aa -aa -aa -aa +XP +XP +XP aa aa aa @@ -31412,7 +32260,7 @@ aa aa aa aa -kd +aa aa aa aa @@ -32312,11 +33160,11 @@ aa aa aa aa -OW aa aa aa aa +Rk aa aa aa diff --git a/maps/offmap_vr/talon/talon_v2_areas.dm b/maps/offmap_vr/talon/talon_v2_areas.dm index 654484f728..ab607a8dcf 100644 --- a/maps/offmap_vr/talon/talon_v2_areas.dm +++ b/maps/offmap_vr/talon/talon_v2_areas.dm @@ -50,6 +50,9 @@ /area/talon_v2/hangar name = "\improper Talon - Hangar" icon_state = "red" +/area/talon_v2/pod_hangar + name = "\improper Talon - Pod Hangar" + icon_state = "red" /area/talon_v2/engineering name = "\improper Talon - Engineering" @@ -90,6 +93,9 @@ /area/talon_v2/secure_storage name = "\improper Talon - Secure Storage" icon_state = "red" +/area/talon_v2/ofd_ops + name = "\improper Talon - OFD Ops" + icon_state = "red" /area/talon_v2/bridge name = "\improper Talon - Bridge" icon_state = "blue" @@ -106,6 +112,9 @@ /area/talon_v2/crew_quarters/sec_room name = "\improper Talon - Guard's Cabin" icon_state = "red" +/area/talon_v2/crew_quarters/mine_room + name = "\improper Talon - Miner's Cabin" + icon_state = "gray" /area/talon_v2/crew_quarters/cap_room name = "\improper Talon - Captain's Cabin" icon_state = "blue" diff --git a/maps/om_adventure/grasscave.dm b/maps/om_adventure/grasscave.dm new file mode 100644 index 0000000000..e9e3a21dda --- /dev/null +++ b/maps/om_adventure/grasscave.dm @@ -0,0 +1,335 @@ +#if MAP_TEST +#include "pois/darkstar.dmm" +#include "pois/darktear1.dmm" +#include "pois/darktear2.dmm" +#include "pois/darktear3.dmm" +#include "pois/darktear4.dmm" +#include "pois/fleshtear1.dmm" +#include "pois/fleshtear2.dmm" +#include "pois/fleshtear3.dmm" +#include "pois/fleshtear4.dmm" +#include "pois/cabin1.dmm" +#include "pois/cabin2.dmm" +#include "pois/cabin3.dmm" +#include "pois/camp.dmm" +#include "pois/shuttlewreck1.dmm" +#include "pois/shuttlewreck2.dmm" +#include "pois/shuttlewreck3.dmm" +#include "pois/shuttlewreck4.dmm" +#endif + + +/obj/effect/shuttle_landmark/premade/om_adventure/grasscave/center + name = "Anomaly - Center" + landmark_tag = "om-grasscave-center" + +/obj/effect/shuttle_landmark/premade/om_adventure/grasscave/southeast + name = "Anomaly - Southeast" + landmark_tag = "om-grasscave-southeast" + + +/area/om_adventure/grasscave + name = "Grass Cave" + icon = 'icons/turf/areas_vr.dmi' + icon_state = "bluwhicir" + requires_power = TRUE + dynamic_lighting = TRUE + flags = RAD_SHIELDED + base_turf = /turf/simulated/floor/weird_things/dark + ambience = AMBIENCE_FOREBODING + +/area/om_adventure/grasscave/explored + +/area/om_adventure/grasscave/unexplored + ambience = AMBIENCE_RUINS + +/area/om_adventure/grasscave/rocks + +/obj/effect/overmap/visitable/simplemob/spacewhale/grasscave + initial_generic_waypoints = list("om-grasscave-center", "om-grasscave-southeast") + +/turf/simulated/mineral/omadventure/make_ore(var/rare_ore) + if(mineral) + return + var/mineral_name + if(rare_ore) + mineral_name = pickweight(list( + "marble" = 3, + "uranium" = 10, + "platinum" = 10, + "hematite" = 20, + "carbon" = 30, + "diamond" = 20, + "gold" = 8, + "silver" = 8, + "phoron" = 18, + "lead" = 5, + "verdantium" = 5)) + else + mineral_name = pickweight(list( + "marble" = 2, + "uranium" = 5, + "platinum" = 5, + "hematite" = 35, + "carbon" = 30, + "gold" = 3, + "silver" = 3, + "phoron" = 25, + "lead" = 1)) + + if(mineral_name && (mineral_name in GLOB.ore_data)) + mineral = GLOB.ore_data[mineral_name] + UpdateMineral() + update_icon() + +/datum/random_map/noise/ore/grasscave + descriptor = "grasscave ore distribution map" + deep_val = 0.6 //More riches, normal is 0.7 and 0.8 + rare_val = 0.5 + +/datum/map_template/om_adventure + +/area/om_adventure/poi + name = "POI - OM-A" + icon = 'icons/turf/areas_vr.dmi' + icon_state = "orawhisqu" + ambience = AMBIENCE_FOREBODING + +/area/om_adventure/poi/darkstar + name = "POI - Darkstar" + +/datum/map_template/om_adventure/outdoor/darkstar + name = "Darkstar" + desc = "A mysterious shape!" + mappath = 'pois/darkstar.dmm' + cost = 5 + +/area/om_adventure/poi/darktear1 + name = "POI - Darktear 1" + +/datum/map_template/om_adventure/cave/darktear1 + name = "darktear1" + desc = "A mysterious shape!" + mappath = 'pois/darktear1.dmm' + cost = 5 + +/area/om_adventure/poi/darktear2 + name = "POI - Darktear 2" + +/datum/map_template/om_adventure/cave/darktear2 + name = "darktear2" + desc = "A mysterious shape!" + mappath = 'pois/darktear2.dmm' + cost = 5 + +/area/om_adventure/poi/darktear3 + name = "POI - Darktear 3" + +/datum/map_template/om_adventure/cave/darktear3 + name = "darktear3" + desc = "A mysterious shape!" + mappath = 'pois/darktear3.dmm' + cost = 5 + +/area/om_adventure/poi/darktear4 + name = "POI - Darktear 4" + +/datum/map_template/om_adventure/cave/darktear4 + name = "darktear4" + desc = "A mysterious shape!" + mappath = 'pois/darktear4.dmm' + cost = 5 + +/area/om_adventure/poi/fleshtear1 + name = "POI - Fleshtear 1" + +/datum/map_template/om_adventure/cave/fleshtear1 + name = "fleshtear1" + desc = "Wow gross!" + mappath = 'pois/fleshtear1.dmm' + cost = 5 + +/area/om_adventure/poi/fleshtear2 + name = "POI - Fleshtear 2" + +/datum/map_template/om_adventure/cave/fleshtear2 + name = "fleshtear2" + desc = "Wow gross!" + mappath = 'pois/fleshtear2.dmm' + cost = 5 + +/area/om_adventure/poi/fleshtear3 + name = "POI - Fleshtear 3" + +/datum/map_template/om_adventure/cave/fleshtear3 + name = "fleshtear3" + desc = "Wow gross!" + mappath = 'pois/fleshtear3.dmm' + cost = 5 + +/area/om_adventure/poi/fleshtear4 + name = "POI - Fleshtear 4" + +/datum/map_template/om_adventure/cave/fleshtear4 + name = "fleshtear4" + desc = "Wow gross!" + mappath = 'pois/fleshtear4.dmm' + cost = 5 + +/area/om_adventure/poi/cabin1 + name = "POI - Cabin 1" + +/datum/map_template/om_adventure/outdoor/cabin1 + name = "cabin1" + desc = "A comfy home!" + mappath = 'pois/cabin1.dmm' + cost = 20 + +/area/om_adventure/poi/cabin2 + name = "POI - Cabin 2" + +/datum/map_template/om_adventure/outdoor/cabin2 + name = "cabin2" + desc = "A comfy home!" + mappath = 'pois/cabin2.dmm' + cost = 20 + +/area/om_adventure/poi/cabin3 + name = "POI - Cabin 3" + +/datum/map_template/om_adventure/outdoor/cabin3 + name = "cabin3" + desc = "A comfy... home?" + mappath = 'pois/cabin3.dmm' + cost = 10 + +/area/om_adventure/poi/camp + name = "POI - Camp" + +/datum/map_template/om_adventure/outdoor/camp + name = "Camp" + desc = "A camp!" + mappath = 'pois/camp.dmm' + cost = 20 + +/area/om_adventure/poi/shuttlewreck1 + name = "POI - Shuttlewreck 1" + +/datum/map_template/om_adventure/outdoor/shuttlewreck1 + name = "Shuttle wreck" + desc = "Long abandoned!" + mappath = 'pois/shuttlewreck1.dmm' + cost = 5 + +/area/om_adventure/poi/shuttlewreck2 + name = "POI - Shuttlewreck 2" + +/datum/map_template/om_adventure/outdoor/shuttlewreck2 + name = "Shuttle wreck" + desc = "Long abandoned!" + mappath = 'pois/shuttlewreck2.dmm' + cost = 10 + +/area/om_adventure/poi/shuttlewreck3 + name = "POI - Shuttlewreck 3" + +/datum/map_template/om_adventure/outdoor/shuttlewreck3 + name = "Shuttle wreck" + desc = "Long abandoned!" + mappath = 'pois/shuttlewreck3.dmm' + cost = 5 + +/area/om_adventure/poi/shuttlewreck4 + name = "POI - Shuttlewreck 4" + +/datum/map_template/om_adventure/outdoor/shuttlewreck4 + name = "Shuttle wreck" + desc = "Long abandoned!" + mappath = 'pois/shuttlewreck4.dmm' + cost = 10 + +/area/om_adventure/poi/medicalcenter + name = "POI - medical center" + +/datum/map_template/om_adventure/outdoor/medicalcenter + name = "Medical Center" + desc = "Maybe they used to heal people here." + mappath = 'pois/medicalcenter.dmm' + cost = 10 + +/area/om_adventure/poi/shippart1 + name = "POI - ship part 1" + +/datum/map_template/om_adventure/outdoor/shippart1 + name = "Ship Part" + desc = "Something bad happened here." + mappath = 'pois/shippart1.dmm' + cost = 10 + +/area/om_adventure/poi/woodentemple + name = "POI - Wooden Temple" + +/datum/map_template/om_adventure/cave/woodentemple + name = "Wooden Temple" + desc = "A comfy wooden temple." + mappath = 'pois/woodentemple.dmm' + cost = 10 + +/area/om_adventure/poi/alienchamber1 + name = "POI - Alien Chamber 1" + +/datum/map_template/om_adventure/cave/alienchamber1 + name = "Alien Chamber" + desc = "A mysterious alien chamber!" + mappath = 'pois/alienchamber1.dmm' + cost = 10 + +/area/om_adventure/poi/alienchamber2 + name = "POI - Alien Chamber 2" + +/datum/map_template/om_adventure/cave/alienchamber2 + name = "Alien Chamber" + desc = "A mysterious alien chamber!" + mappath = 'pois/alienchamber2.dmm' + cost = 10 + +/area/om_adventure/poi/alienchamber3 + name = "POI - Alien Chamber 3" + +/datum/map_template/om_adventure/cave/alienchamber3 + name = "Alien Chamber" + desc = "A mysterious alien chamber!" + mappath = 'pois/alienchamber3.dmm' + cost = 10 + +/area/om_adventure/poi/alienchamber4 + name = "POI - Alien Chamber 4" + +/datum/map_template/om_adventure/cave/alienchamber4 + name = "Alien Chamber" + desc = "A mysterious alien chamber!" + mappath = 'pois/alienchamber4.dmm' + cost = 10 + +/obj/tether_away_spawner/spookyland + name = "Spookyland Spawner" + icon = 'icons/mob/randomlandmarks.dmi' + icon_state = "monster" + + faction = "spookyland" + prob_spawn = 50 + prob_fall = 10 + //guard = 10 //Don't wander too far, to stay alive. + mobs_to_pick_from = list( + /mob/living/simple_mob/shadekin/blue = 1, + /mob/living/simple_mob/shadekin/red = 1, + /mob/living/simple_mob/shadekin/green = 10, + /mob/living/simple_mob/shadekin/purple = 1, + /mob/living/simple_mob/shadekin/yellow = 20, + /mob/living/simple_mob/vore/alienanimals/space_ghost = 100, + /mob/living/simple_mob/vore/alienanimals/space_jellyfish = 100, + /mob/living/simple_mob/faithless = 50, + /mob/living/simple_mob/mechanical/infectionbot = 30, + /mob/living/simple_mob/animal/passive/cat/bluespace = 1, + /mob/living/simple_mob/animal/passive/dog/void_puppy = 1 + ) \ No newline at end of file diff --git a/maps/om_adventure/grasscave.dmm b/maps/om_adventure/grasscave.dmm new file mode 100644 index 0000000000..b275729757 --- /dev/null +++ b/maps/om_adventure/grasscave.dmm @@ -0,0 +1,19919 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/effect/overmap/visitable/simplemob/spacewhale/grasscave, +/turf/unsimulated/wall/dark, +/area/om_adventure/grasscave) +"c" = ( +/turf/simulated/floor/outdoors/grass/forest, +/area/om_adventure/grasscave/unexplored) +"n" = ( +/obj/effect/shuttle_landmark/premade/om_adventure/grasscave/southeast, +/turf/simulated/floor/outdoors/grass/forest, +/area/om_adventure/grasscave) +"q" = ( +/turf/simulated/mineral/cave, +/area/om_adventure/grasscave/rocks) +"s" = ( +/turf/simulated/mineral, +/area/om_adventure/grasscave/rocks) +"u" = ( +/turf/simulated/floor/outdoors/grass/forest, +/area/om_adventure/grasscave/explored) +"A" = ( +/obj/effect/shuttle_landmark/premade/om_adventure/grasscave/center, +/turf/simulated/floor/outdoors/grass/forest, +/area/om_adventure/grasscave/explored) +"C" = ( +/turf/unsimulated/wall/dark, +/area/om_adventure/grasscave) +"N" = ( +/turf/simulated/floor/outdoors/grass/forest, +/area/om_adventure/grasscave) +"P" = ( +/turf/unsimulated/floor/dark, +/area/om_adventure/grasscave) +"X" = ( +/obj/effect/fake_sun, +/turf/unsimulated/wall/dark, +/area/om_adventure/grasscave) + +(1,1,1) = {" +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +X +a +"} +(2,1,1) = {" +C +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +C +"} +(3,1,1) = {" +C +P +P +P +P +P +P +P +P +P +P +P +P +P +q +P +P +P +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +P +P +P +P +q +P +q +q +P +P +P +P +P +P +P +q +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +C +"} +(4,1,1) = {" +C +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +q +P +P +P +P +P +P +P +q +P +P +q +q +q +q +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +q +q +q +q +q +q +q +P +P +q +P +P +q +q +q +q +q +P +P +P +P +P +P +P +P +q +P +P +P +P +P +P +P +P +P +P +P +P +C +"} +(5,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +C +"} +(6,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(7,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(8,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(9,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(10,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(11,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(12,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(13,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(14,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(15,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(16,1,1) = {" +C +P +P +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +s +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(17,1,1) = {" +C +P +P +P +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(18,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(19,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(20,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(21,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(22,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +q +q +q +q +q +q +q +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(23,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +c +c +c +c +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(24,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +c +q +q +q +q +c +c +c +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(25,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(26,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(27,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(28,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(29,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(30,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(31,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(32,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(33,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(34,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(35,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +c +c +c +c +c +c +c +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(36,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(37,1,1) = {" +C +P +P +P +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +C +"} +(38,1,1) = {" +C +P +P +P +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +C +"} +(39,1,1) = {" +C +P +P +P +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +C +"} +(40,1,1) = {" +C +P +P +P +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +C +"} +(41,1,1) = {" +C +P +P +P +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +C +"} +(42,1,1) = {" +C +P +P +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(43,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(44,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(45,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +c +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +q +q +q +q +q +q +q +q +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(46,1,1) = {" +C +P +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +q +q +q +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(47,1,1) = {" +C +P +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(48,1,1) = {" +C +P +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +q +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(49,1,1) = {" +C +P +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +c +c +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(50,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +c +c +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(51,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +c +c +c +c +c +c +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(52,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(53,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +q +q +q +q +q +q +q +c +c +c +q +q +q +q +c +c +c +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(54,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +q +q +q +q +q +q +q +c +c +c +c +q +q +c +c +c +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(55,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(56,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(57,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(58,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(59,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(60,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(61,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(62,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(63,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(64,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(65,1,1) = {" +C +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +q +q +q +q +q +q +q +q +q +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +C +"} +(66,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +C +"} +(67,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +C +"} +(68,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(69,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(70,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(71,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(72,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +u +u +u +u +u +u +u +u +u +u +u +u +A +u +u +u +u +u +u +u +u +u +u +u +u +u +u +N +q +q +q +N +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(73,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +N +N +N +N +N +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(74,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +N +N +N +N +N +c +c +c +c +q +q +q +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(75,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +N +q +q +q +N +c +c +c +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(76,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +c +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(77,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(78,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(79,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(80,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(81,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +q +q +q +q +N +N +N +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(82,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +P +P +C +"} +(83,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +P +P +C +"} +(84,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +u +u +u +u +u +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +P +P +C +"} +(85,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +P +P +C +"} +(86,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +P +C +"} +(87,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(88,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(89,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(90,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +q +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(91,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +q +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(92,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(93,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +q +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(94,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(95,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +P +P +P +P +P +P +C +"} +(96,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +C +"} +(97,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +c +c +c +c +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +n +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +C +"} +(98,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +q +q +q +c +c +c +c +c +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +C +"} +(99,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +c +c +c +c +c +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +C +"} +(100,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +q +q +q +q +q +c +c +c +c +c +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +P +P +q +P +P +P +q +q +P +C +"} +(101,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +q +q +q +q +c +c +c +c +c +N +N +N +N +q +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(102,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +c +c +c +c +c +N +N +N +q +q +q +N +N +N +N +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(103,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +q +q +q +q +c +c +c +c +c +c +N +N +q +q +q +q +q +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(104,1,1) = {" +C +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(105,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +q +q +q +q +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(106,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(107,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +N +q +N +N +q +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(108,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +N +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(109,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +N +N +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(110,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +N +N +N +N +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(111,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +N +N +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(112,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(113,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(114,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +q +P +P +P +C +"} +(115,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +C +"} +(116,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +C +"} +(117,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +C +"} +(118,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +C +"} +(119,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +C +"} +(120,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(121,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(122,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(123,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +C +"} +(124,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(125,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(126,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +c +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(127,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +c +c +c +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(128,1,1) = {" +C +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(129,1,1) = {" +C +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(130,1,1) = {" +C +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(131,1,1) = {" +C +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(132,1,1) = {" +C +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +C +"} +(133,1,1) = {" +C +P +P +P +P +P +P +P +q +q +q +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +C +"} +(134,1,1) = {" +C +P +P +P +P +P +P +P +q +q +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +C +"} +(135,1,1) = {" +C +P +P +P +P +P +P +q +q +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +C +"} +(136,1,1) = {" +C +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +q +q +q +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +C +"} +(137,1,1) = {" +C +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +C +"} +(138,1,1) = {" +C +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +q +q +q +q +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +C +"} +(139,1,1) = {" +C +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +P +C +"} +(140,1,1) = {" +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +C +"} diff --git a/maps/om_adventure/pois/alienchamber1.dmm b/maps/om_adventure/pois/alienchamber1.dmm new file mode 100644 index 0000000000..40aae71e2c --- /dev/null +++ b/maps/om_adventure/pois/alienchamber1.dmm @@ -0,0 +1,151 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/alienchamber1) +"e" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber1) +"f" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber1) +"n" = ( +/turf/template_noop, +/area/template_noop) +"x" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber1) +"D" = ( +/obj/structure/table/alien, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber1) +"P" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber1) +"Z" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber1) + +(1,1,1) = {" +n +n +n +a +a +a +a +a +a +a +"} +(2,1,1) = {" +n +n +n +a +Z +Z +x +x +x +a +"} +(3,1,1) = {" +n +n +n +a +Z +x +e +x +x +a +"} +(4,1,1) = {" +a +a +a +a +x +P +P +e +x +a +"} +(5,1,1) = {" +a +D +Z +x +x +x +P +x +Z +a +"} +(6,1,1) = {" +a +Z +x +P +x +x +x +Z +D +a +"} +(7,1,1) = {" +a +x +e +f +P +x +a +a +a +a +"} +(8,1,1) = {" +a +x +x +e +x +Z +a +n +n +n +"} +(9,1,1) = {" +a +x +x +x +Z +Z +a +n +n +n +"} +(10,1,1) = {" +a +a +a +a +a +a +a +n +n +n +"} diff --git a/maps/om_adventure/pois/alienchamber2.dmm b/maps/om_adventure/pois/alienchamber2.dmm new file mode 100644 index 0000000000..8366c7736a --- /dev/null +++ b/maps/om_adventure/pois/alienchamber2.dmm @@ -0,0 +1,261 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"i" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) +"q" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber2) +"u" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber2) +"x" = ( +/obj/random/awayloot/looseloot, +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) +"H" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber2) +"M" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) +"P" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/alienchamber2) +"Q" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) +"W" = ( +/obj/structure/table/alien, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber2) + +(1,1,1) = {" +a +a +a +a +P +P +P +P +P +P +a +"} +(2,1,1) = {" +a +a +a +a +P +M +M +M +x +P +P +"} +(3,1,1) = {" +a +a +a +a +P +x +i +q +i +i +P +"} +(4,1,1) = {" +a +a +a +a +P +M +i +i +u +i +P +"} +(5,1,1) = {" +a +P +P +P +P +P +P +i +i +i +P +"} +(6,1,1) = {" +P +P +W +M +M +i +P +i +i +i +P +"} +(7,1,1) = {" +P +i +i +i +i +i +P +P +Q +P +P +"} +(8,1,1) = {" +P +i +i +u +i +i +P +i +i +i +P +"} +(9,1,1) = {" +P +i +q +H +u +i +Q +i +q +i +P +"} +(10,1,1) = {" +P +i +i +u +i +i +P +i +i +i +P +"} +(11,1,1) = {" +P +i +i +i +i +i +P +P +Q +P +P +"} +(12,1,1) = {" +P +P +M +x +M +i +P +i +i +i +P +"} +(13,1,1) = {" +a +P +P +P +P +P +P +i +i +i +P +"} +(14,1,1) = {" +a +a +a +a +P +M +i +i +u +i +P +"} +(15,1,1) = {" +a +a +a +a +P +x +i +q +i +i +P +"} +(16,1,1) = {" +a +a +a +a +P +M +i +i +x +P +P +"} +(17,1,1) = {" +a +a +a +a +P +P +P +P +P +P +a +"} diff --git a/maps/om_adventure/pois/alienchamber3.dmm b/maps/om_adventure/pois/alienchamber3.dmm new file mode 100644 index 0000000000..a8c3a50974 --- /dev/null +++ b/maps/om_adventure/pois/alienchamber3.dmm @@ -0,0 +1,221 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber3) +"f" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber3) +"r" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/alienchamber3) +"P" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber3) +"V" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber3) +"X" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber3) + +(1,1,1) = {" +a +a +a +a +a +r +r +r +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +r +r +P +r +r +a +a +a +a +"} +(3,1,1) = {" +a +a +a +r +r +P +P +P +r +r +a +a +a +"} +(4,1,1) = {" +a +a +r +r +P +P +c +P +P +r +r +a +a +"} +(5,1,1) = {" +a +r +r +P +V +P +X +P +V +P +r +r +a +"} +(6,1,1) = {" +r +r +P +P +P +P +c +P +P +P +P +r +r +"} +(7,1,1) = {" +r +P +P +c +X +c +f +c +X +c +P +P +r +"} +(8,1,1) = {" +r +r +P +P +P +P +c +P +P +P +P +r +r +"} +(9,1,1) = {" +a +r +r +P +P +V +X +P +P +P +r +r +a +"} +(10,1,1) = {" +a +a +r +r +P +P +c +P +P +r +r +a +a +"} +(11,1,1) = {" +a +a +a +r +r +P +P +P +r +r +a +a +a +"} +(12,1,1) = {" +a +a +a +a +r +r +P +r +r +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +r +r +r +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/alienchamber4.dmm b/maps/om_adventure/pois/alienchamber4.dmm new file mode 100644 index 0000000000..a72674a530 --- /dev/null +++ b/maps/om_adventure/pois/alienchamber4.dmm @@ -0,0 +1,295 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"h" = ( +/obj/random/awayloot/looseloot, +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) +"n" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber4) +"o" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber4) +"q" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) +"s" = ( +/obj/structure/table/alien, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) +"L" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/alienchamber4) +"N" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alien/blue, +/area/om_adventure/poi/alienchamber4) +"O" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) +"R" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/om_adventure/poi/alienchamber4) + +(1,1,1) = {" +a +a +L +a +a +a +L +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +L +L +L +L +L +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +L +L +L +q +h +q +L +L +L +a +a +a +a +a +a +"} +(4,1,1) = {" +a +L +q +O +O +O +O +L +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +L +h +O +n +O +O +L +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +L +O +O +O +O +O +L +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +L +O +O +O +O +O +L +a +a +a +a +L +a +a +"} +(8,1,1) = {" +a +L +O +O +O +O +O +L +L +L +L +L +L +a +a +"} +(9,1,1) = {" +a +L +O +O +R +O +O +O +O +O +O +O +L +L +L +"} +(10,1,1) = {" +a +L +O +O +o +O +O +O +O +O +O +O +s +L +a +"} +(11,1,1) = {" +a +L +q +o +N +o +R +O +O +O +n +O +q +L +a +"} +(12,1,1) = {" +a +L +q +O +o +O +O +O +O +O +O +O +q +L +a +"} +(13,1,1) = {" +L +L +L +s +q +O +O +O +O +O +q +q +L +L +L +"} +(14,1,1) = {" +a +a +L +L +L +L +L +L +L +L +L +L +L +a +a +"} +(15,1,1) = {" +a +a +L +a +a +a +a +a +a +a +a +a +L +a +a +"} diff --git a/maps/om_adventure/pois/cabin1.dmm b/maps/om_adventure/pois/cabin1.dmm new file mode 100644 index 0000000000..0adc084576 --- /dev/null +++ b/maps/om_adventure/pois/cabin1.dmm @@ -0,0 +1,324 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/obj/random/tech_supply, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin1) +"c" = ( +/obj/structure/table/reinforced, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"d" = ( +/obj/structure/table/reinforced, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"f" = ( +/obj/structure/closet/secure_closet/freezer/fridge, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/meat, +/obj/random/snack, +/obj/random/snack, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"g" = ( +/obj/structure/bed/chair/sofa/brown, +/obj/random/snack, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"i" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"j" = ( +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin1) +"k" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/flame/candle, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"r" = ( +/obj/structure/bookcase, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"s" = ( +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"t" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"u" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/plating, +/area/om_adventure/poi/cabin1) +"v" = ( +/obj/item/weapon/bedsheet/browndouble, +/obj/structure/bed/double/padded, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin1) +"w" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin1) +"x" = ( +/obj/structure/table/reinforced, +/obj/random/snack, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"z" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"B" = ( +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin1) +"C" = ( +/obj/structure/bed/chair/sofa/brown/corner, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"D" = ( +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin1) +"F" = ( +/obj/structure/table/darkglass, +/obj/random/awayloot/looseloot, +/obj/item/weapon/flame/candle, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"H" = ( +/obj/structure/table/woodentable, +/obj/random/tech_supply, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"I" = ( +/obj/structure/closet, +/obj/random/awayloot/looseloot, +/obj/random/awayloot/looseloot, +/obj/random/tech_supply, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin1) +"L" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"Q" = ( +/turf/simulated/wall/log, +/area/om_adventure/poi/cabin1) +"R" = ( +/obj/structure/bed/chair/sofa/brown/left{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"S" = ( +/obj/structure/bed/chair/sofa/brown/right, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) +"T" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin1) +"X" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/om_adventure/poi/cabin1) +"Z" = ( +/obj/structure/table/woodentable, +/obj/random/tech_supply/component, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +Q +Q +Q +Q +Q +Q +Q +X +Q +Q +a +"} +(3,1,1) = {" +a +Q +x +k +x +d +Q +b +j +v +Q +a +"} +(4,1,1) = {" +a +X +d +i +D +D +Q +I +j +j +X +a +"} +(5,1,1) = {" +a +X +c +D +D +D +z +j +T +j +X +a +"} +(6,1,1) = {" +a +Q +f +D +D +D +Q +j +j +j +Q +a +"} +(7,1,1) = {" +a +Q +Q +k +D +Q +Q +Q +Q +Q +Q +a +"} +(8,1,1) = {" +a +Q +L +s +s +s +r +Q +a +a +a +a +"} +(9,1,1) = {" +a +Q +S +s +s +s +H +Q +B +a +a +a +"} +(10,1,1) = {" +a +Q +g +s +F +s +s +u +B +B +w +a +"} +(11,1,1) = {" +a +Q +C +R +t +s +Z +Q +B +a +a +B +"} +(12,1,1) = {" +a +Q +Q +X +X +X +Q +Q +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/cabin2.dmm b/maps/om_adventure/pois/cabin2.dmm new file mode 100644 index 0000000000..31b9b10e2d --- /dev/null +++ b/maps/om_adventure/pois/cabin2.dmm @@ -0,0 +1,404 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"e" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/cabin2) +"g" = ( +/obj/structure/table/rack/shelf, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/obj/random/mre, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"i" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/sidewalk/side, +/area/om_adventure/poi/cabin2) +"k" = ( +/turf/simulated/wall/log, +/area/om_adventure/poi/cabin2) +"l" = ( +/obj/structure/table/steel, +/obj/random/multiple/underdark/treasure, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"n" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"p" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"q" = ( +/obj/structure/table/steel, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"r" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"s" = ( +/obj/structure/bed/chair/sofa/corp/right, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"t" = ( +/obj/structure/bed/chair/sofa/brown/corner, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"u" = ( +/obj/structure/toilet/prison{ + dir = 8 + }, +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/techmaint, +/area/om_adventure/poi/cabin2) +"v" = ( +/obj/structure/bed/chair/sofa/brown/left{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"w" = ( +/obj/structure/table/rack, +/obj/random/maintenance, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"x" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/browndouble, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin2) +"y" = ( +/obj/structure/table/steel, +/obj/random/material, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"z" = ( +/turf/simulated/floor/outdoors/sidewalk/side, +/area/om_adventure/poi/cabin2) +"A" = ( +/obj/structure/bed/chair/sofa/brown, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"B" = ( +/obj/structure/table/rack, +/obj/random/maintenance, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"D" = ( +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"E" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin2) +"F" = ( +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin2) +"H" = ( +/obj/structure/table/woodentable, +/obj/random/snack, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"I" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/obj/random/maintenance, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"J" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"K" = ( +/obj/structure/bed/chair/sofa/brown/right{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"L" = ( +/obj/structure/table/woodentable, +/obj/random/maintenance, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"M" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/om_adventure/poi/cabin2) +"N" = ( +/obj/structure/sink{ + pixel_y = 18 + }, +/turf/simulated/floor/tiled/techmaint, +/area/om_adventure/poi/cabin2) +"O" = ( +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"P" = ( +/obj/structure/bed/chair/sofa/brown/corner{ + dir = 1 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"Q" = ( +/turf/simulated/floor/carpet/bcarpet, +/area/om_adventure/poi/cabin2) +"S" = ( +/turf/simulated/floor/tiled/techmaint, +/area/om_adventure/poi/cabin2) +"T" = ( +/turf/simulated/floor/carpet, +/area/om_adventure/poi/cabin2) +"V" = ( +/obj/structure/table/rack, +/obj/random/awayloot/looseloot, +/obj/random/tech_supply, +/obj/random/tech_supply, +/turf/simulated/floor/bmarble, +/area/om_adventure/poi/cabin2) +"X" = ( +/obj/structure/bed/chair/sofa/corp/left, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) +"Y" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/obj/random/maintenance, +/obj/random/maintenance, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin2) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +F +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +k +k +M +M +k +k +a +a +a +k +k +M +M +M +k +k +a +"} +(3,1,1) = {" +a +k +P +K +Q +B +k +a +i +a +k +I +D +T +T +x +k +a +"} +(4,1,1) = {" +a +k +A +H +r +Q +M +a +z +a +M +L +D +T +E +T +M +a +"} +(5,1,1) = {" +a +k +t +v +Q +w +k +k +e +k +k +D +D +T +T +T +M +a +"} +(6,1,1) = {" +a +k +k +k +e +k +k +V +O +V +k +D +D +J +p +L +k +a +"} +(7,1,1) = {" +a +k +Y +L +D +D +k +g +c +O +k +D +D +k +k +k +k +a +"} +(8,1,1) = {" +a +M +s +n +D +D +e +O +O +O +e +D +D +e +S +S +k +a +"} +(9,1,1) = {" +a +k +X +D +D +p +k +y +q +l +k +p +L +k +N +u +k +a +"} +(10,1,1) = {" +a +k +k +M +M +k +k +k +k +k +k +k +k +k +k +k +k +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/cabin3.dmm b/maps/om_adventure/pois/cabin3.dmm new file mode 100644 index 0000000000..02adedf2c1 --- /dev/null +++ b/maps/om_adventure/pois/cabin3.dmm @@ -0,0 +1,161 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/wall/wood, +/area/om_adventure/poi/cabin3) +"d" = ( +/obj/structure/bonfire, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin3) +"i" = ( +/turf/template_noop, +/area/template_noop) +"k" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin3) +"n" = ( +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin3) +"r" = ( +/obj/effect/decal/remains, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin3) +"z" = ( +/turf/template_noop, +/area/om_adventure/poi/cabin3) +"M" = ( +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin3) +"S" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wood, +/area/om_adventure/poi/cabin3) +"T" = ( +/obj/tether_away_spawner/spookyland, +/turf/template_noop, +/area/om_adventure/poi/cabin3) +"V" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/cabin3) + +(1,1,1) = {" +a +a +a +a +z +z +z +a +a +a +"} +(2,1,1) = {" +a +k +M +M +z +T +z +z +M +a +"} +(3,1,1) = {" +z +z +M +M +z +z +n +k +M +a +"} +(4,1,1) = {" +z +z +n +M +M +n +n +S +M +a +"} +(5,1,1) = {" +z +T +n +n +r +n +M +M +M +a +"} +(6,1,1) = {" +z +z +n +n +n +n +a +a +a +a +"} +(7,1,1) = {" +a +M +z +n +n +n +a +i +i +i +"} +(8,1,1) = {" +z +z +k +z +n +n +a +i +i +i +"} +(9,1,1) = {" +a +M +M +z +V +n +a +i +d +i +"} +(10,1,1) = {" +a +a +a +z +z +z +a +i +i +i +"} diff --git a/maps/om_adventure/pois/camp.dmm b/maps/om_adventure/pois/camp.dmm new file mode 100644 index 0000000000..13960f3854 --- /dev/null +++ b/maps/om_adventure/pois/camp.dmm @@ -0,0 +1,258 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"n" = ( +/obj/structure/table/rack/steel, +/obj/fiftyspawner/log, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) +"x" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) +"y" = ( +/obj/structure/flora/tree/bigtree, +/turf/template_noop, +/area/om_adventure/poi/camp) +"z" = ( +/obj/structure/table/rack/steel, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) +"A" = ( +/obj/structure/bonfire, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) +"H" = ( +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) +"M" = ( +/turf/simulated/wall/log, +/area/om_adventure/poi/camp) +"U" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/box/matches, +/turf/simulated/floor/outdoors/newdirt, +/area/om_adventure/poi/camp) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +M +M +M +M +M +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +y +a +a +a +M +n +z +U +M +a +H +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +H +a +M +H +x +H +M +a +a +a +"} +(4,1,1) = {" +a +H +a +a +a +a +a +x +H +H +a +a +H +a +a +H +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +H +H +H +H +H +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +H +H +a +H +H +H +A +H +H +H +a +H +H +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +H +H +H +H +H +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +H +H +x +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +y +a +a +H +a +a +a +a +y +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/darkstar.dmm b/maps/om_adventure/pois/darkstar.dmm new file mode 100644 index 0000000000..a41ef6cb59 --- /dev/null +++ b/maps/om_adventure/pois/darkstar.dmm @@ -0,0 +1,93 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"e" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darkstar) +"z" = ( +/mob/living/simple_mob/vore/alienanimals/space_ghost, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darkstar) + +(1,1,1) = {" +a +a +a +e +a +a +a +"} +(2,1,1) = {" +a +e +a +a +a +e +a +"} +(3,1,1) = {" +a +a +a +e +a +a +a +"} +(4,1,1) = {" +a +a +e +e +e +a +a +"} +(5,1,1) = {" +e +e +e +z +e +e +e +"} +(6,1,1) = {" +a +a +e +e +e +a +a +"} +(7,1,1) = {" +a +a +a +e +a +a +a +"} +(8,1,1) = {" +a +e +a +a +a +e +a +"} +(9,1,1) = {" +a +a +a +e +a +a +a +"} diff --git a/maps/om_adventure/pois/darktear1.dmm b/maps/om_adventure/pois/darktear1.dmm new file mode 100644 index 0000000000..224bb457bf --- /dev/null +++ b/maps/om_adventure/pois/darktear1.dmm @@ -0,0 +1,93 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear1) +"I" = ( +/turf/template_noop, +/area/template_noop) +"Z" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear1) + +(1,1,1) = {" +I +I +I +I +I +I +a +"} +(2,1,1) = {" +I +I +a +I +I +a +I +"} +(3,1,1) = {" +I +I +I +I +a +a +I +"} +(4,1,1) = {" +I +I +I +a +a +a +I +"} +(5,1,1) = {" +I +I +a +Z +a +I +I +"} +(6,1,1) = {" +I +I +a +a +a +I +I +"} +(7,1,1) = {" +I +a +a +a +I +I +I +"} +(8,1,1) = {" +I +a +I +I +I +a +I +"} +(9,1,1) = {" +a +I +I +I +I +I +I +"} diff --git a/maps/om_adventure/pois/darktear2.dmm b/maps/om_adventure/pois/darktear2.dmm new file mode 100644 index 0000000000..a4932cf5cf --- /dev/null +++ b/maps/om_adventure/pois/darktear2.dmm @@ -0,0 +1,93 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear2) +"Q" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear2) +"S" = ( +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +a +S +S +S +S +S +S +"} +(2,1,1) = {" +S +a +a +S +S +a +S +"} +(3,1,1) = {" +S +Q +a +S +S +S +S +"} +(4,1,1) = {" +S +a +a +a +a +S +S +"} +(5,1,1) = {" +S +S +a +a +a +a +S +"} +(6,1,1) = {" +S +S +a +a +a +a +S +"} +(7,1,1) = {" +S +S +a +a +Q +a +S +"} +(8,1,1) = {" +S +a +S +a +a +a +S +"} +(9,1,1) = {" +S +S +S +S +S +S +a +"} diff --git a/maps/om_adventure/pois/darktear3.dmm b/maps/om_adventure/pois/darktear3.dmm new file mode 100644 index 0000000000..89a5dec553 --- /dev/null +++ b/maps/om_adventure/pois/darktear3.dmm @@ -0,0 +1,89 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear3) +"Y" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear3) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +v +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +v +v +v +a +a +a +a +v +"} +(4,1,1) = {" +a +a +v +v +v +v +v +v +a +"} +(5,1,1) = {" +a +a +v +v +Y +v +v +v +a +"} +(6,1,1) = {" +a +a +a +a +v +v +v +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/darktear4.dmm b/maps/om_adventure/pois/darktear4.dmm new file mode 100644 index 0000000000..655e97b230 --- /dev/null +++ b/maps/om_adventure/pois/darktear4.dmm @@ -0,0 +1,89 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"g" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear4) +"j" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/darktear4) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +j +a +a +a +a +a +a +j +"} +(3,1,1) = {" +a +a +g +j +j +j +a +j +a +"} +(4,1,1) = {" +a +j +j +j +j +j +j +j +a +"} +(5,1,1) = {" +j +a +a +a +j +j +g +a +a +"} +(6,1,1) = {" +a +a +a +a +a +j +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +j +a +a +"} diff --git a/maps/om_adventure/pois/fleshtear1.dmm b/maps/om_adventure/pois/fleshtear1.dmm new file mode 100644 index 0000000000..e2a3d25f18 --- /dev/null +++ b/maps/om_adventure/pois/fleshtear1.dmm @@ -0,0 +1,166 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/mob/living/simple_mob/creature, +/turf/simulated/floor/flesh{ + base_icon = 'icons/turf/stomach_vr.dmi' + }, +/area/om_adventure/poi/fleshtear1) +"K" = ( +/turf/simulated/floor/flesh{ + base_icon = 'icons/turf/stomach_vr.dmi' + }, +/area/om_adventure/poi/fleshtear1) + +(1,1,1) = {" +a +a +a +K +K +a +a +a +a +K +a +a +a +"} +(2,1,1) = {" +a +a +K +K +a +a +a +K +K +K +a +K +a +"} +(3,1,1) = {" +a +a +a +a +a +K +K +K +K +K +a +K +K +"} +(4,1,1) = {" +K +K +K +K +K +K +b +K +K +a +a +a +a +"} +(5,1,1) = {" +K +K +K +K +K +K +K +K +K +a +a +a +a +"} +(6,1,1) = {" +a +K +K +K +K +K +K +K +a +a +a +K +a +"} +(7,1,1) = {" +a +a +K +b +K +K +K +K +K +a +K +K +a +"} +(8,1,1) = {" +K +a +K +K +K +K +K +K +K +a +K +a +a +"} +(9,1,1) = {" +K +a +a +K +K +K +K +a +a +a +a +a +a +"} +(10,1,1) = {" +a +K +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/fleshtear2.dmm b/maps/om_adventure/pois/fleshtear2.dmm new file mode 100644 index 0000000000..19d435ce33 --- /dev/null +++ b/maps/om_adventure/pois/fleshtear2.dmm @@ -0,0 +1,79 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/flesh{ + base_icon = 'icons/turf/stomach_vr.dmi' + }, +/area/om_adventure/poi/fleshtear2) +"B" = ( +/turf/template_noop, +/area/template_noop) +"H" = ( +/mob/living/simple_mob/creature, +/turf/simulated/floor/flesh{ + base_icon = 'icons/turf/stomach_vr.dmi' + }, +/area/om_adventure/poi/fleshtear2) + +(1,1,1) = {" +B +B +B +B +B +a +a +"} +(2,1,1) = {" +B +a +a +a +a +a +a +"} +(3,1,1) = {" +B +B +a +a +a +a +B +"} +(4,1,1) = {" +B +B +a +H +a +a +B +"} +(5,1,1) = {" +B +a +a +a +a +a +B +"} +(6,1,1) = {" +a +a +a +a +a +B +B +"} +(7,1,1) = {" +a +a +B +B +B +B +B +"} diff --git a/maps/om_adventure/pois/fleshtear3.dmm b/maps/om_adventure/pois/fleshtear3.dmm new file mode 100644 index 0000000000..1c77a34996 --- /dev/null +++ b/maps/om_adventure/pois/fleshtear3.dmm @@ -0,0 +1,115 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"M" = ( +/mob/living/simple_mob/creature, +/turf/simulated/floor/flesh{ + base_icon = 'icons/turf/stomach_vr.dmi' + }, +/area/om_adventure/poi/fleshtear3) +"Q" = ( +/turf/simulated/floor/flesh{ + base_icon = 'icons/turf/stomach_vr.dmi' + }, +/area/om_adventure/poi/fleshtear3) + +(1,1,1) = {" +a +a +Q +Q +Q +a +a +a +a +"} +(2,1,1) = {" +a +Q +a +a +Q +Q +Q +Q +a +"} +(3,1,1) = {" +Q +Q +Q +a +a +a +a +Q +a +"} +(4,1,1) = {" +Q +a +Q +Q +Q +Q +a +Q +Q +"} +(5,1,1) = {" +Q +a +Q +M +Q +Q +a +Q +Q +"} +(6,1,1) = {" +Q +a +Q +Q +Q +a +a +a +Q +"} +(7,1,1) = {" +Q +Q +a +Q +Q +Q +a +Q +Q +"} +(8,1,1) = {" +a +Q +Q +a +Q +Q +Q +Q +Q +"} +(9,1,1) = {" +a +a +Q +Q +a +Q +Q +Q +a +"} diff --git a/maps/om_adventure/pois/fleshtear4.dmm b/maps/om_adventure/pois/fleshtear4.dmm new file mode 100644 index 0000000000..077d29a8b7 --- /dev/null +++ b/maps/om_adventure/pois/fleshtear4.dmm @@ -0,0 +1,86 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"m" = ( +/turf/simulated/floor/flesh{ + base_icon = 'icons/turf/stomach_vr.dmi' + }, +/area/om_adventure/poi/fleshtear4) +"n" = ( +/mob/living/simple_mob/creature, +/turf/simulated/floor/flesh{ + base_icon = 'icons/turf/stomach_vr.dmi' + }, +/area/om_adventure/poi/fleshtear4) + +(1,1,1) = {" +m +m +a +a +a +"} +(2,1,1) = {" +a +m +m +m +a +"} +(3,1,1) = {" +a +a +n +m +a +"} +(4,1,1) = {" +a +a +a +m +m +"} +(5,1,1) = {" +a +a +m +m +m +"} +(6,1,1) = {" +a +a +m +m +m +"} +(7,1,1) = {" +a +m +m +m +a +"} +(8,1,1) = {" +a +n +m +m +a +"} +(9,1,1) = {" +m +m +a +a +a +"} +(10,1,1) = {" +m +a +a +a +a +"} diff --git a/maps/om_adventure/pois/medicalcenter.dmm b/maps/om_adventure/pois/medicalcenter.dmm new file mode 100644 index 0000000000..aea560a0af --- /dev/null +++ b/maps/om_adventure/pois/medicalcenter.dmm @@ -0,0 +1,328 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"j" = ( +/obj/machinery/door/airlock/angled_bay/standard/glass, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/medicalcenter) +"k" = ( +/obj/random/pottedplant, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"m" = ( +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/medical, +/obj/structure/curtain/medical, +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"q" = ( +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"r" = ( +/obj/structure/salvageable/machine, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"t" = ( +/obj/effect/low_wall_spawner/eris/reinforced/rphoron, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/medicalcenter) +"v" = ( +/obj/structure/table/glass, +/obj/structure/salvageable/personal, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"y" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"z" = ( +/obj/structure/bed/chair/sofa/blue/left{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"A" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/medicalcenter) +"C" = ( +/obj/structure/bed/chair/sofa/blue/right, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"D" = ( +/obj/structure/table/glass, +/obj/random/medical, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"E" = ( +/obj/structure/salvageable/computer, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"G" = ( +/obj/structure/table/glass, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"H" = ( +/obj/structure/table/glass, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"I" = ( +/obj/structure/bed/padded, +/obj/item/weapon/bedsheet/medical, +/obj/structure/curtain/medical, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"P" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"Q" = ( +/obj/machinery/door/airlock/angled_bay/standard/glass{ + dir = 4 + }, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/medicalcenter) +"T" = ( +/obj/structure/table/glass, +/obj/random/medical, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"W" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"X" = ( +/obj/structure/table/glass, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) +"Z" = ( +/obj/structure/bed/chair/sofa/blue/corner, +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/eris/white/orangecorner, +/area/om_adventure/poi/medicalcenter) + +(1,1,1) = {" +a +a +a +A +a +A +a +a +A +a +A +a +"} +(2,1,1) = {" +a +a +A +A +A +A +t +t +A +A +A +A +"} +(3,1,1) = {" +a +a +a +A +C +q +q +q +q +H +A +a +"} +(4,1,1) = {" +a +A +a +A +Z +z +q +q +q +T +A +a +"} +(5,1,1) = {" +A +A +A +A +A +A +k +y +q +X +A +a +"} +(6,1,1) = {" +a +A +E +G +q +A +A +A +Q +A +A +A +"} +(7,1,1) = {" +a +t +q +H +q +A +q +W +q +k +A +a +"} +(8,1,1) = {" +a +A +q +P +q +j +q +q +P +q +j +a +"} +(9,1,1) = {" +a +t +q +T +q +A +q +y +q +k +A +a +"} +(10,1,1) = {" +a +A +r +v +q +A +A +A +Q +A +A +A +"} +(11,1,1) = {" +A +A +A +A +A +A +m +D +q +I +A +a +"} +(12,1,1) = {" +a +A +a +A +k +q +q +q +q +k +A +a +"} +(13,1,1) = {" +a +a +a +A +H +I +H +I +T +I +A +a +"} +(14,1,1) = {" +a +a +A +A +A +A +t +t +A +A +A +A +"} +(15,1,1) = {" +a +a +a +A +a +A +a +a +A +a +A +a +"} diff --git a/maps/om_adventure/pois/shippart1.dmm b/maps/om_adventure/pois/shippart1.dmm new file mode 100644 index 0000000000..7d2831eade --- /dev/null +++ b/maps/om_adventure/pois/shippart1.dmm @@ -0,0 +1,396 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/floor/tiled/eris/dark/techfloor, +/area/om_adventure/poi/shippart1) +"d" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"g" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/shippart1) +"h" = ( +/obj/random/awayloot/looseloot, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"j" = ( +/obj/tether_away_spawner/spookyland, +/turf/template_noop, +/area/template_noop) +"p" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"q" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/tiled/eris/dark/techfloor, +/area/om_adventure/poi/shippart1) +"r" = ( +/obj/item/weapon/material/shard, +/turf/template_noop, +/area/template_noop) +"s" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/techfloor, +/area/om_adventure/poi/shippart1) +"t" = ( +/obj/structure/frame/computer, +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"v" = ( +/obj/effect/floor_decal/rust, +/obj/random/tech_supply/component, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"w" = ( +/obj/effect/decal/remains/tajaran, +/turf/template_noop, +/area/template_noop) +"D" = ( +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"F" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shippart1) +"I" = ( +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"J" = ( +/obj/structure/salvageable/bliss, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"M" = ( +/obj/item/weapon/material/shard, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating/eris/under, +/area/om_adventure/poi/shippart1) +"O" = ( +/obj/effect/decal/remains/ribcage, +/turf/template_noop, +/area/template_noop) +"Q" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"R" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) +"T" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shippart1) +"X" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/template_noop, +/area/template_noop) +"Z" = ( +/obj/effect/decal/remains/deer, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shippart1) + +(1,1,1) = {" +a +a +a +a +a +a +F +a +a +a +F +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +F +j +a +X +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +X +a +a +F +a +a +X +a +F +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +w +a +F +F +g +g +v +g +a +r +j +a +F +a +a +a +a +a +"} +(5,1,1) = {" +X +a +X +a +F +g +g +g +t +I +p +F +F +F +F +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +F +g +M +g +d +D +Z +D +I +I +F +F +F +F +F +a +a +F +F +"} +(7,1,1) = {" +a +F +T +M +t +b +q +s +b +b +b +I +I +F +F +F +F +F +a +a +a +"} +(8,1,1) = {" +a +r +F +g +I +g +R +Q +d +D +M +v +F +F +F +F +F +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +F +g +g +g +J +I +h +D +I +I +F +a +a +a +a +a +F +"} +(10,1,1) = {" +a +a +j +T +a +F +F +g +g +I +g +g +g +g +a +a +F +F +F +a +a +"} +(11,1,1) = {" +a +X +a +a +X +a +a +a +a +a +T +a +a +a +j +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +a +X +a +a +a +O +a +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +F +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/shuttlewreck1.dmm b/maps/om_adventure/pois/shuttlewreck1.dmm new file mode 100644 index 0000000000..c57959fc95 --- /dev/null +++ b/maps/om_adventure/pois/shuttlewreck1.dmm @@ -0,0 +1,152 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"e" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck1) +"g" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck1) +"i" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck1) +"m" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck1) +"s" = ( +/obj/structure/shuttle/window, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck1) +"t" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck1) +"v" = ( +/obj/random/tech_supply/component, +/turf/template_noop, +/area/template_noop) +"D" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck1) +"M" = ( +/turf/simulated/shuttle/wall, +/area/om_adventure/poi/shuttlewreck1) +"P" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck1) +"W" = ( +/obj/random/tech_supply, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +a +a +a +a +a +a +W +a +a +"} +(2,1,1) = {" +a +a +a +e +a +a +a +e +a +"} +(3,1,1) = {" +e +t +e +g +a +e +a +a +a +"} +(4,1,1) = {" +a +e +M +M +M +M +D +g +a +"} +(5,1,1) = {" +e +e +s +P +m +i +e +e +e +"} +(6,1,1) = {" +a +e +M +M +M +M +D +t +a +"} +(7,1,1) = {" +a +e +e +e +a +e +v +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/shuttlewreck2.dmm b/maps/om_adventure/pois/shuttlewreck2.dmm new file mode 100644 index 0000000000..c741ee7055 --- /dev/null +++ b/maps/om_adventure/pois/shuttlewreck2.dmm @@ -0,0 +1,330 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light{ + dir = 8 + }, +/obj/random/tech_supply/component, +/obj/random/tech_supply, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"e" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 0 + }, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"g" = ( +/obj/structure/cable/green{ + icon_state = "4-10" + }, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"h" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/shuttle/wall, +/area/om_adventure/poi/shuttlewreck2) +"l" = ( +/obj/structure/window/reinforced, +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"m" = ( +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"n" = ( +/obj/structure/table/steel_reinforced, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"o" = ( +/obj/structure/frame/computer, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"p" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/light{ + dir = 4 + }, +/obj/random/tech_supply, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"q" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"r" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"s" = ( +/obj/machinery/door/airlock/external, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"v" = ( +/obj/structure/cable/green, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"w" = ( +/obj/tether_away_spawner/spookyland, +/turf/template_noop, +/area/template_noop) +"x" = ( +/obj/machinery/power/port_gen/pacman, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"y" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/om_adventure/poi/shuttlewreck2) +"A" = ( +/turf/simulated/shuttle/wall, +/area/om_adventure/poi/shuttlewreck2) +"B" = ( +/obj/structure/table/steel_reinforced, +/obj/random/tech_supply/component, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"D" = ( +/obj/structure/cable/green{ + icon_state = "2-5" + }, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"E" = ( +/obj/structure/table/rack/steel, +/obj/random/tech_supply/component, +/obj/random/tech_supply/component, +/obj/random/tech_supply/component, +/obj/random/tech_supply/component, +/obj/random/tech_supply/component, +/obj/random/tech_supply, +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"J" = ( +/obj/structure/table/rack/steel, +/obj/item/frame/apc, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"K" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/tank/phoron, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"N" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/shuttle/wall, +/area/om_adventure/poi/shuttlewreck2) +"P" = ( +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"R" = ( +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron{ + start_pressure = 0 + }, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"T" = ( +/obj/structure/shuttle/window, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) +"U" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck2) +"V" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck2) +"W" = ( +/obj/structure/shuttle/engine/heater{ + dir = 1 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck2) + +(1,1,1) = {" +a +a +a +a +a +a +U +a +a +a +"} +(2,1,1) = {" +a +w +U +A +A +A +N +A +A +a +"} +(3,1,1) = {" +a +a +A +A +K +E +e +W +r +a +"} +(4,1,1) = {" +a +A +A +P +m +m +m +W +r +a +"} +(5,1,1) = {" +U +A +c +n +P +P +q +y +A +a +"} +(6,1,1) = {" +a +T +o +P +P +P +A +A +a +a +"} +(7,1,1) = {" +a +T +o +V +P +P +s +a +a +a +"} +(8,1,1) = {" +a +T +o +P +P +P +A +A +U +a +"} +(9,1,1) = {" +a +A +p +B +P +D +v +y +A +a +"} +(10,1,1) = {" +U +A +A +P +g +m +m +l +r +a +"} +(11,1,1) = {" +a +U +A +A +x +J +R +l +r +a +"} +(12,1,1) = {" +a +a +a +A +A +A +h +A +A +a +"} +(13,1,1) = {" +a +a +a +a +U +a +a +a +w +a +"} diff --git a/maps/om_adventure/pois/shuttlewreck3.dmm b/maps/om_adventure/pois/shuttlewreck3.dmm new file mode 100644 index 0000000000..005ceb21c9 --- /dev/null +++ b/maps/om_adventure/pois/shuttlewreck3.dmm @@ -0,0 +1,210 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck3) +"f" = ( +/obj/random/tech_supply, +/turf/template_noop, +/area/template_noop) +"h" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck3) +"k" = ( +/turf/simulated/shuttle/wall, +/area/om_adventure/poi/shuttlewreck3) +"m" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/template_noop, +/area/template_noop) +"p" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck3) +"u" = ( +/obj/item/weapon/material/shard/shrapnel, +/obj/random/awayloot/looseloot, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck3) +"x" = ( +/obj/structure/door_assembly/door_assembly_ext, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck3) +"D" = ( +/obj/random/tech_supply, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck3) +"F" = ( +/obj/structure/grille/broken, +/obj/item/weapon/material/shard, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck3) +"H" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck3) +"I" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck3) +"K" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 1 + }, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck3) +"Q" = ( +/obj/item/weapon/material/shard/shrapnel, +/obj/effect/gibspawner/human, +/obj/random/contraband/nofail, +/turf/simulated/shuttle/floor/white, +/area/om_adventure/poi/shuttlewreck3) +"S" = ( +/obj/random/contraband/nofail, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck3) +"Z" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck3) + +(1,1,1) = {" +a +a +a +h +a +a +a +"} +(2,1,1) = {" +h +a +a +h +a +a +h +"} +(3,1,1) = {" +K +a +h +h +h +a +a +"} +(4,1,1) = {" +h +a +h +h +h +f +a +"} +(5,1,1) = {" +a +h +S +h +H +a +a +"} +(6,1,1) = {" +a +a +c +h +h +a +a +"} +(7,1,1) = {" +m +h +Z +h +h +h +a +"} +(8,1,1) = {" +a +H +D +h +I +a +a +"} +(9,1,1) = {" +a +h +k +x +k +h +a +"} +(10,1,1) = {" +a +h +k +u +k +h +a +"} +(11,1,1) = {" +a +h +k +Q +k +H +m +"} +(12,1,1) = {" +a +h +k +F +k +h +a +"} +(13,1,1) = {" +a +h +p +h +p +a +h +"} +(14,1,1) = {" +a +a +a +Z +a +a +a +"} +(15,1,1) = {" +a +h +a +a +a +a +a +"} diff --git a/maps/om_adventure/pois/shuttlewreck4.dmm b/maps/om_adventure/pois/shuttlewreck4.dmm new file mode 100644 index 0000000000..28fc4367d9 --- /dev/null +++ b/maps/om_adventure/pois/shuttlewreck4.dmm @@ -0,0 +1,392 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck4) +"e" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) +"g" = ( +/obj/item/frame/apc, +/turf/template_noop, +/area/template_noop) +"h" = ( +/obj/random/tech_supply/component, +/turf/template_noop, +/area/template_noop) +"j" = ( +/turf/template_noop, +/area/template_noop) +"o" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck4) +"p" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) +"q" = ( +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) +"t" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"u" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/plating/eris/airless, +/area/om_adventure/poi/shuttlewreck4) +"v" = ( +/turf/simulated/wall/eris/r_wall, +/area/om_adventure/poi/shuttlewreck4) +"x" = ( +/turf/simulated/floor/plating/eris/airless, +/area/om_adventure/poi/shuttlewreck4) +"y" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/obj/random/tech_supply/component, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"C" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"D" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 1 + }, +/obj/random/tech_supply, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"H" = ( +/obj/random/tech_supply/component, +/turf/simulated/floor/weird_things/dark, +/area/om_adventure/poi/shuttlewreck4) +"I" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"J" = ( +/obj/machinery/door/blast/multi_tile/three_tile_ver{ + density = 0; + icon_state = "open"; + opacity = 0 + }, +/turf/simulated/floor/plating/eris/airless, +/area/om_adventure/poi/shuttlewreck4) +"K" = ( +/obj/tether_away_spawner/spookyland, +/turf/template_noop, +/area/template_noop) +"M" = ( +/obj/structure/low_wall/eris/reinforced, +/obj/structure/window/eris, +/turf/simulated/floor/plating, +/area/om_adventure/poi/shuttlewreck4) +"O" = ( +/obj/random/tech_supply, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) +"P" = ( +/obj/structure/frame/computer, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"S" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"T" = ( +/obj/random/awayloot/looseloot, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) +"V" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/tiled/eris/dark/monofloor, +/area/om_adventure/poi/shuttlewreck4) +"X" = ( +/obj/structure/bed/chair/bay/shuttle, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) +"Y" = ( +/obj/structure/bed/chair/bay/shuttle{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/techfloor_grid, +/area/om_adventure/poi/shuttlewreck4) + +(1,1,1) = {" +j +j +j +j +j +j +j +j +a +j +j +j +H +j +a +"} +(2,1,1) = {" +j +a +a +j +j +a +j +h +j +j +j +j +j +a +j +"} +(3,1,1) = {" +j +j +j +o +a +g +a +a +a +j +o +a +a +v +j +"} +(4,1,1) = {" +j +j +j +h +a +a +a +a +a +a +H +H +v +v +j +"} +(5,1,1) = {" +j +j +j +v +v +x +x +J +v +v +a +v +v +u +j +"} +(6,1,1) = {" +j +a +a +v +V +q +e +q +O +v +M +v +v +v +j +"} +(7,1,1) = {" +o +v +M +M +q +I +I +I +q +t +Y +y +v +j +j +"} +(8,1,1) = {" +j +M +P +C +q +D +v +X +q +q +T +q +M +j +j +"} +(9,1,1) = {" +a +v +M +M +e +Y +Y +Y +q +S +I +I +v +j +j +"} +(10,1,1) = {" +j +j +j +v +p +q +q +q +e +v +M +v +v +v +j +"} +(11,1,1) = {" +j +j +j +v +v +x +x +J +v +v +j +v +v +u +j +"} +(12,1,1) = {" +j +j +j +j +j +j +j +j +j +j +j +j +v +v +j +"} +(13,1,1) = {" +j +j +j +j +j +j +j +j +j +j +j +j +j +v +j +"} +(14,1,1) = {" +j +j +j +j +j +j +j +j +j +j +j +K +j +j +j +"} +(15,1,1) = {" +j +j +j +j +j +j +j +j +j +j +j +j +j +j +j +"} diff --git a/maps/om_adventure/pois/woodentemple.dmm b/maps/om_adventure/pois/woodentemple.dmm new file mode 100644 index 0000000000..4a6dd94d5f --- /dev/null +++ b/maps/om_adventure/pois/woodentemple.dmm @@ -0,0 +1,533 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/bed/chair/sofa/pew/right{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"c" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wmarble, +/area/om_adventure/poi/woodentemple) +"d" = ( +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"e" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/outdoors/grass, +/area/om_adventure/poi/woodentemple) +"f" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/floor, +/area/om_adventure/poi/woodentemple) +"g" = ( +/obj/tether_away_spawner/spookyland, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"j" = ( +/obj/item/weapon/material/shard/shrapnel, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"k" = ( +/obj/structure/bed/pod, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"m" = ( +/obj/structure/bed/chair/sofa/pew/right{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"o" = ( +/obj/structure/table/rack/steel, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wmarble, +/area/om_adventure/poi/woodentemple) +"r" = ( +/turf/simulated/floor/outdoors/grass, +/area/om_adventure/poi/woodentemple) +"s" = ( +/obj/structure/table/woodentable, +/obj/item/trash/candle, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"v" = ( +/obj/structure/table/woodentable, +/obj/random/maintenance, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"w" = ( +/obj/structure/bed/chair/sofa/pew/left, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"x" = ( +/obj/structure/curtain/black{ + anchored = 1; + icon_state = "open"; + opacity = 0 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"A" = ( +/obj/structure/curtain/black{ + anchored = 1 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"C" = ( +/obj/item/weapon/material/shard, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"E" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"F" = ( +/obj/structure/bed/chair/sofa/pew/right, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"G" = ( +/obj/structure/simple_door/wood, +/turf/simulated/floor/wmarble, +/area/om_adventure/poi/woodentemple) +"H" = ( +/turf/simulated/floor/wmarble, +/area/om_adventure/poi/woodentemple) +"J" = ( +/obj/structure/table/woodentable, +/obj/random/awayloot/looseloot, +/obj/item/trash/candle, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"K" = ( +/obj/structure/table/rack/steel, +/obj/random/awayloot/looseloot, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"M" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"N" = ( +/obj/structure/bed/chair/sofa/pew/left{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"Q" = ( +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"R" = ( +/turf/simulated/floor/carpet, +/area/om_adventure/poi/woodentemple) +"S" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor, +/area/om_adventure/poi/woodentemple) +"U" = ( +/obj/structure/bed/chair/sofa/pew/left{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/om_adventure/poi/woodentemple) +"Z" = ( +/turf/simulated/wall/hardwood, +/area/om_adventure/poi/woodentemple) + +(1,1,1) = {" +a +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +a +a +a +"} +(2,1,1) = {" +r +r +Z +r +r +r +r +r +r +r +r +r +r +r +r +r +Z +r +r +a +a +"} +(3,1,1) = {" +r +Z +Z +Z +Z +S +f +S +Z +Z +Z +S +S +S +Z +Z +Z +Z +r +r +a +"} +(4,1,1) = {" +r +r +Z +J +v +d +C +j +d +A +d +m +N +Q +J +v +Z +r +r +r +a +"} +(5,1,1) = {" +r +r +S +Q +d +j +g +d +d +x +d +d +d +g +d +d +S +r +r +r +r +"} +(6,1,1) = {" +r +r +S +w +d +d +d +C +d +A +d +d +d +d +K +K +Z +r +Z +r +r +"} +(7,1,1) = {" +r +r +S +F +d +d +Z +Z +G +Z +Z +d +R +d +Z +Z +Z +Z +Z +Z +r +"} +(8,1,1) = {" +r +r +Z +M +d +d +S +r +r +r +S +R +R +R +Z +o +H +H +Z +r +r +"} +(9,1,1) = {" +r +r +Z +E +g +d +S +r +e +r +S +R +R +R +G +H +c +H +G +r +r +"} +(10,1,1) = {" +r +r +Z +v +d +d +S +r +r +r +S +R +R +R +Z +o +H +H +Z +r +r +"} +(11,1,1) = {" +r +r +S +w +d +d +Z +Z +G +Z +Z +d +R +d +Z +Z +Z +Z +Z +Z +r +"} +(12,1,1) = {" +r +r +S +F +d +d +d +d +d +A +d +d +d +d +d +d +Z +r +Z +r +r +"} +(13,1,1) = {" +r +r +S +Q +d +d +d +g +d +x +d +g +d +d +d +s +S +r +r +r +r +"} +(14,1,1) = {" +r +r +Z +s +E +k +k +k +d +A +d +U +b +Q +v +E +Z +r +r +r +a +"} +(15,1,1) = {" +r +Z +Z +Z +Z +S +S +S +Z +Z +Z +S +S +S +Z +Z +Z +Z +r +r +a +"} +(16,1,1) = {" +r +r +Z +r +r +r +r +r +r +r +r +r +r +r +r +r +Z +r +r +a +a +"} +(17,1,1) = {" +a +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +r +a +a +a +"} diff --git a/maps/southern_cross/loadout/loadout_accessories.dm b/maps/southern_cross/loadout/loadout_accessories.dm index 94a79b3cf2..3febe42b2e 100644 --- a/maps/southern_cross/loadout/loadout_accessories.dm +++ b/maps/southern_cross/loadout/loadout_accessories.dm @@ -1,32 +1,32 @@ /datum/gear/accessory/brown_vest display_name = "webbing, brown" path = /obj/item/clothing/accessory/storage/brown_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_vest display_name = "webbing, black" path = /obj/item/clothing/accessory/storage/black_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_vest display_name = "webbing, white" path = /obj/item/clothing/accessory/storage/white_vest - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/brown_drop_pouches display_name = "drop pouches, brown" path = /obj/item/clothing/accessory/storage/brown_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/black_drop_pouches display_name = "drop pouches, black" path = /obj/item/clothing/accessory/storage/black_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/white_drop_pouches display_name = "drop pouches, white" path = /obj/item/clothing/accessory/storage/white_drop_pouches - allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") + allowed_roles = list("Engineer","Atmospheric Technician","Chief Engineer","Security Officer","Detective","Head of Security","Warden","Paramedic","Chief Medical Officer","Medical Doctor","Search and Rescue","Explorer","Shaft Miner") /datum/gear/accessory/holster display_name = "holster selection (Security, CD, HoP)" diff --git a/maps/stellardelight/ship_centcom.dmm b/maps/stellardelight/ship_centcom.dmm index 8185a30641..d7bca2204d 100644 --- a/maps/stellardelight/ship_centcom.dmm +++ b/maps/stellardelight/ship_centcom.dmm @@ -8,6 +8,20 @@ /obj/item/weapon/gun/energy/lasercannon, /turf/simulated/floor/tiled/dark, /area/centcom/specops) +"ac" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = null + }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "ccboat"; + pixel_y = 29 + }, +/turf/simulated/floor/plating, +/area/shuttle/ccboat) "ad" = ( /obj/structure/table/rack, /obj/item/weapon/gun/energy/xray, @@ -515,6 +529,43 @@ /obj/structure/bed/chair/shuttle, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/shuttle/ccboat) +"bB" = ( +/obj/machinery/airlock_sensor{ + dir = 8; + frequency = 1380; + id_tag = null; + pixel_x = 24 + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = null + }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/shuttle/ccboat) +"bC" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = null + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/shuttle_landmark/shuttle_initializer/ccboat, +/obj/effect/overmap/visitable/ship/landable/ccboat, +/turf/simulated/floor/plating, +/area/shuttle/ccboat) +"bD" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = null + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/plating, +/area/shuttle/ccboat) "bE" = ( /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "tram" @@ -522,6 +573,9 @@ /obj/structure/closet/walllocker/medical/east, /turf/simulated/floor/tiled, /area/centcom/terminal/tramfluff) +"bF" = ( +/turf/simulated/floor/reinforced, +/area/shuttle/centcom/ccbay) "bJ" = ( /obj/structure/table/rack, /obj/item/weapon/storage/box/pillbottles, @@ -2391,16 +2445,6 @@ }, /turf/simulated/shuttle/floor/white, /area/shuttle/escape) -"id" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1380; - id_tag = null - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/shuttle_landmark/shuttle_initializer/ccboat, -/obj/effect/overmap/visitable/ship/landable/ccboat, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/shuttle/ccboat) "ih" = ( /obj/effect/floor_decal/corner/blue{ dir = 5 @@ -4530,20 +4574,6 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/centcom/main_hall) -"qV" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = null - }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1380; - id_tag = "ccboat"; - pixel_y = 29 - }, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/shuttle/ccboat) "qZ" = ( /obj/machinery/body_scanconsole{ dir = 4 @@ -4649,14 +4679,6 @@ }, /turf/simulated/shuttle/floor, /area/shuttle/escape) -"rR" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1380; - id_tag = null - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/shuttle/ccboat) "rU" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ frequency = 1380; @@ -6060,25 +6082,6 @@ name = "reinforced floor" }, /area/centcom) -"zx" = ( -/obj/machinery/airlock_sensor{ - dir = 8; - frequency = 1380; - id_tag = null; - pixel_x = 24 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = null - }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/danger, -/area/shuttle/ccboat) "zy" = ( /obj/effect/floor_decal/derelict/d11, /turf/simulated/floor/tiled, @@ -7233,7 +7236,7 @@ }, /area/centcom/control) "EE" = ( -/obj/machinery/telecomms/relay/preset/sd, +/obj/machinery/telecomms/relay/preset/station, /turf/unsimulated/floor/steel, /area/centcom/control) "EF" = ( @@ -12016,9 +12019,6 @@ }, /turf/simulated/floor/tiled/dark, /area/centcom/security) -"QZ" = ( -/turf/simulated/floor/reinforced/airless, -/area/shuttle/centcom/ccbay) "Ra" = ( /obj/machinery/door/firedoor, /obj/machinery/door/blast/regular{ @@ -25610,12 +25610,12 @@ ZQ lM Bx Nv -QZ -QZ -QZ -QZ -QZ -QZ +bF +bF +bF +bF +bF +bF Cg wO DY @@ -25623,8 +25623,8 @@ HB kX TF kX -QZ -QZ +bF +bF MX Bx lM @@ -25752,16 +25752,16 @@ ZQ lM Bx Nv -QZ -QZ +bF +bF lL kX kX TF TF Cr -qV -id +ac +bC wO vT kX @@ -25902,8 +25902,8 @@ bA GK Vw Cr -zx -rR +bB +bD xB Bj AR @@ -26888,9 +26888,9 @@ ZQ lM Bx Nv -QZ -QZ -QZ +bF +bF +bF kX kX TF @@ -27030,12 +27030,12 @@ ZQ lM Bx Nv -QZ -QZ -QZ -QZ -QZ -QZ +bF +bF +bF +bF +bF +bF Cg lo kX @@ -27043,8 +27043,8 @@ kX kX TF kX -QZ -QZ +bF +bF MX Bx nX diff --git a/maps/stellardelight/ship_misc.dmm b/maps/stellardelight/ship_misc.dmm index 0b26656607..fcdabbf9a1 100644 --- a/maps/stellardelight/ship_misc.dmm +++ b/maps/stellardelight/ship_misc.dmm @@ -1,4 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"aa" = ( +/turf/unsimulated/mineral/virgo3b, +/area/space) "ab" = ( /obj/structure/window/reinforced/holowindow{ dir = 8 @@ -21,6 +24,12 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_courtroom) +"ae" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm1) +"af" = ( +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm1) "ag" = ( /obj/effect/floor_decal/spline/fancy/wood/corner{ dir = 8 @@ -47,6 +56,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"ai" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm2) +"aj" = ( +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm2) "ak" = ( /obj/structure/table/woodentable/holotable, /obj/structure/window/reinforced/holowindow{ @@ -84,6 +99,9 @@ "ap" = ( /turf/space, /area/space) +"aq" = ( +/turf/simulated/shuttle/wall/alien/hard_corner, +/area/unknown/dorm3) "ar" = ( /turf/unsimulated/wall, /area/space) @@ -331,6 +349,9 @@ }, /turf/unsimulated/wall, /area/space) +"bc" = ( +/turf/simulated/shuttle/wall/alien, +/area/unknown/dorm3) "bd" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/holofloor/desert, @@ -379,6 +400,10 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"bn" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "bo" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner, @@ -443,6 +468,13 @@ }, /turf/simulated/fitness, /area/holodeck/source_boxingcourt) +"by" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"bz" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "bA" = ( /obj/structure/fitness/boxing_ropes{ dir = 8 @@ -541,16 +573,47 @@ /obj/structure/bed/chair/holochair, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_courtroom) +"bN" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"bO" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "bP" = ( /obj/structure/holostool{ dir = 1 }, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"bQ" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"bR" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "bS" = ( /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/desert, /area/holodeck/source_picnicarea) +"bT" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) "bU" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -639,16 +702,89 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"ce" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"cf" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"cg" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"ch" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "ci" = ( /obj/structure/holostool{ dir = 4 }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"cj" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"ck" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"cl" = ( +/obj/machinery/door/airlock/alien/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "cm" = ( /obj/item/toy/chess/pawn_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"cn" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"co" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cp" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cq" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cr" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cs" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "ct" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -706,6 +842,77 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"cC" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cD" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cE" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"cF" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"cG" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"cH" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"cI" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cJ" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cK" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "cL" = ( /obj/structure/holostool{ dir = 8 @@ -718,6 +925,17 @@ }, /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"cN" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cO" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkone" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) "cP" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/floor_decal/spline/fancy/wood{ @@ -765,6 +983,31 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"cV" = ( +/obj/item/weapon/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"cW" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cX" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unktwo" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"cY" = ( +/obj/item/weapon/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"cZ" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "da" = ( /obj/structure/flora/ausbushes/brflowers, /obj/effect/floor_decal/spline/fancy/wood/corner{ @@ -773,16 +1016,17 @@ /turf/simulated/floor/holofloor/grass, /area/holodeck/source_picnicarea) "db" = ( -/obj/effect/step_trigger/thrower{ - affect_ghosts = 1; - name = "thrower_throwdown"; - nostop = 1; - stopper = 0; - tiles = 0 +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkthree" }, -/turf/space, -/turf/space/transit/north, -/area/space) +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"dc" = ( +/obj/item/weapon/bedsheet/rddouble, +/obj/structure/bed/double/padded, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "dd" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -795,6 +1039,26 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_courtroom) +"df" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"dg" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"dh" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"di" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "dj" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -843,6 +1107,20 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_theatre) +"dn" = ( +/obj/structure/prop/alien/computer{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"do" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"dp" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "dq" = ( /obj/structure/flora/pottedplant{ icon_state = "plant-06" @@ -914,6 +1192,14 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_emptycourt) +"dy" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) +"dz" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "dA" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -928,10 +1214,18 @@ /obj/structure/window/reinforced, /turf/unsimulated/wall, /area/space) +"dC" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) "dD" = ( -/turf/space, -/turf/space, -/area/space) +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) +"dE" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "dF" = ( /turf/simulated/floor/holofloor/space, /area/holodeck/source_space) @@ -956,6 +1250,12 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_basketball) +"dL" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "dM" = ( /obj/effect/floor_decal/corner/red/full{ dir = 8 @@ -993,6 +1293,10 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"dT" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm1) "dU" = ( /obj/structure/table/holotable, /obj/machinery/readybutton, @@ -1027,6 +1331,22 @@ "dY" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) +"dZ" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"ea" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm2) +"eb" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "ec" = ( /obj/effect/landmark{ name = "Holocarp Spawn Random" @@ -1122,6 +1442,10 @@ /obj/structure/table/woodentable/holotable, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_meetinghall) +"er" = ( +/obj/structure/table/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm3) "es" = ( /obj/item/clothing/glasses/sunglasses, /turf/simulated/floor/holofloor/beach/sand, @@ -1131,10 +1455,63 @@ /obj/effect/overlay/coconut, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"eu" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm1) +"ev" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"ew" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"ex" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm1) +"ey" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm2) +"ez" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"eA" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"eB" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm2) +"eC" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm3) "eD" = ( /obj/effect/floor_decal/sign/small_4, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"eE" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) +"eF" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "eG" = ( /turf/space, /turf/space/transit/north, @@ -1165,6 +1542,10 @@ /obj/item/weapon/beach_ball, /turf/simulated/floor/holofloor/beach/sand, /area/holodeck/source_beach) +"eN" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm3) "eO" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -1172,6 +1553,9 @@ }, /turf/space/transit/south, /area/space) +"eP" = ( +/turf/simulated/shuttle/wall/alien/blue/hard_corner, +/area/unknown/dorm4) "eQ" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1181,6 +1565,12 @@ }, /turf/space/transit/west, /area/space) +"eR" = ( +/turf/simulated/shuttle/wall/alien/blue, +/area/unknown/dorm4) +"eS" = ( +/turf/simulated/shuttle/wall/alien/blue/hard_corner, +/area/unknown/dorm5) "eT" = ( /obj/structure/flora/grass/green, /turf/simulated/floor/holofloor/snow, @@ -1277,6 +1667,9 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fg" = ( +/turf/simulated/shuttle/wall/alien/blue, +/area/unknown/dorm5) "fh" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -1284,6 +1677,32 @@ }, /turf/space/transit/west, /area/space) +"fi" = ( +/turf/simulated/shuttle/wall/alien/blue/hard_corner, +/area/unknown/dorm6) +"fj" = ( +/turf/simulated/shuttle/wall/alien/blue, +/area/unknown/dorm6) +"fk" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"fl" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove{ + icon_state = "boxinggreen"; + item_state = "boxinggreen" + }, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) +"fm" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "fn" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1353,6 +1772,23 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fw" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"fx" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"fy" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "fz" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -1377,6 +1813,17 @@ }, /turf/simulated/floor/holofloor/tiled, /area/holodeck/source_thunderdomecourt) +"fD" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"fE" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"fF" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "fG" = ( /obj/structure/flora/grass/brown, /turf/simulated/floor/holofloor/snow, @@ -1392,6 +1839,16 @@ dir = 8 }, /area/holodeck/source_meetinghall) +"fI" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) "fJ" = ( /obj/effect/floor_decal/corner/green{ dir = 10 @@ -1403,6 +1860,18 @@ icon_state = "beach" }, /area/holodeck/source_beach) +"fL" = ( +/obj/machinery/recharge_station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"fM" = ( +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"fN" = ( +/obj/structure/table/woodentable/holotable, +/obj/item/weapon/dice/d8, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "fO" = ( /obj/effect/floor_decal/carpet{ dir = 8 @@ -1491,10 +1960,7 @@ /turf/simulated/floor/holofloor/tiled/dark, /area/holodeck/source_boxingcourt) "fZ" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/unsimulated/wall, +/turf/simulated/floor/holofloor/reinforced, /area/space) "ga" = ( /turf/unsimulated/beach/sand{ @@ -1614,9 +2080,134 @@ opacity = 1 }, /area/beach) +"gv" = ( +/obj/structure/toilet, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"gw" = ( +/obj/machinery/shower{ + pixel_y = 13 + }, +/obj/structure/curtain/open/shower, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"gx" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) "gy" = ( /turf/unsimulated/beach/coastline, /area/beach) +"gz" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"gA" = ( +/obj/machinery/door/airlock/alien/blue/public, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"gB" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gC" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gD" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gE" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gF" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gG" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gH" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gI" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gJ" = ( +/obj/machinery/sleeper/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gK" = ( +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gL" = ( +/obj/structure/fans, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gM" = ( +/obj/machinery/smartfridge/survival_pod, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu11, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu13, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu10, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/menu9, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/storage/mre/random, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) "gN" = ( /turf/unsimulated/beach/water{ density = 1; @@ -1626,6 +2217,245 @@ "gO" = ( /turf/unsimulated/beach/water, /area/beach) +"gP" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gQ" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gR" = ( +/obj/structure/table/survival_pod, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gS" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gT" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkfour" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"gU" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"gV" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gW" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unkfive" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"gX" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"gY" = ( +/obj/structure/closet/alien, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"gZ" = ( +/obj/item/device/perfect_tele_beacon/stationary{ + tele_name = "Unknown"; + tele_network = "unksix" + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"ha" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/hopdouble, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hb" = ( +/obj/structure/prop/alien/computer/hybrid{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hc" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hd" = ( +/obj/structure/prop/alien/computer/hybrid{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"he" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hf" = ( +/obj/structure/prop/alien/computer/hybrid{ + dir = 8 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hg" = ( +/obj/structure/prop/alien/dispenser, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hh" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hi" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hj" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hk" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hl" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hm" = ( +/obj/structure/bed/chair/comfy/black, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hn" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"ho" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm4) +"hp" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hq" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm5) +"hr" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"hs" = ( +/obj/structure/table/alien/blue, +/turf/simulated/shuttle/floor/alien, +/area/unknown/dorm6) +"ht" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm4) +"hu" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"hv" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"hw" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm4) +"hx" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm5) +"hy" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"hz" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"hA" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm5) +"hB" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/teleport/hub, +/turf/simulated/shuttle/floor/voidcraft, +/area/unknown/dorm6) +"hC" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"hD" = ( +/obj/machinery/teleport/station, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"hE" = ( +/obj/machinery/computer/teleporter{ + dir = 1 + }, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"hF" = ( +/obj/structure/prop/alien/power, +/turf/simulated/shuttle/floor/alienplating, +/area/unknown/dorm6) +"hG" = ( +/obj/effect/step_trigger/thrower{ + affect_ghosts = 1; + name = "thrower_throwdown"; + nostop = 1; + stopper = 0; + tiles = 0 + }, +/turf/space, +/turf/space/transit/north, +/area/space) +"hH" = ( +/obj/effect/step_trigger/teleporter/random{ + affect_ghosts = 1; + name = "escapeshuttle_leave"; + teleport_x = 25; + teleport_x_offset = 245; + teleport_y = 25; + teleport_y_offset = 245; + teleport_z = 4; + teleport_z_offset = 4 + }, +/turf/space, +/turf/space/transit/north, +/area/space) +"hX" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/pirate, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "iv" = ( /obj/effect/shuttle_landmark/transit{ base_area = /area/space; @@ -1648,10 +2478,19 @@ }, /turf/space/transit/west, /area/space) +"jS" = ( +/obj/structure/table/holotable, +/obj/item/clothing/gloves/boxing/hologlove, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "kw" = ( /obj/effect/floor_decal/sign/small_5, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"kN" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "lf" = ( /obj/effect/landmark/ai_multicam_room, /turf/unsimulated/ai_visible, @@ -1665,6 +2504,27 @@ }, /turf/space/transit/east, /area/space) +"ml" = ( +/obj/structure/table/holotable, +/obj/item/device/flashlight/lamp/green, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"mY" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "nj" = ( /obj/item/toy/chess/rook_white, /turf/simulated/floor/holofloor/wmarble, @@ -1676,6 +2536,42 @@ "nW" = ( /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"oq" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) +"ov" = ( +/obj/structure/table/woodentable/holotable, +/obj/item/weapon/dice/d12, +/obj/item/weapon/dice/d10, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) +"oJ" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 9 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) +"oR" = ( +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 6 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "oT" = ( /obj/item/toy/chess/pawn_black, /turf/simulated/floor/holofloor/wmarble, @@ -1687,6 +2583,16 @@ "pT" = ( /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"pU" = ( +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/obj/effect/floor_decal/carpet, +/obj/effect/floor_decal/carpet{ + dir = 10 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "qv" = ( /obj/effect/floor_decal/sign/small_h, /turf/simulated/floor/holofloor/wood, @@ -1699,13 +2605,54 @@ /obj/item/toy/chess/pawn_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"rD" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"rU" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "sb" = ( /obj/item/toy/chess/knight_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"sj" = ( +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "tD" = ( /turf/unsimulated/wall, /area/ai_multicam_room) +"tR" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"uh" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 6 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "ul" = ( /turf/unsimulated/wall, /area/beach) @@ -1722,6 +2669,11 @@ /obj/item/toy/chess/knight_black, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"vx" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/madscientist, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "vW" = ( /obj/effect/floor_decal/sign/small_a, /turf/simulated/floor/holofloor/wood, @@ -1730,21 +2682,108 @@ /obj/effect/floor_decal/sign/small_3, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"wf" = ( +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "wh" = ( /obj/item/toy/chess/knight_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"wR" = ( +/obj/machinery/fitness/punching_bag/clown, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) +"xp" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/unsimulated/wall, +/area/space) +"xt" = ( +/obj/machinery/fitness/heavy/lifter, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) +"xz" = ( +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 5 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) +"za" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/elpresidente, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) +"zA" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"zC" = ( +/obj/structure/bed/chair/holochair, +/obj/effect/floor_decal/carpet{ + dir = 1 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "Bm" = ( /obj/item/toy/chess/bishop_black, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"BC" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "BG" = ( /obj/item/toy/chess/king_black, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"BP" = ( +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"BR" = ( +/obj/structure/table/woodentable/holotable, +/obj/item/weapon/dice/d100, +/obj/item/weapon/dice/d20, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) +"BU" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "BV" = ( -/turf/simulated/floor/holofloor/reinforced, -/area/space) +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) +"CF" = ( +/obj/structure/table/woodentable/holotable, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "CJ" = ( /obj/item/toy/chess/pawn_white, /turf/simulated/floor/holofloor/bmarble, @@ -1752,10 +2791,23 @@ "CK" = ( /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"Dh" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "Di" = ( /obj/effect/floor_decal/sign/small_2, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"DB" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/cutewitch, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "DL" = ( /obj/effect/floor_decal/sign/small_b, /turf/simulated/floor/holofloor/wood, @@ -1767,24 +2819,44 @@ /obj/effect/floor_decal/sign/small_g, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"Eq" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"ED" = ( +/obj/structure/fitness/weightlifter, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) "EX" = ( /obj/item/toy/chess/bishop_black, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) -"Gs" = ( -/obj/effect/step_trigger/teleporter/random{ - affect_ghosts = 1; - name = "escapeshuttle_leave"; - teleport_x = 25; - teleport_x_offset = 245; - teleport_y = 25; - teleport_y_offset = 245; - teleport_z = 4; - teleport_z_offset = 4 +"FX" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/gladiator, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) +"Gg" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, -/turf/space, -/turf/space/transit/north, -/area/space) +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"GE" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/fakewizard, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "GW" = ( /obj/item/toy/chess/king_white, /turf/simulated/floor/holofloor/bmarble, @@ -1809,6 +2881,14 @@ /obj/item/toy/chess/rook_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"JQ" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "Kn" = ( /obj/effect/floor_decal/sign/small_d, /turf/simulated/floor/holofloor/wood, @@ -1817,6 +2897,25 @@ /obj/effect/floor_decal/sign/small_f, /turf/simulated/floor/holofloor/wood, /area/holodeck/source_chess) +"KR" = ( +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"Lt" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue/full{ + dir = 1 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "Me" = ( /turf/simulated/floor/smole/desert, /area/holodeck/source_smoleworld) @@ -1834,13 +2933,54 @@ }, /turf/space/transit/west, /area/space) +"MT" = ( +/obj/structure/fitness/punchingbag, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) +"Nj" = ( +/obj/structure/table/woodentable/holotable, +/obj/item/weapon/dice, +/obj/item/weapon/dice/d4, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) +"NT" = ( +/obj/structure/table/holotable, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "Or" = ( /obj/item/toy/chess/knight_white, /turf/simulated/floor/holofloor/bmarble, /area/holodeck/source_chess) +"OU" = ( +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) +"PL" = ( +/turf/space, +/turf/simulated/floor/holofloor/reinforced, +/area/space) "PM" = ( /turf/simulated/floor/smole/megablocks, /area/holodeck/source_smoleworld) +"Qh" = ( +/obj/structure/bed/chair/holochair{ + dir = 1 + }, +/obj/effect/floor_decal/carpet, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "Qs" = ( /obj/item/toy/chess/queen_black, /turf/simulated/floor/holofloor/bmarble, @@ -1848,6 +2988,43 @@ "RV" = ( /turf/unsimulated/ai_visible, /area/ai_multicam_room) +"Sj" = ( +/obj/structure/bed/chair/holochair{ + dir = 8 + }, +/obj/effect/floor_decal/carpet{ + dir = 4 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) +"SJ" = ( +/obj/item/weapon/bedsheet/medical, +/obj/structure/bed/padded, +/obj/structure/curtain/open/privacy, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"TH" = ( +/obj/structure/table/holotable, +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) +"TM" = ( +/obj/structure/table/woodentable/holotable, +/obj/effect/landmark/costume/chicken, +/turf/simulated/floor/holofloor/wood, +/area/holodeck/source_game_room) "Ug" = ( /obj/effect/floor_decal/carpet{ dir = 5 @@ -1863,6 +3040,12 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_basketball) +"Uq" = ( +/obj/effect/floor_decal/corner/paleblue/full, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "UG" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1873,6 +3056,14 @@ /obj/item/toy/chess/queen_white, /turf/simulated/floor/holofloor/wmarble, /area/holodeck/source_chess) +"Wz" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 10 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "Xh" = ( /obj/effect/floor_decal/carpet{ dir = 5 @@ -1888,12 +3079,29 @@ }, /turf/simulated/floor/holofloor/carpet, /area/holodeck/source_meetinghall) +"Xq" = ( +/obj/machinery/scale, +/turf/simulated/floor/holofloor/tiled/dark, +/area/holodeck/source_gym) +"XD" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 5 + }, +/turf/simulated/floor/holofloor/tiled{ + icon_state = "white" + }, +/area/holodeck/source_patient_ward) "XG" = ( /obj/structure/cable{ icon_state = "4-8" }, /turf/space/transit/west, /area/space) +"Yn" = ( +/turf/simulated/floor/holofloor/tiled{ + icon_state = "monotile" + }, +/area/holodeck/source_gym) "Yx" = ( /obj/effect/step_trigger/thrower{ affect_ghosts = 1; @@ -1904,6 +3112,15 @@ }, /turf/space/transit/north, /area/space) +"Yz" = ( +/obj/structure/bed/chair/holochair{ + dir = 4 + }, +/obj/effect/floor_decal/carpet{ + dir = 8 + }, +/turf/simulated/floor/holofloor/carpet, +/area/holodeck/source_game_room) "YX" = ( /obj/effect/floor_decal/sign/small_e, /turf/simulated/floor/holofloor/wood, @@ -1959,6 +3176,46 @@ tD tD tD tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -2040,46 +3297,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul "} (2,1,1) = {" tD @@ -2101,6 +3318,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2118,29 +3378,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2202,26 +3439,6 @@ ZF ZF ZF ap -ul -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -ga -gu -gN -gN -ul "} (3,1,1) = {" tD @@ -2243,6 +3460,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2260,29 +3520,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2344,26 +3581,6 @@ ZF ZF ZF ap -ul -ga -gc -gf -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (4,1,1) = {" tD @@ -2385,6 +3602,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2402,29 +3662,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2486,26 +3723,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (5,1,1) = {" tD @@ -2527,6 +3744,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +ae +af +ae +af +af +af +af +af +af +ae +af +af +ae +aa +aa +aa +aa +aa +eP +eR +eP +eR +eR +eR +eR +eR +eR +eP +eR +eR +eP +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2544,29 +3804,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2628,26 +3865,6 @@ ZF ZF ZF ap -ul -ga -gd -gc -gc -gc -gc -gc -gc -gc -gc -gh -gi -gc -gc -gt -gy -gO -gN -ul "} (6,1,1) = {" tD @@ -2669,6 +3886,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +af +bn +ae +cn +cI +cN +df +dp +dp +ae +co +eu +af +aa +aa +aa +aa +aa +eR +fk +eP +gB +gP +gS +hb +hh +hh +eP +gC +ht +eR +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2686,29 +3946,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2770,26 +4007,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gh -gc -gs -gt -gy -gO -gN -ul "} (7,1,1) = {" tD @@ -2811,6 +4028,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +af +by +cj +co +by +cO +by +by +co +cj +co +ev +af +aa +aa +aa +aa +aa +eR +fw +gx +gC +fw +gT +fw +fw +gC +gx +gC +hu +eR +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2828,29 +4088,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -2912,26 +4149,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gi -gc -gj -gj -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (8,1,1) = {" tD @@ -2953,6 +4170,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +af +bz +ae +cp +by +by +by +by +dL +ae +co +ew +af +aa +aa +aa +aa +aa +eR +fx +eP +gD +fw +fw +fw +fw +hn +eP +gC +hv +eR +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -2970,29 +4230,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -3054,26 +4291,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gh -gj -gk -gm -gj -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (9,1,1) = {" tD @@ -3095,6 +4312,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +af +bN +af +cq +co +cV +dg +dy +dT +af +co +ex +af +aa +aa +aa +aa +aa +eR +fy +eR +gE +gC +gU +hc +hi +ho +eR +gC +hw +eR +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3112,29 +4372,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -3196,26 +4433,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gj -gl -gn -gj -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (10,1,1) = {" tD @@ -3237,6 +4454,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +ae +af +ae +af +af +af +af +af +af +ae +af +af +ae +aa +aa +aa +aa +aa +eP +eR +eP +eR +eR +eR +eR +eR +eR +eP +eR +eR +eP +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3254,29 +4514,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -fh -fh -fh -fh -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -3338,26 +4575,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gc -gj -gj -gc -gc -gc -gp -gc -gt -gy -gO -gN -ul "} (11,1,1) = {" tD @@ -3379,6 +4596,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3396,29 +4656,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -iv -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -3480,26 +4717,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (12,1,1) = {" tD @@ -3521,6 +4738,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3538,29 +4798,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -XG -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -3622,26 +4859,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gq -gc -gt -gy -gO -gN -ul "} (13,1,1) = {" tD @@ -3663,6 +4880,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3680,29 +4940,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -El -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -3764,26 +5001,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gi -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (14,1,1) = {" tD @@ -3805,6 +5022,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3822,29 +5082,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -El -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -3906,26 +5143,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gq -gc -gt -gy -gO -gN -ul "} (15,1,1) = {" tD @@ -3947,6 +5164,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -3964,29 +5224,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -El -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4048,26 +5285,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gc -gc -gc -gc -gc -go -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (16,1,1) = {" tD @@ -4089,6 +5306,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4106,29 +5366,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -El -El -El -El -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4190,26 +5427,6 @@ ZF ZF ZF ap -ul -ga -ge -gc -gh -gf -gc -gc -gc -gc -gc -gc -gc -gr -gc -gt -gy -gO -gN -ul "} (17,1,1) = {" tD @@ -4231,6 +5448,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +ai +aj +ai +aj +aj +aj +aj +aj +aj +ai +aj +aj +ai +aa +aa +aa +aa +aa +eS +fg +eS +fg +fg +fg +fg +fg +fg +eS +fg +fg +eS +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4248,29 +5508,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -fh -fh -fh -fh -fh -fh -El -El -El -El -El -El -El -El ap Zb Zb @@ -4332,26 +5569,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (18,1,1) = {" tD @@ -4373,6 +5590,49 @@ RV RV RV tD +aa +aa +aa +aa +aa +aj +bO +ai +cr +cJ +cW +dh +dz +dz +ai +cs +ey +aj +aa +aa +aa +aa +aa +fg +fD +eS +gF +gQ +gV +hd +hj +hj +eS +gG +hx +fg +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4390,29 +5650,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -4474,26 +5711,6 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (19,1,1) = {" tD @@ -4515,6 +5732,49 @@ tD tD tD tD +aa +aa +aa +aa +aa +aj +bQ +ck +cs +bQ +cX +bQ +bQ +cs +ck +cs +ez +aj +aa +aa +aa +aa +aa +fg +fE +gz +gG +fE +gW +fE +fE +gG +gz +gG +hy +fg +aa +aa +aa +aa +ap +ap +ap ap ap ap @@ -4532,29 +5792,6 @@ ap ap ap ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El ap Zb Zb @@ -4616,28 +5853,67 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gf -gh -gc -gc -gt -gy -gO -gN -ul "} (20,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aj +bR +ai +cC +bQ +bQ +bQ +bQ +dZ +ai +cs +eA +aj +aa +aa +aa +aa +aa +fg +fF +eS +gH +fE +fE +fE +fE +hp +eS +gG +hz +fg +aa +aa +aa +aa ap ap ap @@ -4659,45 +5935,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -4758,28 +5995,67 @@ ZF ZF ZF ap -ul -ga -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (21,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aj +bT +aj +cD +cs +cY +di +dC +ea +aj +cs +eB +aj +aa +aa +aa +aa +aa +fg +fI +fg +gI +gG +gX +he +hk +hq +fg +gG +hA +fg +aa +aa +aa +aa ap ap ap @@ -4801,45 +6077,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -4900,28 +6137,67 @@ ZF ZF ZF ap -ul -ga -gc -gg -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gc -gt -gy -gO -gN -ul "} (22,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ai +aj +ai +aj +aj +aj +aj +aj +aj +ai +aj +aj +ai +aa +aa +aa +aa +aa +eS +fg +eS +fg +fg +fg +fg +fg +fg +eS +fg +fg +eS +aa +aa +aa +aa ap ap ap @@ -4943,45 +6219,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -5042,6 +6279,292 @@ ZF ZF ZF ap +"} +(23,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +ap +ZF +ZF +ZF +ZF +ZF +ZC +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZC +ZF +ZF +ZF +ZF +ZF +ap +"} +(24,1,1) = {" +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +Zb +ap +ZF +ZF +ZF +ZF +ZF +ZC +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZF +ZC +ZF +ZF +ZF +ZF +ZF +ap +"} +(25,1,1) = {" ul ga ga @@ -5062,8 +6585,45 @@ gu gN gN ul -"} -(23,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -5085,45 +6645,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -5184,312 +6705,67 @@ ZF ZF ZF ap -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -ul -"} -(24,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -ap -ZF -ZF -ZF -ZF -ZF -ZC -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZC -ZF -ZF -ZF -ZF -ZF -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -"} -(25,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -Zb -ap -ZF -ZF -ZF -ZF -ZF -ZC -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZF -ZC -ZF -ZF -ZF -ZF -ZF -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (26,1,1) = {" +ul +ga +gc +gf +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -5511,45 +6787,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -El -ap Zb Zb Zb @@ -5610,67 +6847,67 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (27,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -5752,111 +6989,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (28,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gd +gc +gc +gc +gc +gc +gc +gc +gc +gh +gi +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -5894,111 +7131,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (29,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gh +gc +gs +gt +gy +gO +gN +ul +aa +aa +aa +aa +aq +bc +aq +bc +bc +bc +bc +bc +bc +aq +bc +bc +aq +aa +aa +aa +aa +aa +fi +fj +fi +fj +fj +fj +fj +fj +fj +fi +fj +fj +fi +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6036,111 +7273,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (30,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gi +gc +gj +gj +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +bc +ce +aq +cE +cK +cZ +dn +dD +dD +aq +cF +eC +bc +aa +aa +aa +aa +aa +fj +fL +fi +gJ +gR +gY +hf +hl +hl +fi +gK +hB +fj +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6178,111 +7415,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (31,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gh +gj +gk +gm +gj +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +bc +cf +cl +cF +cf +db +cf +cf +cF +cl +cF +eE +bc +aa +aa +aa +aa +aa +fj +fM +gA +gK +fM +gZ +fM +fM +gK +gA +gK +hD +fj +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6320,111 +7557,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (32,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gj +gl +gn +gj +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +bc +cg +aq +cG +cf +cf +cf +cf +eb +aq +cF +eF +bc +aa +aa +aa +aa +aa +fj +gv +fi +gL +fM +fM +fM +fM +hr +fi +gK +hE +fj +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6462,111 +7699,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (33,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gc +gj +gj +gc +gc +gc +gp +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +bc +ch +bc +cH +cF +dc +do +dE +er +bc +cF +eN +bc +aa +aa +aa +aa +aa +fj +gw +fj +gM +gK +ha +hg +hm +hs +fj +gK +hF +fj +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6604,111 +7841,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (34,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aq +bc +aq +bc +bc +bc +bc +bc +bc +aq +bc +bc +aq +aa +aa +aa +aa +aa +fi +fj +fi +fj +fj +fj +fj +fj +fj +fi +fj +fj +fi +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ZF ZF @@ -6746,131 +7983,111 @@ ZF ZF ZF ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap "} (35,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gq +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -6910,109 +8127,109 @@ ap ap "} (36,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gi +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +fh +fh +fh +fh +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7052,109 +8269,109 @@ ap ap "} (37,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gq +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +El +iv +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7194,109 +8411,109 @@ ap ap "} (38,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gc +gc +gc +gc +gc +go +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +El +XG +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7336,109 +8553,109 @@ ap ap "} (39,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +ge +gc +gh +gf +gc +gc +gc +gc +gc +gc +gc +gr +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +El +El +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7478,109 +8695,109 @@ ap ap "} (40,1,1) = {" -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap +El +El +El +El +El +El +El +El +El +fh +El +El +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7620,6 +8837,30 @@ ap ap "} (41,1,1) = {" +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa ap ap ap @@ -7676,53 +8917,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +fh +El +El +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7762,6 +8979,30 @@ ap ap "} (42,1,1) = {" +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gf +gh +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa ap ap ap @@ -7818,53 +9059,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +fh +El +El +El +El +fh +El +El +El +El +El +El +El +El ap ap ap @@ -7904,6 +9121,30 @@ ap ap "} (43,1,1) = {" +ul +ga +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa ap ap ap @@ -7960,53 +9201,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +fh +fh +fh +fh +fh +fh +El +El +El +El +El +El +El +El ap ap ap @@ -8046,6 +9263,30 @@ ap ap "} (44,1,1) = {" +ul +ga +gc +gg +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gc +gt +gy +gO +gN +ul +aa +aa +aa +aa ap ap ap @@ -8102,53 +9343,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8188,6 +9405,30 @@ ap ap "} (45,1,1) = {" +ul +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +ga +gu +gN +gN +ul +aa +aa +aa +aa ap ap ap @@ -8244,53 +9485,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8330,6 +9547,30 @@ ap ap "} (46,1,1) = {" +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +ul +aa +aa +aa +aa ap ap ap @@ -8386,53 +9627,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8472,6 +9689,30 @@ ap ap "} (47,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -8528,53 +9769,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8614,6 +9831,30 @@ ap ap "} (48,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -8670,53 +9911,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8756,6 +9973,30 @@ ap ap "} (49,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -8812,53 +10053,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -8898,6 +10115,30 @@ ap ap "} (50,1,1) = {" +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa ap ap ap @@ -8954,53 +10195,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -9120,29 +10337,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -9205,6 +10422,17 @@ aI aI aI ar +aI +aI +aI +aI +aI +aI +aI +aI +aI +aI +ar ap ap ap @@ -9251,40 +10479,29 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El +El ap ap ap @@ -9346,18 +10563,18 @@ Me Me Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -9488,18 +10705,18 @@ Me Me Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -9630,18 +10847,18 @@ PM PM Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -9772,18 +10989,18 @@ PM PM Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -9914,18 +11131,18 @@ PM PM Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -10056,18 +11273,18 @@ PM PM Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -10198,18 +11415,18 @@ PM PM Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -10340,18 +11557,18 @@ PM PM Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -10482,18 +11699,18 @@ Me Me Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -10624,18 +11841,18 @@ Me Me Me Me +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -10767,17 +11984,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -10908,18 +12125,18 @@ dF dF dF dF +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -11050,18 +12267,18 @@ dF dF ec dF +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -11192,18 +12409,18 @@ dF dF dF dF +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -11334,18 +12551,18 @@ ec dF dF dF +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -11476,7 +12693,18 @@ dF dF dF dF +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -11547,17 +12775,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -11618,7 +12835,18 @@ dF dF dF dF +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -11689,17 +12917,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -11760,7 +12977,18 @@ dF dF ec dF +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -11831,17 +13059,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -11902,7 +13119,18 @@ dF dF dF dF +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -11973,17 +13201,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -12044,7 +13261,18 @@ ec dF dF dF +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -12115,17 +13343,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -12186,7 +13403,18 @@ dF dF dF dF +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -12257,17 +13485,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -12329,6 +13546,17 @@ aL aL aL ar +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -12399,17 +13627,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -12470,7 +13687,18 @@ dG fG dG dG +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -12541,17 +13769,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -12612,7 +13829,18 @@ dG dG eT dG +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -12683,17 +13911,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -12754,7 +13971,18 @@ dG dG dG dG +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -12825,17 +14053,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -12896,7 +14113,18 @@ dG dG eJ dG +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -12967,17 +14195,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -13038,7 +14255,18 @@ ed dG dG fG +dB fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -13109,17 +14337,6 @@ ap ap ap ap -ap -ap -ap -ap -ap -ap -ap -dD -dD -dD -dD eI eI eI @@ -13180,18 +14397,18 @@ dG fG dG dG +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -13258,10 +14475,10 @@ ZC ZC ZC ZC -Gs -Gs -Gs -dD +hH +hH +hH +ap eI eI eI @@ -13322,18 +14539,18 @@ eJ dG eT dG +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -13402,8 +14619,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -13464,18 +14681,18 @@ dG dG dG dG +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -13544,8 +14761,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -13606,18 +14823,18 @@ dG dG eJ dG +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -13686,8 +14903,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -13748,18 +14965,18 @@ ed dG dG fG +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -13828,8 +15045,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -13891,17 +15108,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -13970,8 +15187,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14032,18 +15249,18 @@ eL eL eL eL +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -14112,8 +15329,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14174,18 +15391,18 @@ eK eK eK eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -14254,8 +15471,8 @@ ZF ZF eG eG -Gs -dD +hH +ap eI eI eI @@ -14316,18 +15533,18 @@ fn fn fO eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -14374,16 +15591,16 @@ Yx Yx Yx Yx -db -db -db -db -db -db +hG +hG +hG +hG +hG +hG eG eG -db -db +hG +hG eG eG eG @@ -14396,8 +15613,8 @@ eG eG eG eG -Gs -dD +hH +ap eI eI eI @@ -14458,18 +15675,18 @@ fo fo fP eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -14600,18 +15817,18 @@ fo fo fP eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -14742,18 +15959,18 @@ fo fo fP eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -14884,18 +16101,18 @@ fo fo fP eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -15026,18 +16243,18 @@ fo fo fP eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -15168,18 +16385,18 @@ fp fH fQ eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -15310,18 +16527,18 @@ eK Xh Xh eK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -15453,17 +16670,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -15594,18 +16811,18 @@ fz fz fz fS +dB fZ -ap -ap -ap -ap -dD -ap -ap -ap -dD -ap -ap +fZ +fZ +fZ +PL +fZ +fZ +fZ +PL +fZ +xp ap ap ap @@ -15736,18 +16953,18 @@ ei ei ei fJ +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -15878,18 +17095,18 @@ ei fJ fz fS +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -16020,18 +17237,18 @@ ei fJ ei fT +dB fZ -ap -ap -ap -ap -dD -ap -ap -ap -dD -ap -ap +fZ +fZ +fZ +PL +fZ +fZ +fZ +PL +fZ +xp ap ap ap @@ -16162,18 +17379,18 @@ ei fJ fA fU +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -16304,18 +17521,18 @@ ei ei ei fJ +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -16446,18 +17663,18 @@ fA fA fA fU +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -16588,18 +17805,18 @@ aG bh aG aG +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -16730,18 +17947,18 @@ dK dJ dK dK +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -16872,18 +18089,18 @@ dJ dJ dJ dJ +dB fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +fZ +xp ap ap ap @@ -17015,17 +18232,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -17156,18 +18373,18 @@ dQ fK fR fR -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +tR +hC +SJ +hC +SJ +hC +hC +hC +hC +Uq +xp ap ap ap @@ -17298,18 +18515,18 @@ dQ fK fR fR -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +XD +BP +BP +BP +BP +BP +BP +BP +BP +Wz +xp ap ap ap @@ -17440,18 +18657,18 @@ dQ fK fR fR -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +Eq +BP +fm +BP +fm +BP +BP +NT +BP +Wz +xp ap ap ap @@ -17582,18 +18799,18 @@ dQ fK fR fR -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +XD +BP +BP +BP +BP +BP +BP +NT +BU +Wz +xp ap ap ap @@ -17724,7 +18941,18 @@ dQ fK fR fR -fZ +dB +zA +BP +BP +BP +TH +BP +BP +ml +NT +TH +xp ap ap ap @@ -17737,17 +18965,6 @@ ap ap ap ap -dD -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -17866,7 +19083,18 @@ dQ fK fR fR -fZ +dB +NT +BP +BP +BP +TH +BP +BP +BP +BC +Wz +xp ap ap ap @@ -17879,17 +19107,6 @@ ap ap ap ap -dD -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -18008,7 +19225,18 @@ dQ fK fR fR -fZ +dB +XD +BP +BP +BP +BP +BP +BP +BP +BP +Wz +xp ap ap ap @@ -18021,17 +19249,6 @@ ap ap ap ap -dD -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -18150,7 +19367,18 @@ dQ fK fR fR -fZ +dB +Eq +BP +fm +BP +fm +BP +BP +BP +BP +Wz +xp ap ap ap @@ -18163,17 +19391,6 @@ ap ap ap ap -dD -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -18292,7 +19509,18 @@ dQ fK fR fR -fZ +dB +XD +BP +BP +BP +BP +BP +BP +BP +BP +Wz +xp ap ap ap @@ -18305,17 +19533,6 @@ ap ap ap ap -dD -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap ap ap ap @@ -18434,18 +19651,18 @@ dQ fK fR fR -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +Lt +Gg +rD +Gg +rD +Gg +Gg +Gg +Gg +KR +xp ap ap ap @@ -18577,17 +19794,17 @@ aL aL aL ar -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar ap ap ap @@ -18718,18 +19935,18 @@ fB fB fB fV -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +fN +Nj +kN +sj +kN +kN +sj +GE +za +DB +xp ap ap ap @@ -18860,18 +20077,18 @@ em em em fW -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +ov +sj +sj +sj +sj +sj +sj +sj +sj +TM +xp ap ap ap @@ -19002,18 +20219,18 @@ em em em fW -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +BR +sj +sj +sj +sj +sj +sj +sj +sj +vx +xp ap ap ap @@ -19144,18 +20361,18 @@ em em em fW -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +sj +sj +oJ +Yz +Yz +Yz +Yz +pU +sj +FX +xp ap ap ap @@ -19286,18 +20503,18 @@ em em em fW -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +sj +sj +zC +CF +CF +CF +CF +Qh +sj +hX +xp ap ap ap @@ -19428,18 +20645,18 @@ em em em fW -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +sj +sj +zC +CF +CF +CF +CF +Qh +sj +sj +xp ap ap ap @@ -19570,18 +20787,18 @@ fC fC fC fX -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +sj +sj +xz +Sj +Sj +Sj +Sj +oR +sj +sj +xp ap ap ap @@ -19712,18 +20929,18 @@ aH br aH aH -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +sj +sj +sj +sj +sj +sj +sj +sj +sj +sj +xp ap ap ap @@ -19854,18 +21071,18 @@ dS dR dS dS -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +sj +sj +sj +sj +sj +sj +sj +sj +sj +sj +xp ap ap ap @@ -19996,18 +21213,18 @@ dR dR dR dR -fZ -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap -ap +dB +sj +sj +sj +sj +sj +sj +sj +sj +sj +sj +xp ap ap ap @@ -20139,19 +21356,19 @@ aL aL aL ar +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar +ap ap -ar -aI -aI -aI -aI -aI -aI -aI -aI -aI -aI -ar ap ap ap @@ -20280,8 +21497,6 @@ dY dY dY dY -fZ -ap dB BV BV @@ -20293,7 +21508,9 @@ BV BV BV BV -fZ +xp +ap +ap ap ap ap @@ -20422,20 +21639,20 @@ ci dY dY dY -fZ -ap dB BV +xt BV +ED BV +oq +Dh +Dh +JQ BV -BV -BV -BV -BV -BV -BV -fZ +xp +ap +ap ap ap ap @@ -20564,20 +21781,20 @@ dY dY dY dY -fZ -ap dB BV BV BV BV BV +rU +Yn +Yn +wf BV -BV -BV -BV -BV -fZ +xp +ap +ap ap ap ap @@ -20706,20 +21923,20 @@ bD dY cM dY -fZ -ap dB BV +xt BV +ED BV +rU +Yn +Yn +wf BV -BV -BV -BV -BV -BV -BV -fZ +xp +ap +ap ap ap ap @@ -20848,20 +22065,20 @@ bE dY cM dY -fZ -ap dB BV BV BV BV BV +mY +OU +OU +uh BV -BV -BV -BV -BV -fZ +xp +ap +ap ap ap ap @@ -20990,8 +22207,6 @@ bE dY cM dY -fZ -ap dB BV BV @@ -21003,7 +22218,9 @@ BV BV BV BV -fZ +xp +ap +ap ap ap ap @@ -21132,20 +22349,20 @@ bF dY dY dY -fZ -ap dB BV +MT +BV +wR BV BV BV BV BV BV -BV -BV -BV -fZ +xp +ap +ap ap ap ap @@ -21274,8 +22491,6 @@ dY dY dY dY -fZ -ap dB BV BV @@ -21286,8 +22501,10 @@ BV BV BV BV -BV -fZ +Xq +xp +ap +ap ap ap ap @@ -21416,20 +22633,20 @@ cL dY dY fY -fZ -ap dB BV +wR +BV +MT BV BV BV BV BV -BV -BV -BV -BV -fZ +jS +xp +ap +ap ap ap ap @@ -21558,8 +22775,6 @@ dY dY dY fY -fZ -ap dB BV BV @@ -21570,8 +22785,10 @@ BV BV BV BV -BV -fZ +fl +xp +ap +ap ap ap ap @@ -21701,19 +22918,19 @@ bb bb bb ar +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +ar +ap ap -ar -aL -aL -aL -aL -aL -aL -aL -aL -aL -aL -ar ap ap ap diff --git a/maps/stellardelight/stellar_delight.dm b/maps/stellardelight/stellar_delight.dm index 1713145357..01d997494a 100644 --- a/maps/stellardelight/stellar_delight.dm +++ b/maps/stellardelight/stellar_delight.dm @@ -2,8 +2,11 @@ #include "stellar_delight_areas.dm" #include "stellar_delight_defines.dm" - #include "stellar_delight_misc.dm" + #include "stellar_delight_jobs.dm" + #include "stellar_delight_shuttle_defs.dm" #include "stellar_delight_telecomms.dm" + #include "stellar_delight_things.dm" + #include "stellar_delight_turfs.dm" #include "..\offmap_vr\common_offmaps.dm" #include "..\tether\tether_jobs.dm" diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm index d4a2b5ba03..5be491d41c 100644 --- a/maps/stellardelight/stellar_delight1.dmm +++ b/maps/stellardelight/stellar_delight1.dmm @@ -8,6 +8,7 @@ "ac" = ( /obj/structure/table/steel_reinforced, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 1; name = "night shift APC"; nightshift_setting = 2 @@ -183,6 +184,9 @@ /obj/machinery/shower{ dir = 1 }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "ay" = ( @@ -640,29 +644,7 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "bv" = ( -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/structure/table/steel, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/wall{ - dir = 1 - }, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/storage/bag/trash, -/obj/item/weapon/storage/bag/trash, -/obj/item/device/lightreplacer, -/obj/item/weapon/storage/box/lights/mixed, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/janitor) "bw" = ( @@ -673,6 +655,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/catwalk_plated/dark, +/obj/effect/landmark/vines, /turf/simulated/floor, /area/stellardelight/deck1/port) "bx" = ( @@ -810,23 +793,10 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "bJ" = ( -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/angled{ - dir = 1; - name = "night shift APC"; - nightshift_setting = 2 - }, -/obj/random/soap, -/obj/random/soap, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/clothing/under/bathrobe, -/obj/item/clothing/under/bathrobe, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white, -/area/stellardelight/deck1/shower) +/obj/structure/table/steel, +/obj/item/weapon/storage/box/lights/mixed, +/turf/simulated/floor/tiled/monotile, +/area/janitor) "bK" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -1070,6 +1040,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/item/weapon/material/ashtray/glass, /turf/simulated/floor/carpet/bcarpet, /area/stellardelight/deck1/starboard) "cm" = ( @@ -1158,16 +1129,7 @@ /turf/simulated/floor/tiled/eris/steel/panels, /area/stellardelight/deck1/pilot) "cu" = ( -/obj/machinery/shower{ - pixel_y = 15 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/shower) "cv" = ( /obj/structure/cable/green{ @@ -1344,6 +1306,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) "cV" = ( @@ -2078,6 +2041,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck1/researchserver) +"et" = ( +/obj/effect/landmark{ + name = "droppod_landing" + }, +/turf/space, +/area/space) "eu" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -2231,6 +2200,18 @@ /obj/machinery/mineral/equipment_vendor/survey, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) +"eL" = ( +/obj/structure/mirror{ + pixel_y = 38 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "eM" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2355,6 +2336,9 @@ /turf/simulated/floor/tiled/steel_ridged, /area/security/warden) "fb" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, @@ -2470,6 +2454,9 @@ dir = 1 }, /obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/research) "fq" = ( @@ -2667,6 +2654,8 @@ color = "#42038a"; icon_state = "0-2" }, +/obj/item/clothing/suit/bio_suit/scientist, +/obj/item/clothing/head/bio_hood/scientist, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) "fN" = ( @@ -2759,6 +2748,18 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) +"fU" = ( +/obj/structure/table/steel_reinforced, +/obj/machinery/door/firedoor/glass, +/obj/structure/window/reinforced, +/obj/machinery/door/blast/angled/open{ + dir = 2; + id = "securitylockdown" + }, +/obj/effect/floor_decal/milspec/color/red, +/obj/item/device/flashlight/lamp, +/turf/simulated/floor/tiled/dark, +/area/security/lobby) "fV" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/dark, @@ -2772,9 +2773,7 @@ "fX" = ( /obj/structure/table/woodentable, /obj/machinery/alarm/angled, -/obj/machinery/photocopier/faxmachine{ - department = "Library Conference Room" - }, +/obj/machinery/librarypubliccomp, /turf/simulated/floor/wood, /area/library) "fZ" = ( @@ -3082,6 +3081,18 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck1/exterior) +"gI" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/stellardelight/deck1/shower) "gK" = ( /obj/structure/table/woodentable, /obj/machinery/alarm/angled{ @@ -3116,8 +3127,9 @@ dir = 4 }, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 8; - req_access = list(31) + req_access = list(31,5) }, /obj/structure/cable/yellow, /obj/machinery/light/floortube{ @@ -3912,18 +3924,15 @@ /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck1/starboard) "in" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 5 +/obj/structure/cable/green{ + icon_state = "0-4" }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/power/apc/angled{ + dir = 1; + name = "night shift APC"; + nightshift_setting = 2 }, +/obj/structure/undies_wardrobe, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "io" = ( @@ -3939,7 +3948,11 @@ }, /obj/machinery/recharger/wallcharger{ pixel_x = 4; - pixel_y = 28 + pixel_y = 29 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 38 }, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) @@ -3978,12 +3991,16 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portfore) "it" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock{ + name = "Unisex Showers" + }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/shower) "iv" = ( /obj/machinery/atmospherics/pipe/simple/visible{ @@ -4214,6 +4231,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "iT" = ( @@ -4253,6 +4273,15 @@ /obj/structure/flora/pottedplant/stoutbush, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) +"iX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/fore) "iY" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -4284,7 +4313,7 @@ id = "xenospace2" }, /turf/simulated/floor/reinforced, -/area/rnd/xenobiology) +/area/rnd/workshop) "jc" = ( /obj/machinery/light_switch{ dir = 4; @@ -4297,16 +4326,10 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "jd" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 - }, -/obj/machinery/alarm/angled{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/shower) "jf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -4593,6 +4616,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "jG" = ( @@ -4702,6 +4726,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/pathfinder) +"jT" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/aft) "jV" = ( /obj/machinery/power/terminal{ dir = 4 @@ -4756,15 +4787,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/storage) -"kb" = ( -/obj/structure/cable/green{ - icon_state = "1-8" - }, -/obj/machinery/alarm/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/toilet) "kc" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Civilian Substation Bypass" @@ -4845,6 +4867,17 @@ }, /turf/simulated/floor/lino, /area/chapel/office) +"kl" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/milspec/color/emerald/half{ + dir = 4 + }, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/aft) "km" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -4931,13 +4964,12 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portfore) "ky" = ( +/obj/machinery/firealarm/angled{ + dir = 4 + }, /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "kz" = ( @@ -5016,8 +5048,11 @@ /turf/simulated/floor/airless, /area/stellardelight/deck1/exterior) "kK" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 }, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) @@ -5030,6 +5065,11 @@ "kM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/closet/emcloset, +/obj/item/device/radio/intercom{ + dir = 1; + name = "Station Intercom (General)"; + pixel_y = 21 + }, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck1/starboard) "kN" = ( @@ -5037,7 +5077,7 @@ id = "xenospace4" }, /turf/simulated/floor/reinforced, -/area/rnd/xenobiology) +/area/rnd/workshop) "kO" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -5082,9 +5122,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) -"kW" = ( -/turf/simulated/floor/tiled/white, -/area/stellardelight/deck1/shower) "kY" = ( /obj/structure/cable/pink{ icon_state = "1-2" @@ -5535,7 +5572,7 @@ dir = 4; door_color = "#333333"; name = "Exploration Equipment Room"; - req_one_access = list(19,43,67,66); + req_one_access = list(19,43,66); stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -5554,14 +5591,11 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/shuttlebay) "lQ" = ( -/obj/structure/mirror{ - pixel_y = 38 - }, -/obj/structure/sink{ - pixel_y = 20 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/toilet) +/obj/structure/table/steel, +/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/weapon/reagent_containers/spray/cleaner, +/turf/simulated/floor/tiled/monotile, +/area/janitor) "lR" = ( /obj/structure/stairs/spawner/north, /obj/structure/railing/grey{ @@ -5677,9 +5711,18 @@ /turf/simulated/floor/reinforced, /area/stellardelight/deck1/shuttlebay) "mc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/toilet) +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/structure/table/steel, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/machinery/disposal/wall{ + dir = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/janitor) "md" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -5840,6 +5883,18 @@ }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) +"ms" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "mt" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -5869,6 +5924,12 @@ /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, +/obj/item/device/lightreplacer, +/obj/structure/mopbucket, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/mop, +/obj/item/weapon/storage/bag/trash, +/obj/item/weapon/soap/nanotrasen, /turf/simulated/floor/tiled/monotile, /area/janitor) "mw" = ( @@ -5960,6 +6021,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/starboard) "mF" = ( @@ -6094,7 +6158,7 @@ dir = 8; door_color = "#ffffff"; name = "Recovery Room"; - req_access = list(6); + req_access = list(5); stripe_color = "#5a96bb" }, /turf/simulated/floor/tiled/steel_ridged, @@ -6109,6 +6173,15 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/starboard) +"mT" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/fore) "mU" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/dark, @@ -6137,7 +6210,7 @@ dir = 8; door_color = "#333333"; name = "Exploration"; - req_one_access = list(19,43,67,66); + req_one_access = list(19,43,66); stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -6384,6 +6457,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/reagent_dispensers/watertank, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "nC" = ( @@ -6423,6 +6497,9 @@ /obj/structure/sign/department/medbay{ pixel_x = -32 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "nH" = ( @@ -6603,21 +6680,6 @@ /obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled/dark, /area/security/warden) -"ob" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/toilet) "oc" = ( /obj/machinery/light{ dir = 4 @@ -6852,21 +6914,28 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) "oC" = ( /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "2-8" }, /obj/structure/cable/green{ icon_state = "2-4" }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "oD" = ( @@ -7013,13 +7082,9 @@ /turf/simulated/floor/tiled/techfloor, /area/rnd/workshop) "oT" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/clothing/under/bathrobe, -/obj/item/clothing/under/bathrobe, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/turf/simulated/floor/tiled/white, -/area/stellardelight/deck1/shower) +/obj/structure/closet/l3closet/janitor, +/turf/simulated/floor/tiled/monotile, +/area/janitor) "oU" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -7106,6 +7171,7 @@ dir = 8 }, /obj/effect/catwalk_plated/dark, +/obj/effect/landmark/vines, /turf/simulated/floor, /area/stellardelight/deck1/starboard) "ph" = ( @@ -7467,6 +7533,21 @@ "pR" = ( /turf/simulated/wall/bay/brown, /area/stellardelight/deck1/miningequipment) +"pS" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/stellardelight/deck1/shower) "pT" = ( /obj/structure/cable/pink{ icon_state = "4-8" @@ -7944,6 +8025,9 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/resleeving) +"qX" = ( +/turf/space/internal_edge/right, +/area/stellardelight/deck1/starboard) "qY" = ( /obj/effect/floor_decal/milspec/color/orange/half, /turf/simulated/floor/tiled/dark, @@ -8131,6 +8215,11 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/substation/security) +"rt" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/folder/blue, +/turf/simulated/floor/tiled/milspec, +/area/stellardelight/deck1/explobriefing) "ru" = ( /obj/machinery/light_switch{ dir = 4; @@ -8310,7 +8399,7 @@ /obj/machinery/door/airlock/angled_bay/standard/color{ door_color = "#ffffff"; name = "Morgue"; - req_access = list(6); + req_access = list(5,6); stripe_color = "#5a96bb" }, /turf/simulated/floor/tiled/steel_ridged, @@ -8451,13 +8540,12 @@ /turf/simulated/floor/lino, /area/chapel/office) "rZ" = ( -/obj/machinery/door/airlock/angled_bay/standard/color/common{ - dir = 4; - id_tag = "bathroomstall1"; - name = "Toilet 1" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/toilet) +/obj/structure/closet/l3closet/janitor, +/turf/simulated/floor/tiled/monotile, +/area/janitor) "sa" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -8729,6 +8817,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/dark, /area/chapel/main) "sC" = ( @@ -8983,6 +9072,10 @@ }, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/gateway) +"tc" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck1/exploration) "td" = ( /obj/structure/cable/pink{ icon_state = "4-8" @@ -9555,6 +9648,9 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm2) +"uw" = ( +/turf/space/internal_edge/left, +/area/stellardelight/deck1/starboard) "ux" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -9661,6 +9757,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 9 }, +/obj/structure/closet/emergsuit_wall{ + dir = 8; + pixel_x = -27 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "uH" = ( @@ -9871,15 +9971,13 @@ /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) "vd" = ( -/obj/structure/mirror{ - pixel_y = 38 +/obj/structure/toilet{ + dir = 4 }, -/obj/structure/sink{ - pixel_y = 20 - }, -/obj/machinery/light{ - dir = 8 +/obj/machinery/alarm/angled{ + dir = 4 }, +/obj/effect/landmark/start/visitor, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "ve" = ( @@ -9922,9 +10020,12 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "vh" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck1/starboard) "vi" = ( @@ -10007,6 +10108,16 @@ /obj/item/weapon/pen, /turf/simulated/floor/tiled/dark, /area/security/security_processing) +"vt" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/item_bank{ + dir = 4; + pixel_x = -29 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/starboard) "vu" = ( /turf/simulated/wall/bay/r_wall/brown, /area/stellardelight/deck1/dorms/dorm5) @@ -10178,15 +10289,14 @@ /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck1/starboard) "vM" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/button/remote/airlock{ + id = "bathroomstall1"; + name = "Toilet 1 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 }, +/obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "vN" = ( @@ -10384,6 +10494,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/carpet/bcarpet, /area/stellardelight/deck1/starboard) "wo" = ( @@ -10547,7 +10658,7 @@ /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora) "wJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "wK" = ( @@ -10704,6 +10815,7 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "xa" = ( @@ -10739,6 +10851,9 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled/dark, /area/security/security_processing) +"xe" = ( +/turf/simulated/wall/bay/r_wall/brown, +/area/stellardelight/deck1/starboard) "xf" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -10851,6 +10966,9 @@ }, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/gateway) +"xo" = ( +/turf/simulated/floor/reinforced, +/area/rnd/workshop) "xq" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -10955,15 +11073,12 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/oreprocessing) "xE" = ( -/obj/machinery/power/apc/angled{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "xF" = ( @@ -11089,10 +11204,19 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "xS" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "xT" = ( /obj/structure/disposalpipe/segment, @@ -11171,8 +11295,9 @@ dir = 8 }, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 4; - req_access = list(19,43,67) + req_access = list(19,43,67,66,5) }, /obj/structure/cable/green{ color = "#42038a" @@ -11244,8 +11369,14 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "yl" = ( -/obj/machinery/light/small{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/machinery/alarm/angled{ + dir = 4 }, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) @@ -11308,6 +11439,7 @@ /obj/structure/table/standard, /obj/machinery/recharger, /obj/item/device/retail_scanner/science, +/obj/item/device/multitool/scioutpost, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "yr" = ( @@ -11703,6 +11835,10 @@ }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) +"zi" = ( +/obj/machinery/space_heater, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck1/portcent) "zj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -11770,6 +11906,7 @@ dir = 4 }, /obj/effect/floor_decal/milspec/color/black, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/dark, /area/security/armoury) "zq" = ( @@ -12002,18 +12139,11 @@ /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/shuttlebay) "zP" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/cable/green{ + icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "zQ" = ( @@ -12509,6 +12639,10 @@ /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/weapon/paper_bin{ + pixel_y = 7 + }, +/obj/item/weapon/pen, /turf/simulated/floor/carpet, /area/library) "AO" = ( @@ -12828,6 +12962,7 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "BB" = ( @@ -12905,6 +13040,7 @@ /obj/machinery/door/airlock/angled_bay/standard/color{ dir = 8; door_color = "#ffffff"; + id_tag = "m-ex-room"; name = "Exam Room"; req_access = list(5); stripe_color = "#5a96bb" @@ -12927,6 +13063,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "BI" = ( @@ -13272,6 +13409,18 @@ "Ct" = ( /turf/simulated/wall/bay/r_wall/purple, /area/assembly/robotics) +"Cu" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/stellardelight/deck1/shower) "Cv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -13308,14 +13457,12 @@ /turf/simulated/floor/tiled/white, /area/security/detectives_office) "CA" = ( -/obj/structure/toilet{ - dir = 4 +/obj/machinery/door/airlock/angled_bay/standard/color/common{ + dir = 4; + id_tag = "bathroomstall1"; + name = "Toilet 1" }, -/obj/machinery/alarm/angled{ - dir = 4 - }, -/obj/effect/landmark/start/visitor, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/toilet) "CB" = ( /obj/structure/cable{ @@ -13480,9 +13627,9 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploequipment) "CU" = ( -/obj/machinery/washing_machine, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/alarm/angled, +/obj/structure/undies_wardrobe, /turf/simulated/floor/tiled/dark, /area/stellardelight/deck1/resleeving) "CV" = ( @@ -13763,6 +13910,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 5 }, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "Dz" = ( @@ -13973,21 +14123,6 @@ }, /turf/simulated/floor, /area/stellardelight/deck1/fore) -"DZ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, -/area/stellardelight/deck1/shower) "Eb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14007,6 +14142,9 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) +"Ef" = ( +/turf/space/internal_edge/top, +/area/stellardelight/deck1/starboard) "Eg" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -14064,6 +14202,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/port) "Eq" = ( @@ -14128,15 +14267,11 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portfore) "Ew" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/under/bathrobe, +/obj/item/clothing/under/bathrobe, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "Ex" = ( @@ -14184,6 +14319,18 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/rnd/xenobiology) +"EA" = ( +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 10 + }, +/obj/machinery/firealarm/angled{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/fore) "EB" = ( /obj/machinery/door/window/eastright{ dir = 8; @@ -14232,6 +14379,18 @@ pixel_x = 4; pixel_y = 5 }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 20 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 28 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 36 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck1/explobriefing) "EG" = ( @@ -14276,8 +14435,14 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck1/paramedic) "EN" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/mirror{ + pixel_y = 38 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/machinery/light{ + dir = 8 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -14387,6 +14552,9 @@ }, /turf/simulated/floor/tiled/dark, /area/chapel/main) +"EZ" = ( +/turf/space/internal_edge/bottomright, +/area/stellardelight/deck1/starboard) "Fa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 10 @@ -14639,10 +14807,7 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Fz" = ( -/obj/structure/closet/l3closet/janitor, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/janitor) "FA" = ( @@ -14750,7 +14915,7 @@ /obj/machinery/door/airlock/angled_bay/standard/color{ door_color = "#ffffff"; name = "Recovery Room"; - req_access = list(6); + req_access = list(5); stripe_color = "#5a96bb" }, /turf/simulated/floor/tiled/steel_ridged, @@ -15334,8 +15499,8 @@ }, /obj/structure/disposalpipe/sortjunction{ dir = 4; - name = "Bar"; - sortType = "Bar" + name = "Security"; + sortType = "Security" }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portcent) @@ -15757,17 +15922,10 @@ /area/prison/cell_block/B) "Ig" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-4" }, -/obj/random/soap, -/obj/random/soap, -/obj/item/weapon/towel/random, -/obj/item/weapon/towel/random, -/obj/item/clothing/under/bathrobe, -/obj/item/clothing/under/bathrobe, -/obj/structure/table/standard, -/turf/simulated/floor/tiled/white, -/area/stellardelight/deck1/shower) +/turf/simulated/wall/bay/r_wall/steel, +/area/crew_quarters/toilet) "Ih" = ( /obj/structure/closet{ name = "robotics equipment" @@ -15889,6 +16047,22 @@ /obj/structure/cable/pink{ icon_state = "4-8" }, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = 5 + }, /turf/simulated/floor/tiled/dark, /area/security/tactical) "Im" = ( @@ -15977,18 +16151,19 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "Iu" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; door_color = "#525252"; name = "Exploration Shuttle"; - req_one_access = list(19,43,67,66); + req_one_access = list(19,43,67,66,5); stripe_color = "#408f3b" }, /obj/structure/cable/green{ color = "#42038a"; icon_state = "4-8" }, +/obj/machinery/atmospheric_field_generator/perma/underdoors, +/obj/machinery/door/firedoor/glass/talon, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/exploshuttle) "Iw" = ( @@ -16216,11 +16391,11 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/portcent) +"IT" = ( +/turf/space/internal_edge/bottom, +/area/stellardelight/deck1/starboard) "IU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "IV" = ( @@ -16316,6 +16491,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/steel_grid, /area/rnd/research) "Jd" = ( @@ -16418,6 +16594,14 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "m-ex-room"; + name = "Exam Room Lock"; + pixel_x = -30; + pixel_y = -8; + specialfunctions = 4 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) "Js" = ( @@ -16751,11 +16935,18 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/dorms/dorm6) "Ki" = ( -/obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, -/turf/simulated/floor/tiled/monotile, -/area/janitor) +/obj/structure/toilet{ + dir = 4 + }, +/obj/machinery/alarm/angled{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "Kj" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/eris/white/gray_platform, @@ -16790,6 +16981,18 @@ /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) +"Ko" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "Kp" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -16865,14 +17068,16 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "Kz" = ( -/obj/machinery/power/apc/angled{ - dir = 1 +/obj/machinery/button/remote/airlock{ + id = "bathroomstall2"; + name = "Toilet 2 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 }, +/obj/machinery/light/small, /obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/closet/crate/bin{ - anchored = 1 + icon_state = "4-8" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -17123,6 +17328,17 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/security/lobby) +"Lf" = ( +/obj/structure/cable/green{ + color = "#42038a"; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/space_heater, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck1/starboardaft) "Lg" = ( /turf/simulated/wall/bay/r_wall/steel, /area/chapel/chapel_morgue) @@ -17250,14 +17466,20 @@ /obj/machinery/firealarm/angled{ dir = 8 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) "Ls" = ( -/obj/machinery/light{ - dir = 4 +/obj/machinery/power/apc/angled{ + dir = 1 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "0-2" + }, +/obj/structure/closet/crate/bin{ + anchored = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -17345,6 +17567,8 @@ /obj/item/weapon/material/minihoe, /obj/item/inflatable/door, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/weapon/storage/box/botanydisk, +/obj/item/weapon/storage/box/botanydisk, /turf/simulated/floor/tiled/eris, /area/rnd/xenobiology/xenoflora) "LA" = ( @@ -17531,14 +17755,11 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "LR" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/firealarm/angled{ +/obj/machinery/light{ dir = 4 }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "1-2" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -17606,17 +17827,19 @@ /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck1/exploration) "Ma" = ( -/obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; door_color = "#a88860"; name = "Mining Shuttle"; - req_access = list(31); + req_access = null; + req_one_access = list(31,5); stripe_color = "#69461a" }, /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/atmospheric_field_generator/perma/underdoors, +/obj/machinery/door/firedoor/glass/talon, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/miningshuttle) "Mb" = ( @@ -17686,6 +17909,9 @@ /obj/structure/low_wall/bay/reinforced/purple, /turf/simulated/floor, /area/rnd/workshop) +"Mh" = ( +/turf/space/internal_edge/topleft, +/area/stellardelight/deck1/starboard) "Mi" = ( /obj/structure/table/standard, /obj/item/weapon/stock_parts/matter_bin, @@ -17758,15 +17984,15 @@ /turf/simulated/floor/bluegrid, /area/assembly/robotics) "Ms" = ( -/obj/machinery/door/window{ - dir = 1 - }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals10{ dir = 10 }, +/obj/structure/curtain/open/privacy{ + name = "shower curtain" + }, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "Mt" = ( @@ -17931,15 +18157,15 @@ /turf/simulated/floor, /area/stellardelight/deck1/dorms/dorm6) "MO" = ( -/obj/machinery/button/remote/airlock{ - id = "bathroomstall1"; - name = "Toilet 1 Lock"; - pixel_x = -10; - pixel_y = 22; - specialfunctions = 4 +/obj/machinery/door/airlock/angled_bay/standard/color/common{ + dir = 4; + id_tag = "bathroomstall2"; + name = "Toilet 2" }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/white, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/toilet) "MP" = ( /obj/machinery/power/pointdefense{ @@ -18043,13 +18269,25 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck1/resleeving) "MZ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 5 }, -/turf/simulated/floor/tiled/steel_ridged, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 6 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "Nb" = ( /obj/machinery/door/firedoor/glass, @@ -18323,9 +18561,6 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "NC" = ( -/obj/structure/mopbucket, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, /obj/item/device/radio/intercom{ dir = 8; pixel_x = -24 @@ -18401,6 +18636,9 @@ /area/assembly/robotics) "NN" = ( /obj/structure/table/steel_reinforced, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/dark, /area/security/lobby) "NP" = ( @@ -18432,6 +18670,9 @@ }, /turf/simulated/floor, /area/stellardelight/deck1/mining) +"NT" = ( +/turf/space/internal_edge/topright, +/area/stellardelight/deck1/starboard) "NV" = ( /obj/structure/cable/green{ color = "#42038a"; @@ -18666,7 +18907,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/junction, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -18674,6 +18914,7 @@ dir = 4 }, /obj/effect/catwalk_plated/dark, +/obj/structure/disposalpipe/junction, /turf/simulated/floor, /area/stellardelight/deck1/starboard) "Ou" = ( @@ -18832,13 +19073,10 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/stellardelight/deck1/exploshuttle) "OM" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 9 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 10 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/shower) "ON" = ( /obj/structure/cable/green{ @@ -18972,9 +19210,18 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck1/exploration) "Pf" = ( -/obj/structure/closet/l3closet/janitor, -/turf/simulated/floor/tiled/monotile, -/area/janitor) +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 8 + }, +/obj/structure/closet/walllocker_double/east{ + dir = 8; + name = "Evidence Storage"; + pixel_x = -32 + }, +/obj/item/weapon/storage/box/evidence, +/obj/item/weapon/storage/box/evidence, +/turf/simulated/floor/tiled/dark, +/area/security/security_cell_hallway) "Pg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -19090,6 +19337,13 @@ /obj/structure/low_wall/bay/reinforced/brown, /turf/simulated/floor, /area/stellardelight/deck1/oreprocessing) +"Pt" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "Pu" = ( /turf/simulated/floor, /area/maintenance/stellardelight/substation/exploration) @@ -19167,15 +19421,16 @@ /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "PF" = ( -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals10{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, +/obj/random/soap, +/obj/random/soap, +/obj/item/weapon/towel/random, +/obj/item/weapon/towel/random, +/obj/item/clothing/under/bathrobe, +/obj/item/clothing/under/bathrobe, +/obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "PG" = ( @@ -19199,6 +19454,12 @@ /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, +/obj/item/device/lightreplacer, +/obj/structure/mopbucket, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/mop, +/obj/item/weapon/storage/bag/trash, +/obj/item/weapon/soap/nanotrasen, /turf/simulated/floor/tiled/monotile, /area/janitor) "PI" = ( @@ -19264,7 +19525,6 @@ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/monkeycubes, /obj/item/weapon/soap/nanotrasen, /obj/structure/closet/walllocker_double/medical/east, /obj/item/weapon/hand_labeler, @@ -19273,6 +19533,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/item/weapon/storage/box/monkeycubes/wolpincubes, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/virology) "PR" = ( @@ -19300,16 +19561,14 @@ /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) "PU" = ( -/obj/structure/toilet{ - dir = 4 +/obj/machinery/button/remote/airlock{ + id = "bathroomstall3"; + name = "Toilet 3 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 }, -/obj/machinery/alarm/angled{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/landmark/start/visitor, +/obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "PV" = ( @@ -19394,6 +19653,12 @@ /obj/machinery/alarm/angled, /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm3) +"Qf" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "Qg" = ( /obj/structure/table/steel, /obj/item/device/flashlight/lamp, @@ -19474,7 +19739,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/firealarm/angled, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) "Qp" = ( @@ -19688,6 +19955,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/alarm/angled, /obj/effect/floor_decal/milspec/color/black, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/dark, /area/security/armoury) "QQ" = ( @@ -19700,12 +19968,13 @@ /turf/simulated/floor/tiled/steel_grid, /area/maintenance/stellardelight/deck1/starboardaft) "QS" = ( -/obj/machinery/vending/wallmed1/public{ - pixel_x = 29 - }, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 24 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "QU" = ( @@ -19775,7 +20044,7 @@ door_color = "#2e2e2e"; fill_color = "#2e2e2e"; name = "Chapel Office"; - req_access = list(26); + req_access = list(22); stripe_color = "#deaf43" }, /turf/simulated/floor/tiled/steel_ridged, @@ -19828,15 +20097,12 @@ /turf/simulated/floor, /area/maintenance/stellardelight/substation/medical) "Ri" = ( -/obj/machinery/button/remote/airlock{ - id = "bathroomstall3"; - name = "Toilet 3 Lock"; - pixel_x = -10; - pixel_y = 22; - specialfunctions = 4 +/obj/machinery/door/airlock/angled_bay/standard/color/common{ + dir = 4; + id_tag = "bathroomstall3"; + name = "Toilet 3" }, -/obj/machinery/light/small, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/toilet) "Rj" = ( /obj/structure/cable/green{ @@ -19960,6 +20226,12 @@ /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, /obj/item/clothing/suit/caution, +/obj/item/device/lightreplacer, +/obj/structure/mopbucket, +/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/weapon/mop, +/obj/item/weapon/storage/bag/trash, +/obj/item/weapon/soap/nanotrasen, /turf/simulated/floor/tiled/monotile, /area/janitor) "Rr" = ( @@ -20147,6 +20419,9 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/exam_room) +"RI" = ( +/turf/space/internal_edge/bottomleft, +/area/stellardelight/deck1/starboard) "RJ" = ( /obj/machinery/light{ dir = 4 @@ -20156,6 +20431,15 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_cell_hallway) +"RK" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/machinery/alarm/angled{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/toilet) "RL" = ( /obj/structure/cable{ icon_state = "1-2" @@ -20237,7 +20521,7 @@ }, /obj/machinery/recharger/wallcharger{ pixel_x = 4; - pixel_y = 28 + pixel_y = 29 }, /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -20246,14 +20530,24 @@ /obj/effect/floor_decal/milspec/color/red/half{ dir = 4 }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 38 + }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "RX" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/milspec/color/red/half{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals6{ + dir = 9 + }, +/obj/machinery/power/apc/angled{ + dir = 8 }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "0-2" }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/fore) @@ -20544,15 +20838,13 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "SG" = ( -/obj/machinery/door/airlock/angled_bay/standard/color/common{ - dir = 4; - id_tag = "bathroomstall2"; - name = "Toilet 2" +/obj/machinery/vending/wallmed1/public{ + pixel_x = 29 }, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "SH" = ( /obj/structure/cable/green{ @@ -20666,7 +20958,7 @@ id = "xenospace6" }, /turf/simulated/floor/reinforced, -/area/rnd/xenobiology) +/area/rnd/workshop) "SS" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -20700,7 +20992,12 @@ /turf/simulated/floor/carpet/purcarpet, /area/stellardelight/deck1/dorms/dorm7) "SV" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/stellardelight/deck1/shower) "SW" = ( @@ -20718,16 +21015,19 @@ /turf/simulated/floor/tiled/steel_ridged, /area/maintenance/stellardelight/deck1/exploration) "SX" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock{ - name = "Unisex Showers" +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /obj/structure/cable/green{ - icon_state = "1-2" + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "SY" = ( /obj/structure/cable/green{ @@ -20946,6 +21246,16 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck1/starboard) +"Tw" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/wall{ + dir = 4; + plane = -34 + }, +/turf/simulated/floor/tiled/techfloor, +/area/stellardelight/deck1/port) "Tx" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -20969,6 +21279,7 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/exploration) "TB" = ( @@ -21207,6 +21518,8 @@ /obj/machinery/alarm/angled{ dir = 4 }, +/obj/item/paint_palette, +/obj/item/paint_brush, /turf/simulated/floor/wood, /area/library) "TW" = ( @@ -21232,7 +21545,7 @@ door_color = "#ffffff"; id_tag = "recoveryexit"; name = "Recovery Room"; - req_access = list(6); + req_access = list(5); stripe_color = "#5a96bb" }, /turf/simulated/floor/tiled/steel_ridged, @@ -21372,8 +21685,11 @@ /turf/simulated/floor/airless, /area/stellardelight/deck1/exterior) "Um" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 +/obj/structure/mirror{ + pixel_y = 38 + }, +/obj/structure/sink{ + pixel_y = 20 }, /obj/structure/cable/green{ icon_state = "4-8" @@ -21483,6 +21799,10 @@ }, /turf/simulated/floor/tiled, /area/rnd/storage) +"Uy" = ( +/obj/item/weapon/bikehorn/rubberducky, +/turf/simulated/floor/tiled/steel_ridged, +/area/stellardelight/deck1/shower) "Uz" = ( /obj/structure/bookcase/bookcart, /turf/simulated/floor/carpet, @@ -21495,6 +21815,7 @@ /area/rnd/research) "UB" = ( /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 1; name = "night shift APC"; nightshift_setting = 2 @@ -21564,6 +21885,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/reinforced, /area/stellardelight/deck1/shuttlebay) "UK" = ( @@ -21792,9 +22114,11 @@ /turf/simulated/wall/bay/r_wall/steel, /area/prison/cell_block) "Vf" = ( -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/wall{ + dir = 8 }, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck1/starboard) @@ -21917,6 +22241,7 @@ /obj/item/weapon/book/manual/supermatter_engine, /obj/item/weapon/book/manual/tesla_engine, /obj/item/weapon/book/manual/virology, +/obj/effect/landmark/vermin, /turf/simulated/floor/wood, /area/library) "Vq" = ( @@ -21994,6 +22319,9 @@ /area/stellardelight/deck1/dorms/dorm7) "Vw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck1/port) "Vx" = ( @@ -22094,7 +22422,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/ore_box, +/obj/structure/table/standard, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "VF" = ( @@ -22198,7 +22529,7 @@ /area/rnd/xenobiology/xenoflora_storage) "VP" = ( /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "2-8" }, /turf/simulated/wall/bay/r_wall/steel, /area/crew_quarters/toilet) @@ -22259,6 +22590,9 @@ name = "night shift APC"; nightshift_setting = 2 }, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/wood, /area/library) "Wa" = ( @@ -22332,6 +22666,7 @@ dir = 4 }, /obj/random/coin/sometimes, +/obj/item/weapon/material/ashtray/glass, /turf/simulated/floor/carpet/bcarpet, /area/stellardelight/deck1/port) "Wg" = ( @@ -22562,6 +22897,21 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet, /area/stellardelight/deck1/dorms/dorm5) +"WF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, +/area/stellardelight/deck1/port) "WG" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -22578,14 +22928,12 @@ "WJ" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/weapon/pen, /obj/structure/sign/painting/library_secure{ pixel_y = 30 }, +/obj/machinery/photocopier/faxmachine{ + department = "Library Conference Room" + }, /turf/simulated/floor/wood, /area/library) "WK" = ( @@ -22651,6 +22999,7 @@ /obj/item/weapon/tank/jetpack/carbondioxide, /obj/item/weapon/tank/jetpack/carbondioxide, /obj/item/weapon/tank/jetpack/carbondioxide, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/white/gray_platform, /area/gateway) "WU" = ( @@ -23017,7 +23366,7 @@ dir = 4; door_color = "#ffffff"; name = "maintenance access"; - req_one_access = list(19,43,67,66); + req_one_access = list(19,43,66); stripe_color = "#5a19a8" }, /turf/simulated/floor/tiled/steel_ridged, @@ -23118,12 +23467,10 @@ /turf/simulated/floor/tiled/steel_ridged, /area/assembly/robotics) "XP" = ( -/obj/machinery/door/airlock/angled_bay/standard/color/common{ - dir = 4; - id_tag = "bathroomstall3"; - name = "Toilet 3" +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 }, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "XQ" = ( /obj/structure/disposalpipe/trunk{ @@ -23286,6 +23633,7 @@ /obj/machinery/camera/network/mining{ dir = 8 }, +/obj/structure/ore_box, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "Yi" = ( @@ -23435,7 +23783,9 @@ /area/security/tactical) "Yy" = ( /obj/structure/table/steel_reinforced, -/obj/machinery/recharger, +/obj/machinery/recharger{ + pixel_y = 5 + }, /obj/structure/sign/vacuum{ pixel_y = 32 }, @@ -23752,6 +24102,12 @@ /obj/machinery/recharge_station, /turf/simulated/floor/bluegrid, /area/assembly/robotics) +"Zd" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/space, +/area/space) "Ze" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -23773,7 +24129,9 @@ /area/stellardelight/deck1/miningequipment) "Zh" = ( /obj/structure/table/woodentable, -/obj/item/weapon/folder/blue, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/milspec, /area/stellardelight/deck1/explobriefing) "Zi" = ( @@ -23794,16 +24152,8 @@ /turf/simulated/floor/tiled/steel_ridged, /area/prison/cell_block/C) "Zk" = ( -/obj/machinery/button/remote/airlock{ - id = "bathroomstall2"; - name = "Toilet 2 Lock"; - pixel_x = -10; - pixel_y = 22; - specialfunctions = 4 - }, -/obj/machinery/light/small, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -23963,7 +24313,14 @@ /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) "ZC" = ( -/obj/machinery/firealarm/angled, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 20 + }, +/obj/machinery/recharger/wallcharger{ + pixel_x = 4; + pixel_y = 29 + }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "ZD" = ( @@ -24026,6 +24383,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/machinery/firealarm/angled{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/stellardelight/deck1/mining) "ZK" = ( @@ -24059,9 +24419,9 @@ /obj/structure/cable/white{ icon_state = "1-2" }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -27 +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 }, /turf/simulated/floor/tiled/techmaint, /area/stellardelight/deck1/aft) @@ -27253,7 +27613,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -27793,7 +28153,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -27975,7 +28335,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -28040,7 +28400,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -28417,7 +28777,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -28774,7 +29134,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -29445,7 +29805,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -30545,7 +30905,7 @@ RF RF uq uq -uq +et uq uq uq @@ -31101,7 +31461,7 @@ Rz TC oZ Zh -zZ +rt OB Rz ny @@ -31371,7 +31731,7 @@ Om BN pO Uw -vT +tc Ua Jg ne @@ -31488,11 +31848,11 @@ PM PM PM PM -Xc -Xc +PM +PM Xc VP -Xc +Ig Xc Xc Xc @@ -31630,17 +31990,17 @@ PM KA Lj NC +bJ +mM +vd IY -CA -IY -PU -IY -CA +Ki IY vd -EN IY -bJ +EN +XP +NH in xS jd @@ -31771,22 +32131,22 @@ GV Rt no Eo -Ki -IY -MO -IY -Zk -IY -Ri -IY +no lQ -Um +mM +vM IY -Ig -PF +Kz +IY +PU +IY +Um +Zk NH +PF +gI cu -kW +SV NH NH NH @@ -31914,20 +32274,20 @@ PM mv pN bv +mc +mM +CA IY -rZ +MO IY -SG +Ri IY -XP -IY -lQ -ob +eL SX it zP -NH -cu +pS +Uy SV Ms Dy @@ -31969,7 +32329,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -32048,29 +32408,29 @@ gY gY km QB -gY +zi gY HY GN PM PH Bz -Pf -IY -mc +no +oT +mM wJ IU fb kQ kQ kQ -vM -IY -oT -Ew +kQ +Ko NH +Ew +Cu cu -kW +SV NH NH NH @@ -32142,7 +32502,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -32198,18 +32558,18 @@ PM Rq Nr Fz -IY -Kz +rZ +mM Ls LR oC ky QS -Ls -kb -IY -oT -DZ +SG +LR +RK +NH +Ew MZ OM kK @@ -32340,8 +32700,8 @@ PM mM iF mM -IY -IY +mM +mM IY IY Fu @@ -32470,13 +32830,13 @@ Nh BU qo uA -HW +Tw IA Hi Dq aN hp -YT +Qf YS rg rg @@ -32754,7 +33114,7 @@ Ou ls ew AG -CZ +ms CZ CZ hk @@ -32895,8 +33255,8 @@ hL rb hL YT -Rk -YT +WF +Pt SL YT Je @@ -33027,7 +33387,7 @@ Zy SQ Yv xE -RX +zW xZ MA Zt @@ -33217,7 +33577,7 @@ MK qR CG iS -KX +jT dl QK pV @@ -33309,9 +33669,9 @@ Xk OD ZR QG -XC -IF -zW +RX +iX +mT Ku Ku Ku @@ -33612,13 +33972,13 @@ rW lC HT ER -uq -uq -uq -uq -uq -uq -uq +EZ +qX +qX +qX +qX +qX +NT vu Br AP @@ -33754,13 +34114,13 @@ SH jD PI IZ -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef AT Aq WE @@ -33896,13 +34256,13 @@ zg aj Wl IZ -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef AT Qd VH @@ -34018,7 +34378,7 @@ GT ya mu NN -jy +fU mO Ha df @@ -34038,13 +34398,13 @@ bi bi bi bi -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef IC IC IC @@ -34180,13 +34540,13 @@ Si gK LX wE -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef PA da dc @@ -34322,13 +34682,13 @@ KG sn kL wE -uq -uq -uq -uq -uq -uq -uq +IT +xe +xe +xe +xe +xe +Ef PA Wk iT @@ -34414,7 +34774,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -34464,13 +34824,13 @@ HX Gu JB bi -uq -uq -uq -uq -uq -uq -uq +RI +uw +uw +uw +uw +uw +Mh IC RM De @@ -34729,7 +35089,7 @@ HN Tg Vr Hs -zb +EA zc zW Ku @@ -34858,7 +35218,7 @@ TE CM qG PO -QQ +Pf wT wT wT @@ -35458,7 +35818,7 @@ Sj Jb Sj mS -Sj +vt Sj Sj pg @@ -35621,7 +35981,7 @@ Wj MH xx xF -XJ +kl CV kv jg @@ -36752,7 +37112,7 @@ Dv il OR CY -Dv +Lf Qz Dv Dv @@ -37503,7 +37863,7 @@ EG RF uq uq -uq +et uq uq uq @@ -37966,7 +38326,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -38042,16 +38402,16 @@ bD bD ym ym -RN -RN +xo +xo jb ym -RN -RN +xo +xo kN ym -RN -RN +xo +xo SR Vg pQ @@ -38075,7 +38435,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -38711,7 +39071,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -39123,7 +39483,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -39431,7 +39791,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -39904,7 +40264,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -40301,7 +40661,7 @@ uq uq uq uq -uq +Zd uq uq uq @@ -41317,7 +41677,7 @@ uq uq uq uq -uq +Zd uq uq uq diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm index fa48b0d90d..40257a3a9a 100644 --- a/maps/stellardelight/stellar_delight2.dmm +++ b/maps/stellardelight/stellar_delight2.dmm @@ -169,6 +169,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "aq" = ( @@ -214,6 +215,13 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"av" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/mob/living/simple_mob/animal/goat{ + name = "Ted" + }, +/turf/simulated/floor/tiled/freezer/cold, +/area/crew_quarters/kitchen) "aw" = ( /obj/structure/table/standard, /obj/random/tech_supply, @@ -261,6 +269,9 @@ }, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) +"aA" = ( +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/fore) "aB" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -316,6 +327,9 @@ dir = 8 }, /obj/effect/floor_decal/milspec/color/white/half, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "aG" = ( @@ -326,6 +340,13 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"aH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/mob/living/simple_mob/vore/alienanimals/teppi/baby, +/turf/simulated/floor/grass, +/area/hydroponics) "aI" = ( /obj/structure/cable{ icon_state = "1-2" @@ -342,6 +363,14 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) +"aJ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/mob/living/simple_mob/animal/passive/cow, +/turf/simulated/floor/grass, +/area/hydroponics) "aK" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -377,6 +406,11 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) +"aP" = ( +/obj/structure/disposalpipe/segment, +/mob/living/simple_mob/vore/alienanimals/teppi/baby, +/turf/simulated/floor/grass, +/area/hydroponics) "aQ" = ( /obj/structure/grille, /turf/simulated/floor/airless, @@ -413,6 +447,13 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portfore) +"aU" = ( +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/aftport) +"aV" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck2/portaft) "aW" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -452,6 +493,22 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) +"ba" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "bb" = ( /obj/machinery/light/floortube{ dir = 4; @@ -549,6 +606,42 @@ }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) +"bm" = ( +/obj/structure/sign/directions/science{ + pixel_x = 32 + }, +/obj/structure/sign/directions/dorms{ + pixel_x = 32; + pixel_y = 6 + }, +/obj/structure/sign/directions{ + desc = "A direction sign, pointing out the way to Exploration."; + name = "\improper Exploration Department"; + pixel_x = 32; + pixel_y = -6 + }, +/obj/structure/sign/directions/security{ + pixel_x = 32; + pixel_y = 12 + }, +/obj/structure/sign/directions/stairs_down{ + pixel_x = 32; + pixel_y = 18 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/aftport) +"bn" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/cable/white{ + icon_state = "32-1" + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/triage) "bo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 9 @@ -580,8 +673,36 @@ /obj/effect/floor_decal/milspec/color/green/half{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hydroponics) +"br" = ( +/obj/structure/sign/directions/science{ + pixel_x = -32 + }, +/obj/structure/sign/directions/dorms{ + pixel_x = -32; + pixel_y = 6 + }, +/obj/structure/sign/directions{ + desc = "A direction sign, pointing out the way to Exploration."; + name = "\improper Exploration Department"; + pixel_x = -32; + pixel_y = -6 + }, +/obj/structure/sign/directions/security{ + pixel_x = -32; + pixel_y = 12 + }, +/obj/structure/sign/directions/stairs_down{ + pixel_x = -32; + pixel_y = 18 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/aftstarboard) "bs" = ( /obj/structure/table/standard, /obj/item/device/healthanalyzer, @@ -603,6 +724,7 @@ /obj/effect/floor_decal/milspec/color/green/half{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hydroponics) "bu" = ( @@ -620,6 +742,9 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) +"bv" = ( +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/aftstarboard) "bw" = ( /obj/machinery/power/pointdefense{ id_tag = "sd_pd" @@ -696,6 +821,15 @@ /obj/machinery/atmospherics/pipe/simple/visible/black, /turf/simulated/wall/bay/r_wall/orange, /area/engineering/atmos/storage) +"bG" = ( +/obj/structure/cable/yellow{ + icon_state = "32-8" + }, +/obj/structure/sign/department/miner_dock{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/monotile, +/area/quartermaster/storage) "bH" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -762,6 +896,20 @@ }, /turf/simulated/floor, /area/stellardelight/deck2/central) +"bM" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/mob/living/simple_mob/animal/passive/opossum/poppy, +/turf/simulated/floor/tiled/eris/dark/gray_platform, +/area/engineering/workshop) "bN" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -777,6 +925,14 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"bO" = ( +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24 + }, +/mob/living/simple_mob/otie/red/chubby/cocoa, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "bP" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -786,8 +942,20 @@ dir = 6 }, /obj/machinery/alarm/angled, +/obj/machinery/space_heater, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portfore) +"bQ" = ( +/obj/structure/closet/secure_closet/quartermaster, +/obj/item/weapon/storage/backpack/dufflebag, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/firealarm/angled{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/quartermaster/qm) "bR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/orange{ @@ -820,12 +988,13 @@ /turf/simulated/wall/bay/r_wall/steel, /area/engineering/storage) "bU" = ( -/mob/living/simple_mob/vore/alienanimals/teppi/baby, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/filingcabinet, +/obj/machinery/light, +/obj/machinery/alarm/angled{ + dir = 8 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/wood, +/area/quartermaster/qm) "bV" = ( /obj/structure/table/woodentable, /obj/item/weapon/book/manual/bar_guide, @@ -886,6 +1055,27 @@ /obj/structure/table/fancyblack, /turf/simulated/floor/carpet/sblucarpet, /area/stellardelight/deck2/briefingroom) +"cc" = ( +/obj/machinery/power/smes/buildable{ + RCon_tag = "Engine - Core"; + charge = 2e+006; + input_attempt = 1; + input_level = 200000; + name = "Engine"; + output_level = 250000 + }, +/obj/structure/cable/cyan{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/engineering/storage) +"cd" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/floodlight, +/turf/simulated/floor/plating, +/area/engineering/storage) "ce" = ( /obj/machinery/vending/wardrobe/cargodrobe, /obj/machinery/status_display/supply_display{ @@ -969,6 +1159,13 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"cp" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/power/thermoregulator, +/turf/simulated/floor/plating, +/area/engineering/storage) "cq" = ( /obj/machinery/air_sensor{ frequency = 1438; @@ -1219,6 +1416,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) +"cS" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "cT" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -1243,6 +1444,7 @@ /obj/effect/landmark{ name = "morphspawn" }, +/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portaft) "cW" = ( @@ -1301,6 +1503,19 @@ }, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/locker_room) +"db" = ( +/obj/structure/table/reinforced, +/obj/item/weapon/paper{ + info = "For those who didn't know yet, the big blue box in here is a 'grid checker' which will shut off the power if a dangerous power spike erupts into the powernet, shutting everything down protects everything from electrical damage, however the outages can be disruptive to ship operations, so it is designed to restore power after a somewhat significant delay, up to fifteen minutes or so. The grid checker can be manually hacked in order to end the outage sooner. To do that, you must cut three specific wires which do not cause a red light to shine, then pulse a fourth wire. Electrical protection is highly recommended when doing maintenance on the grid checker."; + name = "grid checker info" + }, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/weapon/storage/box/lights/mixed, +/turf/simulated/floor/plating, +/area/engineering/storage) "dc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable/white{ @@ -1330,6 +1545,14 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardfore) +"df" = ( +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/structure/cable, +/obj/machinery/power/grid_checker, +/turf/simulated/floor/plating, +/area/engineering/storage) "dg" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -1382,6 +1605,10 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) +"dl" = ( +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/engineering/storage) "dm" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -1391,6 +1618,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) +"dn" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/machinery/disposal/wall, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/port) "do" = ( /turf/simulated/wall/bay/brown, /area/quartermaster/storage) @@ -1474,6 +1709,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "dz" = ( @@ -1961,9 +2199,6 @@ /area/stellardelight/deck2/aftport) "eE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "eF" = ( @@ -2171,6 +2406,7 @@ dir = 1; req_one_access = list(35,28) }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/grass, /area/hydroponics) "fb" = ( @@ -2277,6 +2513,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/wood, /area/crew_quarters/captain) "fp" = ( @@ -2332,6 +2569,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "fw" = ( @@ -2408,6 +2648,9 @@ /obj/effect/floor_decal/milspec/color/white/corner{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "fJ" = ( @@ -2424,8 +2667,9 @@ /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "fL" = ( -/obj/machinery/computer/arcade/battle, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/landmark/vermin, +/obj/machinery/station_slot_machine, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "fN" = ( @@ -2570,13 +2814,6 @@ /obj/machinery/smartfridge/sheets/persistent_lossy, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"gc" = ( -/mob/living/simple_mob/animal/passive/cow, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "gd" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2796,6 +3033,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) +"gA" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/fore) "gB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2840,20 +3083,25 @@ /area/engineering/storage) "gF" = ( /obj/structure/cable/orange{ - icon_state = "2-8" + icon_state = "1-2" }, /obj/structure/cable/orange{ - icon_state = "1-2" + icon_state = "2-8" }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) "gG" = ( -/obj/structure/sign/poster{ - dir = 8 - }, /obj/effect/floor_decal/milspec/color/green/half{ dir = 8 }, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/machinery/disposal/wall{ + dir = 4; + pixel_x = -24; + plane = -34 + }, /turf/simulated/floor/tiled, /area/hydroponics) "gH" = ( @@ -2948,6 +3196,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/techmaint, /area/storage/primary) "gS" = ( @@ -3011,9 +3260,6 @@ /obj/machinery/alarm/angled{ dir = 8 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "hb" = ( @@ -3044,11 +3290,24 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/storage) +"hf" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/bay/r_wall/green, +/area/hydroponics) "hg" = ( /obj/structure/shuttle/window, /obj/structure/grille, /turf/simulated/floor, /area/stellardelight/deck2/portescape) +"hh" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/monotile, +/area/hydroponics) "hi" = ( /obj/structure/closet/walllocker_double/medical/north, /obj/item/weapon/storage/box/body_record_disk, @@ -3216,6 +3475,18 @@ }, /turf/simulated/floor/tiled/white, /area/medical/surgery2) +"hH" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/monotile, +/area/hydroponics) "hI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green{ dir = 6 @@ -3316,15 +3587,6 @@ /obj/effect/floor_decal/milspec/cargo, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) -"hT" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/cable/white{ - icon_state = "32-1" - }, -/turf/simulated/open, -/area/stellardelight/deck2/triage) "hU" = ( /obj/structure/disposalpipe/tagger/partial{ dir = 8; @@ -3976,13 +4238,15 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "jz" = ( -/obj/machinery/firealarm/angled, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftstarboard) "jA" = ( @@ -4502,6 +4766,7 @@ /obj/structure/cable/blue{ icon_state = "1-2" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/briefingroom) "kE" = ( @@ -4911,6 +5176,10 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "lu" = ( @@ -5025,13 +5294,6 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/bridge) -"lE" = ( -/obj/machinery/floodlight, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/engineering/storage) "lF" = ( /obj/effect/landmark{ name = "lightsout" @@ -5048,10 +5310,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) -"lH" = ( -/obj/machinery/power/thermoregulator, -/turf/simulated/floor/plating, -/area/engineering/storage) "lI" = ( /obj/structure/table/steel_reinforced, /obj/machinery/door/window/westleft{ @@ -5162,6 +5420,9 @@ /obj/machinery/status_display{ pixel_y = 32 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "lS" = ( @@ -5286,6 +5547,16 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) +"mb" = ( +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 4 + }, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/port) "md" = ( /obj/effect/floor_decal/industrial/outline, /obj/effect/floor_decal/steeldecal/steel_decals9, @@ -5300,6 +5571,7 @@ }, /obj/machinery/vending/loadout/loadout_misc, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/landmark/vines, /turf/simulated/floor/holofloor/tiled/dark, /area/crew_quarters/locker) "me" = ( @@ -5315,6 +5587,7 @@ "mg" = ( /obj/random/vendordrink, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/port) "mh" = ( @@ -5338,14 +5611,15 @@ /area/stellardelight/deck2/port) "mj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, -/obj/structure/cable{ - icon_state = "0-2" - }, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 4; name = "night shift APC"; nightshift_setting = 2 }, +/obj/structure/cable{ + icon_state = "0-8" + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "mk" = ( @@ -5370,6 +5644,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "mn" = ( @@ -5446,13 +5721,6 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) -"my" = ( -/mob/living/simple_mob/animal/goat{ - name = "Ted" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/freezer/cold, -/area/crew_quarters/kitchen) "mz" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/milspec/color/green/half{ @@ -5554,6 +5822,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/wood, /area/stellardelight/deck2/briefingroom) "mI" = ( @@ -5603,6 +5872,10 @@ /obj/effect/floor_decal/milspec/color/silver/corner{ dir = 4 }, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "mO" = ( @@ -5645,6 +5918,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/landmark{ + name = "verminstart" + }, /turf/simulated/floor/grass, /area/hydroponics) "mT" = ( @@ -5854,6 +6130,10 @@ /obj/effect/floor_decal/milspec/color/orange/half{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "nx" = ( @@ -6027,6 +6307,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/lino, /area/crew_quarters/bar) "nR" = ( @@ -6526,6 +6807,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "pb" = ( @@ -6600,14 +6884,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardaft) -"pi" = ( -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24 - }, -/mob/living/simple_mob/otie/red/chubby/cocoa, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) "pj" = ( /obj/machinery/light/small{ dir = 8 @@ -6634,9 +6910,6 @@ /obj/structure/cable{ icon_state = "0-8" }, -/obj/structure/cable{ - icon_state = "1-8" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "pl" = ( @@ -6986,12 +7259,13 @@ /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck2/o2production) "pZ" = ( -/obj/machinery/firealarm/angled{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/machinery/station_map{ + dir = 8; + pixel_x = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "qa" = ( @@ -7030,6 +7304,7 @@ icon_state = "2-4" }, /obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/locker_room) "qe" = ( @@ -7052,6 +7327,9 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + icon_state = "1-4" + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "qi" = ( @@ -7161,6 +7439,7 @@ /obj/machinery/newscaster{ pixel_y = 28 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/storage/art) "qt" = ( @@ -7440,6 +7719,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "qZ" = ( @@ -7481,6 +7763,9 @@ dir = 5 }, /obj/effect/floor_decal/milspec/color/white/half, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "rd" = ( @@ -7595,6 +7880,7 @@ /area/engineering/engineering_monitoring) "rr" = ( /obj/structure/closet/walllocker_double/south{ + color = "#8da4a6"; pixel_x = -5 }, /obj/item/weapon/storage/box/donkpockets{ @@ -7722,20 +8008,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) -"rA" = ( -/mob/living/simple_mob/animal/passive/opossum/poppy, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/gray_platform, -/area/engineering/workshop) "rB" = ( /obj/structure/particle_accelerator/particle_emitter/right{ dir = 4 @@ -7771,6 +8043,7 @@ dir = 4; pixel_x = 24 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/techmaint, /area/storage/primary) "rF" = ( @@ -7839,6 +8112,10 @@ /obj/item/device/retail_scanner/civilian, /turf/simulated/floor/tiled, /area/hydroponics) +"rP" = ( +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/grass, +/area/hydroponics) "rQ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7860,11 +8137,6 @@ "rT" = ( /turf/simulated/wall/bay/r_wall/steel, /area/storage/tech) -"rU" = ( -/obj/structure/filingcabinet, -/obj/machinery/light, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "rV" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -8529,9 +8801,6 @@ /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/cable{ - icon_state = "1-4" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "ty" = ( @@ -8542,6 +8811,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "tz" = ( @@ -8597,14 +8867,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/storage) -"tG" = ( -/obj/structure/closet/secure_closet/quartermaster, -/obj/item/weapon/storage/backpack/dufflebag, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "tI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -8677,14 +8939,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/stellardelight/substation/engineering) -"tS" = ( -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/structure/cable, -/obj/machinery/power/grid_checker, -/turf/simulated/floor/plating, -/area/engineering/storage) "tT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8801,6 +9055,7 @@ /obj/effect/floor_decal/milspec/color/green/half{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hydroponics) "ug" = ( @@ -8943,6 +9198,7 @@ "us" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/recharge_station, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/starboard) "ut" = ( @@ -9327,7 +9583,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/structure/closet/walllocker_double/north, +/obj/structure/closet/walllocker_double/north{ + color = "#8da4a6" + }, /obj/item/weapon/circuitboard/tesla_coil, /obj/item/weapon/circuitboard/tesla_coil, /turf/simulated/floor/tiled/eris/dark/orangecorner, @@ -9365,6 +9623,9 @@ /obj/machinery/door/airlock/angled_bay/hatch/engineering{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/starboard) "vq" = ( @@ -9480,6 +9741,9 @@ /area/medical/cmostore) "vH" = ( /obj/effect/floor_decal/milspec/color/white/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "vI" = ( @@ -9532,6 +9796,11 @@ /area/medical/chemistry) "vP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "vQ" = ( @@ -9548,6 +9817,9 @@ "vR" = ( /obj/machinery/light, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "vS" = ( @@ -9556,9 +9828,6 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/recreation_area) -"vT" = ( -/turf/simulated/open, -/area/maintenance/stellardelight/deck2/starboardaft) "vU" = ( /obj/machinery/alarm/angled{ dir = 4 @@ -9632,6 +9901,10 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "wd" = ( @@ -9652,7 +9925,7 @@ /area/stellardelight/deck2/central) "wf" = ( /obj/structure/bed/chair/sofa/corp/corner{ - dir = 1 + dir = 4 }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) @@ -9694,6 +9967,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/milspec/color/white/half, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "wm" = ( @@ -9779,6 +10055,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) "wy" = ( @@ -9936,6 +10213,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "wR" = ( @@ -10052,6 +10330,16 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"xh" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "xi" = ( /obj/machinery/atmospherics/omni/atmos_filter{ name = "N2O Filter"; @@ -10098,6 +10386,12 @@ dir = 1 }, /obj/effect/floor_decal/milspec/color/white/half, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark{ + name = "vinestart" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "xo" = ( @@ -10179,6 +10473,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "xy" = ( @@ -10299,6 +10597,9 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/techmaint, /area/storage/primary) "xL" = ( @@ -10410,6 +10711,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "xY" = ( @@ -10729,7 +11033,7 @@ /area/stellardelight/deck2/fore) "yG" = ( /obj/structure/bed/chair/sofa/corp/corner{ - dir = 1 + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -10911,6 +11215,7 @@ /area/engineering/engine_room) "zb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "zc" = ( @@ -10923,6 +11228,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 6 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) "zd" = ( @@ -11055,12 +11363,13 @@ dir = 4 }, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 }, -/obj/structure/cable{ - icon_state = "0-2" +/obj/structure/cable/green{ + icon_state = "0-4" }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) @@ -11223,6 +11532,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "zT" = ( @@ -11545,30 +11858,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) -"AJ" = ( -/obj/structure/sign/directions/science{ - pixel_x = 32 - }, -/obj/structure/sign/directions/dorms{ - pixel_x = 32; - pixel_y = 6 - }, -/obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; - pixel_x = 32; - pixel_y = -6 - }, -/obj/structure/sign/directions/security{ - pixel_x = 32; - pixel_y = 12 - }, -/obj/structure/sign/directions/stairs_down{ - pixel_x = 32; - pixel_y = 18 - }, -/turf/simulated/open, -/area/stellardelight/deck2/aftport) "AK" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Master Grid"; @@ -11633,16 +11922,15 @@ /obj/machinery/computer/skills{ pixel_y = 7 }, -/obj/machinery/button/remote/blast_door{ - id = "captaindoor"; - name = "Door Remote"; - pixel_x = -15; - pixel_y = 2 - }, /obj/structure/table/darkglass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/button/remote/airlock{ + id = "captaindoor"; + pixel_x = -15; + pixel_y = 2 + }, /turf/simulated/floor/carpet/blucarpet, /area/crew_quarters/captain) "AP" = ( @@ -11937,12 +12225,12 @@ /obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) -"By" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ +"BA" = ( +/obj/structure/railing/grey{ dir = 8 }, -/turf/simulated/floor/plating, -/area/engineering/storage) +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck2/fore) "BB" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -12097,6 +12385,16 @@ }, /turf/simulated/floor/tiled/eris/white/cargo, /area/stellardelight/deck2/triage) +"BV" = ( +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + id = "bar"; + layer = 3.3; + name = "Bar Shutters" + }, +/obj/item/weapon/material/ashtray/glass, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "BW" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/external/glass{ @@ -12144,7 +12442,6 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -12154,6 +12451,7 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "Cd" = ( @@ -12344,6 +12642,9 @@ /obj/structure/cable{ icon_state = "2-4" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "CA" = ( @@ -12448,32 +12749,9 @@ /obj/structure/cable/orange{ icon_state = "1-8" }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) -"CN" = ( -/obj/structure/sign/directions/science{ - pixel_x = -32 - }, -/obj/structure/sign/directions/dorms{ - pixel_x = -32; - pixel_y = 6 - }, -/obj/structure/sign/directions{ - desc = "A direction sign, pointing out the way to Exploration."; - name = "\improper Exploration Department"; - pixel_x = -32; - pixel_y = -6 - }, -/obj/structure/sign/directions/security{ - pixel_x = -32; - pixel_y = 12 - }, -/obj/structure/sign/directions/stairs_down{ - pixel_x = -32; - pixel_y = 18 - }, -/turf/simulated/open, -/area/stellardelight/deck2/aftstarboard) "CO" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -12611,12 +12889,12 @@ /turf/simulated/floor/tiled/techmaint, /area/storage/primary) "De" = ( -/obj/structure/flora/pottedplant/decorative, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/device/radio/intercom{ dir = 8; pixel_x = -24 }, +/obj/structure/flora/pottedplant/decorative, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Df" = ( @@ -12684,6 +12962,7 @@ "Dq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hydroponics) "Dr" = ( @@ -12709,7 +12988,6 @@ /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) "Du" = ( -/obj/structure/closet/secure_closet/personal, /obj/effect/floor_decal/industrial/outline, /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ @@ -12721,11 +12999,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/item/clothing/shoes/black, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/device/communicator, +/obj/structure/undies_wardrobe, +/obj/effect/landmark/vermin, /turf/simulated/floor/holofloor/tiled/dark, /area/crew_quarters/locker) "Dv" = ( @@ -12797,6 +13075,15 @@ "DB" = ( /turf/simulated/floor, /area/maintenance/stellardelight/deck2/atmos) +"DC" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 4 + }, +/obj/machinery/firealarm/angled{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/fore) "DD" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/alarm/freezer{ @@ -12864,20 +13151,6 @@ }, /turf/simulated/floor, /area/medical/cryo) -"DK" = ( -/obj/machinery/power/smes/buildable{ - RCon_tag = "Engine - Core"; - charge = 2e+006; - input_attempt = 1; - input_level = 100000; - name = "Engine"; - output_level = 200000 - }, -/obj/structure/cable/cyan{ - icon_state = "0-8" - }, -/turf/simulated/floor/plating, -/area/engineering/storage) "DL" = ( /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) @@ -12903,12 +13176,12 @@ /turf/simulated/floor/glass/reinforced, /area/stellardelight/deck2/fore) "DO" = ( -/obj/structure/flora/pottedplant/decorative, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/device/radio/intercom{ dir = 4; pixel_x = 24 }, +/obj/structure/flora/pottedplant/decorative, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "DP" = ( @@ -12921,9 +13194,13 @@ /turf/simulated/floor/tiled/freezer/cold, /area/crew_quarters/kitchen) "DQ" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Atmospherics"; + sortType = "Atmospherics" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "DR" = ( @@ -13250,6 +13527,7 @@ pixel_x = -6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "EC" = ( @@ -13634,6 +13912,7 @@ pixel_x = 6 }, /obj/structure/closet/walllocker_double/north{ + color = "#8da4a6"; dir = 4; pixel_x = 32; pixel_y = 0 @@ -13693,6 +13972,7 @@ /obj/machinery/light/floortube{ pixel_y = -6 }, +/obj/item/weapon/material/ashtray/glass, /turf/simulated/floor/carpet, /area/crew_quarters/recreation_area) "Fx" = ( @@ -13744,6 +14024,9 @@ dir = 4 }, /obj/machinery/vending/nifsoft_shop, +/obj/machinery/item_bank{ + pixel_y = 28 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "FB" = ( @@ -13887,6 +14170,9 @@ "FP" = ( /obj/machinery/light, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) "FQ" = ( @@ -14011,6 +14297,7 @@ /obj/effect/floor_decal/milspec/color/silver/corner{ dir = 8 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "Gb" = ( @@ -14374,6 +14661,7 @@ /obj/machinery/power/terminal{ dir = 8 }, +/obj/structure/cable, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "GP" = ( @@ -14518,6 +14806,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) "Hf" = ( @@ -14756,6 +15045,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "HH" = ( @@ -14927,6 +15220,9 @@ dir = 1 }, /obj/effect/floor_decal/milspec/color/white/half, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "Id" = ( @@ -15041,6 +15337,8 @@ }, /obj/random/vendordrink, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/firealarm/angled, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftstarboard) "Il" = ( @@ -15084,6 +15382,7 @@ }, /obj/structure/table/steel_reinforced, /obj/item/device/retail_scanner/command, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/bridge) "Ip" = ( @@ -15136,6 +15435,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "It" = ( @@ -15158,6 +15458,16 @@ /obj/machinery/recharger, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) +"Iv" = ( +/obj/effect/floor_decal/milspec/color/blue/half{ + dir = 8 + }, +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "Iw" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15309,10 +15619,6 @@ }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"IP" = ( -/obj/machinery/shield_gen/external, -/turf/simulated/floor/plating, -/area/engineering/storage) "IQ" = ( /obj/structure/table/glass, /obj/machinery/door/window/southright{ @@ -15639,6 +15945,13 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) +"JG" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "JH" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/cable/green{ @@ -15655,6 +15968,7 @@ /area/maintenance/stellardelight/deck2/portfore) "JI" = ( /obj/effect/floor_decal/milspec/color/green/half, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hydroponics) "JJ" = ( @@ -15757,6 +16071,16 @@ /obj/effect/landmark/start/chemist, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/chemistry) +"JW" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "JX" = ( /obj/machinery/shield_gen, /turf/simulated/floor/plating, @@ -16066,6 +16390,11 @@ /obj/machinery/light{ dir = 4 }, +/obj/item/paint_palette, +/obj/item/paint_palette, +/obj/item/paint_brush, +/obj/item/paint_brush, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/storage/art) "KD" = ( @@ -16254,6 +16583,7 @@ /obj/machinery/camera/network/medbay{ dir = 8 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/chemistry) "La" = ( @@ -16531,6 +16861,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "LI" = ( @@ -16604,6 +16937,7 @@ pixel_x = 2; pixel_y = 7 }, +/obj/item/weapon/material/ashtray/glass, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "LQ" = ( @@ -16840,10 +17174,14 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) "Mp" = ( -/obj/machinery/computer/arcade/orion_trail, +/obj/machinery/computer/arcade/battle, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Mq" = ( @@ -16865,6 +17203,22 @@ /obj/structure/low_wall/bay/reinforced/orange, /turf/simulated/floor, /area/engineering/storage) +"Ms" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/port) "Mt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -17021,7 +17375,9 @@ /area/crew_quarters/bar) "MM" = ( /obj/structure/table/standard, -/obj/machinery/recharger, +/obj/machinery/recharger{ + pixel_y = 5 + }, /obj/machinery/light/floortube{ pixel_y = -4 }, @@ -17181,6 +17537,13 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) +"Nd" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "Ne" = ( /obj/structure/lattice, /obj/structure/disposalpipe/down{ @@ -17341,14 +17704,26 @@ /area/maintenance/stellardelight/deck2/starboardsolars) "Nw" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/zpipe/up/supply, /obj/machinery/atmospherics/pipe/zpipe/up/scrubbers, /obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/sortjunction{ + dir = 8; + name = "Kitchen/Botany"; + sortType = "Kitchen/Botany" + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portfore) +"Nx" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "Ny" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -17613,6 +17988,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/stellardelight/deck2/barbackroom) +"Oh" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/space, +/area/space) "Oi" = ( /obj/machinery/firealarm/angled, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17704,6 +18085,7 @@ /area/medical/surgery2) "Oq" = ( /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 8 }, /obj/structure/cable/cyan{ @@ -17795,6 +18177,9 @@ /obj/machinery/status_display{ pixel_y = 32 }, +/obj/effect/landmark{ + name = "verminstart" + }, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) "OB" = ( @@ -17892,6 +18277,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) "OQ" = ( @@ -17942,6 +18328,10 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) "OU" = ( @@ -18054,6 +18444,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "Pf" = ( @@ -18146,6 +18539,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/starboard) +"Pp" = ( +/obj/effect/landmark{ + name = "droppod_landing" + }, +/turf/space, +/area/space) "Pq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 9 @@ -18165,6 +18564,14 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/reception) +"Ps" = ( +/obj/effect/floor_decal/steeldecal/steel_decals5{ + dir = 1 + }, +/obj/machinery/disposal/wall, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/tiled, +/area/stellardelight/deck2/starboard) "Pt" = ( /obj/machinery/alarm/angled, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -18505,6 +18912,9 @@ pixel_x = -32; pixel_y = -32 }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "Qe" = ( @@ -19350,9 +19760,6 @@ }, /turf/simulated/wall/bay/r_wall/steel, /area/engineering/engine_room) -"RZ" = ( -/turf/simulated/open, -/area/maintenance/stellardelight/deck2/portaft) "Sb" = ( /turf/simulated/floor/tiled/eris/dark/danger, /area/engineering/engine_room) @@ -19600,7 +20007,7 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck2/portfore) "SF" = ( -/obj/machinery/computer/arcade/battle, +/obj/machinery/computer/arcade/clawmachine, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "SG" = ( @@ -19758,6 +20165,9 @@ /area/engineering/locker_room) "SX" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) "SY" = ( @@ -19891,6 +20301,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "Tn" = ( @@ -20059,6 +20470,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "TJ" = ( @@ -20412,6 +20827,7 @@ /obj/effect/landmark{ name = "lightsout" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, /area/hydroponics) "Uz" = ( @@ -20433,6 +20849,9 @@ name = "lightsout" }, /obj/machinery/hologram/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "UB" = ( @@ -20765,10 +21184,6 @@ "Vm" = ( /turf/simulated/floor/airless, /area/stellardelight/deck2/fuelstorage) -"Vn" = ( -/mob/living/simple_mob/vore/alienanimals/teppi/baby, -/turf/simulated/floor/grass, -/area/hydroponics) "Vo" = ( /turf/simulated/wall/bay/r_wall/orange, /area/engineering/workshop) @@ -20907,6 +21322,7 @@ req_one_access = list(19); stripe_color = "#f7d35c" }, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/briefingroom) "VG" = ( @@ -21067,6 +21483,9 @@ /area/stellardelight/deck2/fore) "VZ" = ( /obj/effect/floor_decal/milspec/color/white/half, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) "Wa" = ( @@ -21263,6 +21682,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "Wz" = ( @@ -21291,6 +21711,9 @@ /obj/structure/cable{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/atmos/monitoring) "WB" = ( @@ -21541,6 +21964,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 4 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "Xf" = ( @@ -21600,9 +22024,6 @@ /obj/machinery/alarm/angled{ dir = 4 }, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) "Xo" = ( @@ -21634,9 +22055,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) "Xs" = ( @@ -22250,6 +22668,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 1 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hydroponics) "YK" = ( @@ -22262,6 +22681,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/structure/sign/poster{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/hydroponics) "YL" = ( @@ -22289,6 +22711,13 @@ }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) +"YO" = ( +/obj/structure/table/gamblingtable, +/obj/machinery/recharger{ + pixel_y = 5 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/recreation_area) "YP" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -22336,6 +22765,7 @@ "YW" = ( /obj/random/vendordrink, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/starboard) "YX" = ( @@ -22458,6 +22888,9 @@ pixel_x = -2; pixel_y = -2 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "Zj" = ( @@ -22496,15 +22929,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) -"Zn" = ( -/obj/structure/cable/yellow{ - icon_state = "32-8" - }, -/obj/structure/sign/department/miner_dock{ - pixel_y = 32 - }, -/turf/simulated/open, -/area/quartermaster/storage) "Zo" = ( /obj/machinery/light{ dir = 8 @@ -22623,6 +23047,9 @@ /obj/item/roller{ pixel_y = 16 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) "ZE" = ( @@ -25464,7 +25891,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -25869,7 +26296,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -26269,7 +26696,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -26490,7 +26917,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -27439,7 +27866,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -28411,7 +28838,7 @@ Jh Jh Jh Jh -Jh +Pp Jh Jh Jh @@ -28522,7 +28949,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -29861,10 +30288,10 @@ um iz sn kg -RZ +iz dC cV -iz +aV qC zv Xm @@ -29906,8 +30333,8 @@ UG cv cv cv -ZG -Jh +CP +SO Jh Jh Jh @@ -30048,6 +30475,7 @@ Zt qM Vm mq +Wb ZG Jh Jh @@ -30068,7 +30496,6 @@ Jh Jh Jh Jh -Jh "} (52,1,1) = {" Jh @@ -30190,6 +30617,7 @@ LG AV Vm Vm +Wb ZG Jh Jh @@ -30205,8 +30633,7 @@ Jh Jh Jh Jh -Jh -Jh +Oh Jh Jh Jh @@ -30253,7 +30680,7 @@ Gi wL ch DD -my +av AC DP BF @@ -30332,8 +30759,8 @@ yg AV cv cv -ZG -Jh +Ds +kL Jh Jh Jh @@ -30411,7 +30838,7 @@ sA iZ ii WN -bU +aH LS Jp KK @@ -30553,10 +30980,10 @@ EA wP JI fa -gc -Vn -dP -KK +aJ +aP +rP +hf Nw Iw KL @@ -30616,8 +31043,8 @@ MP PB cv cv -ZG -Jh +CP +SO Jh Jh Jh @@ -30686,8 +31113,8 @@ uf bt Dq Is -iY -iY +hh +hH iY Yw iZ @@ -30710,8 +31137,8 @@ Rp Ws Bw Bw -Ec -wF +dn +Ms Mo xp xp @@ -30758,6 +31185,7 @@ ay wm Vm mq +Wb ZG Jh Jh @@ -30778,7 +31206,6 @@ Jh Jh Jh Jh -Jh "} (57,1,1) = {" Jh @@ -30900,6 +31327,7 @@ DR AV Vm Vm +Wb ZG Jh Jh @@ -30920,7 +31348,6 @@ Jh Jh Jh Jh -Jh "} (58,1,1) = {" Jh @@ -31042,8 +31469,8 @@ eg tk cv cv -ZG -Jh +Ds +kL Jh Jh Jh @@ -31418,7 +31845,7 @@ VP bA bA bA -bA +mb bA BP wF @@ -31439,7 +31866,7 @@ Hr Hr Oi bY -Ef +aU kt wY Ip @@ -31501,7 +31928,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -31581,7 +32008,7 @@ Hr Hr Gx DA -AJ +bm Ef wY dL @@ -31688,7 +32115,7 @@ nt Rq Rq Rq -Rq +aA Jq Xi RT @@ -31734,7 +32161,7 @@ ei Bt eB do -Zn +bG Lm YP do @@ -31830,7 +32257,7 @@ nt Rq Rq lQ -Rq +gA Jq Xi kF @@ -32672,7 +33099,7 @@ JL nt BS Dl -UX +YO BK Fw vS @@ -32717,7 +33144,7 @@ vi Ze Ay qZ -hT +bn bf Vb Zv @@ -32756,7 +33183,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -32941,7 +33368,7 @@ Jh Jh Wb HQ -pi +bO YU lU as @@ -33371,7 +33798,7 @@ Gn zw fi dw -On +BV py fp mn @@ -33442,7 +33869,7 @@ ed du dJ mE -tG +bQ YY ce BO @@ -33534,7 +33961,7 @@ nt Rq Rq lY -Rq +BA Jq IK kF @@ -33676,7 +34103,7 @@ nt Rq Rq Rq -Rq +aA Jq IK RT @@ -33853,7 +34280,7 @@ nd nd uz Bg -CN +br fJ yW NW @@ -33868,7 +34295,7 @@ xo NO cH kY -rU +bU YY Sf TK @@ -33974,7 +34401,7 @@ Ru nL WL WL -iu +Iv iu ec YX @@ -33995,7 +34422,7 @@ nd nd jz Ml -fJ +bv en yW ab @@ -34120,7 +34547,7 @@ CC CC CC YX -Ka +JG sq Or Ft @@ -34236,7 +34663,7 @@ Zr Zr vj pZ -Zr +DC Zr OV Zr @@ -34262,7 +34689,7 @@ Mk Mk uq YX -Ka +JG sq Ln ck @@ -34404,7 +34831,7 @@ Hd Hd Xd YX -Ka +JG sq BR Ft @@ -34450,8 +34877,8 @@ uo BN nq nq -ZG -Jh +CP +SO Jh Jh Jh @@ -34546,7 +34973,7 @@ EX Hd IY YX -Ka +JG Xa KY jc @@ -34577,7 +35004,7 @@ To tB Eg qH -rA +bM Fd jY hs @@ -34592,6 +35019,7 @@ cF Jk VJ Dw +Wb ZG Jh Jh @@ -34612,7 +35040,6 @@ Jh Jh Jh Jh -Jh "} (84,1,1) = {" Jh @@ -34626,7 +35053,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -34686,8 +35113,8 @@ Zk SM Hd Hd -Xd -YX +Ps +ba dy Xa Xa @@ -34734,6 +35161,7 @@ Nt Lw VJ VJ +Wb ZG Jh Jh @@ -34754,7 +35182,6 @@ Jh Jh Jh Jh -Jh "} (85,1,1) = {" Jh @@ -34831,7 +35258,7 @@ YW rh xX Qd -CW +Nx CW CW CW @@ -34876,8 +35303,8 @@ lk Lw nq nq -ZG -Jh +Ds +kL Jh Jh Jh @@ -34973,15 +35400,15 @@ KU Xd UA wb -wb -wb -wb +JW +Nd +Nd mm -CC -CC -CC -CC -CC +cS +cS +cS +cS +cS TI Co Co @@ -35115,7 +35542,7 @@ us aL zS Wy -Mk +xh Mk Mk fs @@ -35160,8 +35587,8 @@ jA Lw nq nq -ZG -Jh +CP +SO Jh Jh Jh @@ -35302,6 +35729,7 @@ lX yA VJ Dw +Wb ZG Jh Jh @@ -35322,7 +35750,6 @@ Jh Jh Jh Jh -Jh "} (89,1,1) = {" Jh @@ -35444,6 +35871,7 @@ nO nq VJ VJ +Wb ZG Jh Jh @@ -35464,7 +35892,6 @@ Jh Jh Jh Jh -Jh "} (90,1,1) = {" Jh @@ -35541,7 +35968,7 @@ jB pJ Xp Za -vT +pJ Jf zW qa @@ -35586,8 +36013,8 @@ SG rT rT rT -ZG -Jh +Ds +kL Jh Jh Jh @@ -35704,8 +36131,8 @@ cm pe Yr Hx -lH -DK +db +cc HT qV Se @@ -35846,7 +36273,7 @@ zT cm Yr AK -tS +df iG HT It @@ -36025,7 +36452,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -36271,11 +36698,11 @@ Wb tK tK Li -By -oR +cd +dl oR gV -IP +oR qr Vf Vf @@ -36413,7 +36840,7 @@ Jh Jh tK sy -lE +cp px px Jb @@ -36520,7 +36947,7 @@ bw Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -36933,7 +37360,7 @@ Jh Jh Jh Jh -Jh +Pp Jh Jh Jh @@ -37011,7 +37438,7 @@ NL NL Jh Jh -Jh +Pp Jh Jh Jh @@ -37333,7 +37760,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -37924,7 +38351,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh @@ -39089,6 +39516,7 @@ Jh Jh Jh Jh +Oh Jh Jh Jh @@ -39133,8 +39561,7 @@ Jh Jh Jh Jh -Jh -Jh +Oh Jh Jh Jh @@ -39819,7 +40246,7 @@ Jh Jh Jh Jh -Jh +Oh Jh Jh Jh diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm index 83aabfc07b..94b58cab54 100644 --- a/maps/stellardelight/stellar_delight3.dmm +++ b/maps/stellardelight/stellar_delight3.dmm @@ -5,6 +5,12 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) +"ab" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/commandhall) "ac" = ( /obj/effect/landmark{ name = "morphspawn" @@ -14,12 +20,42 @@ "ad" = ( /turf/simulated/wall/bay/r_wall/blue, /area/tcommsat/chamber) +"ae" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/commandhall) "af" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) +"ag" = ( +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/aft) +"ah" = ( +/obj/structure/sign/directions/stairs_down{ + pixel_x = 32; + pixel_y = 18 + }, +/obj/structure/sign/directions/medical{ + pixel_x = 32; + pixel_y = 12 + }, +/obj/structure/sign/directions/engineering{ + pixel_x = 32; + pixel_y = 6 + }, +/obj/structure/sign/directions/cargo{ + pixel_x = 32 + }, +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/aft) "ai" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -29,6 +65,27 @@ "aj" = ( /turf/simulated/floor/carpet/turcarpet, /area/ai) +"ak" = ( +/obj/structure/sign/directions/stairs_down{ + pixel_x = -32; + pixel_y = 18 + }, +/obj/structure/sign/directions/medical{ + pixel_x = -32; + pixel_y = 12 + }, +/obj/structure/sign/directions/engineering{ + pixel_x = -32; + pixel_y = 6 + }, +/obj/structure/sign/directions/cargo{ + pixel_x = -32 + }, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/stellardelight/deck3/aft) "al" = ( /obj/machinery/power/terminal{ dir = 8 @@ -75,15 +132,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) -"ax" = ( -/obj/item/modular_computer/console/preset/civilian{ - dir = 8 - }, -/obj/machinery/alarm/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "aA" = ( /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck3/transitgateway) @@ -147,11 +195,24 @@ /turf/simulated/open, /area/stellardelight/deck2/starboard) "aP" = ( -/obj/structure/cable{ - icon_state = "2-4" +/obj/structure/bed/chair/shuttle{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "aQ" = ( /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/stellardelight/deck3/commandhall) @@ -167,6 +228,11 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) +"ba" = ( +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/landmark/vines, +/turf/simulated/open, +/area/stellardelight/deck2/fore) "bb" = ( /obj/effect/floor_decal/techfloor/orange{ dir = 8 @@ -179,11 +245,18 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) "be" = ( -/obj/machinery/shipsensors{ - dir = 1 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 4; + id = "shuttleshutter" }, -/turf/simulated/floor/airless, -/area/shuttle/sdboat/fore) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "bg" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -276,6 +349,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hor) +"by" = ( +/turf/simulated/wall/bay/r_wall/steel, +/area/maintenance/stellardelight/deck3/starboardaft) +"bB" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardcent) "bC" = ( /obj/structure/closet/crate, /obj/random/maintenance, @@ -418,6 +502,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/effect/landmark/vines, /turf/simulated/open, /area/crew_quarters/bar) "cb" = ( @@ -430,13 +515,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) "ch" = ( -/obj/structure/table/rack/shelf, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/drinkbottle, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/vending/wardrobe/mimedrobe, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "ci" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/blue{ @@ -490,6 +571,20 @@ temperature = 80 }, /area/tcommsat/chamber) +"cn" = ( +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "cp" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -571,6 +666,12 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) +"cz" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/ai_cyborg_station) "cA" = ( /obj/structure/bed/chair{ dir = 8 @@ -638,15 +739,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) -"cQ" = ( -/obj/machinery/atmospherics/portables_connector, -/obj/structure/closet/emergsuit_wall{ - dir = 4; - pixel_x = 27 - }, -/obj/machinery/portable_atmospherics/canister/air, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "cS" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -742,13 +834,6 @@ /obj/machinery/papershredder, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) -"dq" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 4 - }, -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "dr" = ( /obj/machinery/light{ dir = 4 @@ -862,6 +947,18 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/bar) +"dQ" = ( +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "shuttleshutter" + }, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "dS" = ( /obj/machinery/camera/network/command{ dir = 4 @@ -964,6 +1061,9 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "el" = ( @@ -1131,8 +1231,12 @@ /turf/simulated/wall/bay/r_wall/steel, /area/crew_quarters/bar) "eJ" = ( -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/fore) +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "eK" = ( /obj/machinery/atmospherics/unary/vent_pump{ external_pressure_bound = 0; @@ -1175,7 +1279,8 @@ /area/stellardelight/deck3/aft) "eP" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock{ +/obj/machinery/door/airlock/angled_bay/standard/color/common{ + dir = 4; name = "Holodeck" }, /turf/simulated/floor/tiled/steel_ridged, @@ -1299,16 +1404,22 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/steel_ridged, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "fg" = ( -/obj/structure/cable{ - icon_state = "1-2" +/obj/structure/handrail{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -28 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "fh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1318,6 +1429,19 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/foreportroomb) +"fj" = ( +/obj/structure/table/woodentable, +/obj/item/toy/figure/clown, +/obj/item/weapon/pen/crayon/marker/rainbow, +/obj/item/weapon/pen/crayon/rainbow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "fk" = ( /obj/machinery/telecomms/server/presets/common, /turf/simulated/floor/tiled/dark{ @@ -1326,9 +1450,6 @@ temperature = 80 }, /area/tcommsat/chamber) -"fn" = ( -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) "fs" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -1407,6 +1528,10 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) +"fP" = ( +/obj/machinery/space_heater, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/portaft) "fS" = ( /turf/simulated/wall/bay/steel, /area/crew_quarters/heads/hop) @@ -1457,6 +1582,14 @@ temperature = 80 }, /area/tcommsat/chamber) +"gi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "gj" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/disk/nifsoft/compliance, @@ -1477,11 +1610,19 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "gl" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor, -/area/shuttle/sdboat/fore) +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "gm" = ( /obj/structure/lattice, /obj/structure/cable/blue{ @@ -1680,6 +1821,9 @@ /obj/machinery/door/airlock/angled_bay/double/glass{ name = "glass airlock" }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/aft) "gW" = ( @@ -1693,12 +1837,6 @@ temperature = 80 }, /area/tcommsat/chamber) -"gY" = ( -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "hb" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -1747,6 +1885,20 @@ }, /turf/simulated/floor/reinforced/airless, /area/stellardelight/deck3/exterior) +"hg" = ( +/obj/effect/fancy_shuttle/sd_shuttle{ + dir = 1; + fancy_shuttle_tag = "sdboat" + }, +/obj/effect/fancy_shuttle_floor_preview/sd_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "hj" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled/techfloor/grid, @@ -1887,13 +2039,16 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck3/aftstarroom) "hR" = ( -/obj/machinery/airlock_sensor{ - dir = 8; - pixel_x = 24 +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "hT" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -1944,7 +2099,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "ii" = ( /turf/simulated/floor, /area/maintenance/stellardelight/substation/command) @@ -1982,11 +2137,8 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/landmark{ - name = "morphspawn" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "ir" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -2011,16 +2163,24 @@ dir = 9 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "iw" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 - }, -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "iy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -2054,25 +2214,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck3/cryo) -"iD" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - id = "shuttleshutter" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/aft) "iE" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/hatch{ door_color = "#e6ab22"; name = "Shield Generator"; - req_access = list(11,24); + req_access = null; + req_one_access = list(11,24); stripe_color = "#e6ab22" }, /turf/simulated/floor/tiled/steel_ridged, @@ -2120,22 +2268,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) -"iM" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - dir = 4; - id = "shuttleshutter" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/aft) "iN" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2168,7 +2300,7 @@ "iS" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "iV" = ( /obj/structure/railing/grey{ dir = 4 @@ -2216,8 +2348,13 @@ /area/crew_quarters/bar) "jc" = ( /obj/machinery/computer/ship/sensors/adv, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "jd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -2300,6 +2437,16 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) +"jy" = ( +/obj/structure/window/bay/reinforced, +/obj/structure/low_wall/bay/reinforced/steel, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/angled/open{ + dir = 4; + id = "clownmimeoffice" + }, +/turf/simulated/floor, +/area/stellardelight/deck3/clownmimeoffice) "jC" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2358,6 +2505,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/heads/hor) +"jO" = ( +/obj/machinery/station_map{ + dir = 4; + pixel_x = -32 + }, +/turf/simulated/floor/tiled/eris/dark/gray_platform, +/area/stellardelight/deck3/commandhall) "jP" = ( /obj/machinery/alarm/angled, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -2512,12 +2666,9 @@ /turf/simulated/floor/tiled/steel_grid, /area/stellardelight/deck3/aft) "ku" = ( -/obj/structure/table/rack, -/obj/random/firstaid, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/structure/barricade/cutout/mime, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "kw" = ( /obj/machinery/light{ dir = 8 @@ -2542,19 +2693,28 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "kz" = ( -/obj/structure/cable/green{ +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 6; + pixel_x = 7; + pixel_y = 26 + }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/door/airlock/angled_bay/external/glass{ - dir = 4; - frequency = 1380; - id_tag = null; - locked = 1; - name = "Docking Port Airlock" - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/steel_ridged, -/area/shuttle/sdboat/aft) +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "kB" = ( /obj/machinery/porta_turret/ai_defense, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -2576,6 +2736,7 @@ /obj/item/clothing/glasses/omnihud, /obj/item/weapon/paper/dockingcodes/sd, /obj/item/device/retail_scanner/command, +/obj/item/weapon/storage/box/PDAs, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "kO" = ( @@ -2655,18 +2816,22 @@ /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck3/cryo) "kZ" = ( -/obj/structure/fuel_port{ - dir = 4; - pixel_x = 32 - }, /obj/structure/handrail{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 +/obj/machinery/airlock_sensor{ + dir = 8; + pixel_x = 29; + pixel_y = 2 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "la" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -2683,17 +2848,27 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "lc" = ( -/obj/machinery/power/terminal, -/obj/structure/cable/green, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/fuel_port{ + dir = 8; + pixel_x = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/binary/pump/fuel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "le" = ( /obj/structure/railing/grey{ dir = 8 }, /obj/structure/railing/grey, /turf/simulated/open, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "lh" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/hatch{ @@ -2822,8 +2997,18 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/forestarroomb) "lB" = ( -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "lC" = ( /obj/machinery/power/apc/angled{ dir = 4 @@ -2857,7 +3042,7 @@ icon_state = "1-2" }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "lH" = ( /obj/machinery/telecomms/server/presets/service/sd, /turf/simulated/floor/tiled/dark{ @@ -2932,6 +3117,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/readingroom) +"lV" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "lY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -2960,9 +3151,6 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/cable/green{ - icon_state = "1-8" - }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "md" = ( @@ -2997,14 +3185,38 @@ }, /turf/simulated/open, /area/stellardelight/deck2/central) -"mi" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/effect/map_helper/airlock/atmos/pump_out_external, -/obj/structure/handrail{ +"mh" = ( +/obj/structure/table/steel_reinforced, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 1; + pixel_y = 1 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/airless, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) +"mi" = ( +/obj/machinery/shipsensors/fancy_shuttle, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "mj" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -3075,24 +3287,23 @@ /obj/effect/landmark/start/visitor, /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) +"ms" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/portfore) "mv" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "sdboat_docker_pump_out_external" }, -/turf/simulated/floor/airless, -/area/shuttle/sdboat/aft) -"mw" = ( -/obj/machinery/door/airlock/angled_bay/standard/glass{ - door_color = "#9fccc7"; - name = "Cockpit"; - req_access = list(67); - stripe_color = "#ffffff" +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "sdboat" }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/steel_ridged, -/area/shuttle/sdboat/fore) +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "mA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -3116,8 +3327,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "mF" = ( -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "mI" = ( /obj/structure/cable/blue{ icon_state = "1-8" @@ -3148,7 +3359,7 @@ dir = 8 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "mM" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -3187,10 +3398,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/open, /area/stellardelight/deck2/starboard) -"mU" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +"mT" = ( +/obj/machinery/space_heater, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardcent) "mX" = ( /obj/structure/bed/chair{ dir = 4 @@ -3198,6 +3409,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "na" = ( @@ -3421,7 +3635,7 @@ /obj/random/maintenance/engineering, /obj/random/maintenance/engineering, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "nF" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -3444,12 +3658,13 @@ /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "nL" = ( -/obj/structure/sign/poster{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/machinery/item_bank{ + dir = 4; + pixel_x = -26 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "nM" = ( @@ -3673,12 +3888,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "oD" = ( @@ -3706,15 +3917,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/open, /area/maintenance/stellardelight/deck3/portcent) -"oJ" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "oM" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3734,6 +3936,9 @@ /area/ai_cyborg_station) "oO" = ( /obj/machinery/door/firedoor/glass, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) "oP" = ( @@ -3956,6 +4161,12 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "px" = ( @@ -4196,6 +4407,12 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "qg" = ( @@ -4375,7 +4592,7 @@ "qS" = ( /obj/machinery/light/small, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "qU" = ( /obj/machinery/light{ dir = 4 @@ -4406,6 +4623,16 @@ /obj/random/vendorfood, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) +"qY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/alarm/angled{ + dir = 4 + }, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardaft) "qZ" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/power/apc/angled{ @@ -4426,24 +4653,6 @@ "rc" = ( /turf/simulated/wall/bay/r_wall/blue, /area/stellardelight/deck3/commandhall) -"re" = ( -/obj/structure/sign/directions/stairs_down{ - pixel_x = -32; - pixel_y = 18 - }, -/obj/structure/sign/directions/medical{ - pixel_x = -32; - pixel_y = 12 - }, -/obj/structure/sign/directions/engineering{ - pixel_x = -32; - pixel_y = 6 - }, -/obj/structure/sign/directions/cargo{ - pixel_x = -32 - }, -/turf/simulated/open, -/area/stellardelight/deck3/aft) "rg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, @@ -4461,24 +4670,24 @@ /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck3/cryo) "ri" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/obj/structure/handrail, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "rj" = ( /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportroomb) -"rk" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "rl" = ( /obj/structure/sign/painting/library_secure{ pixel_x = -30 @@ -4636,6 +4845,20 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/open, /area/stellardelight/deck2/port) +"rX" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "rZ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -4643,22 +4866,22 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai) "sa" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/machinery/door/airlock/angled_bay/external/glass{ - dir = 4; - frequency = 1380; - id_tag = null; - locked = 1; - name = "Docking Port Airlock" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/steel_ridged, -/area/shuttle/sdboat/aft) +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "sb" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/blue{ @@ -4751,9 +4974,6 @@ /area/ai) "ss" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; frequency = 1380; @@ -4773,6 +4993,9 @@ pixel_y = 32; req_one_access = list(13) }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) "st" = ( @@ -4804,7 +5027,8 @@ dir = 4; door_color = "#e6ab22"; name = "Shield Generator"; - req_access = list(11,24); + req_access = null; + req_one_access = list(11,24); stripe_color = "#e6ab22" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -4920,6 +5144,12 @@ /obj/random/drinkbottle, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portfore) +"sZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/maintenance/stellardelight/deck3/portaft) "tb" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -4976,7 +5206,7 @@ dir = 4 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "tn" = ( /obj/machinery/light_switch{ dir = 8; @@ -5036,6 +5266,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "tH" = ( @@ -5174,13 +5407,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_cyborg_station) -"ue" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/handrail{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "uf" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment, @@ -5189,18 +5415,21 @@ /turf/simulated/open, /area/stellardelight/deck2/port) "ui" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/structure/cable{ - icon_state = "0-4" +/obj/machinery/atmospherics/portables_connector/fuel{ + dir = 1 }, /obj/machinery/door/window/southleft{ dir = 1; req_one_access = list(11,67) }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "uj" = ( /turf/simulated/wall/bay/r_wall/blue, /area/crew_quarters/heads/hor) @@ -5212,6 +5441,9 @@ dir = 8; pixel_x = -24 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "ul" = ( @@ -5235,6 +5467,12 @@ "uq" = ( /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck3/starboarddock) +"ur" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/wall/bay/r_wall/steel, +/area/maintenance/stellardelight/deck3/starboardaft) "us" = ( /obj/machinery/light{ dir = 4 @@ -5325,12 +5563,22 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) "uM" = ( -/obj/structure/table/rack, -/obj/item/device/paicard, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/alarm/angled, +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/clown{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/bikehorn{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/weapon/stamp/clown{ + pixel_x = 6; + pixel_y = 9 + }, +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "uQ" = ( /obj/machinery/alarm/angled{ dir = 8 @@ -5418,7 +5666,7 @@ dir = 8 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "uZ" = ( /obj/structure/cable/blue{ icon_state = "1-2" @@ -5490,6 +5738,16 @@ }, /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck3/portaft) +"vr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "vt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -5527,7 +5785,7 @@ }, /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "vA" = ( /obj/machinery/power/apc/angled{ dir = 1; @@ -5560,6 +5818,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "vI" = ( @@ -5644,24 +5905,36 @@ /turf/simulated/floor/bluegrid, /area/ai_cyborg_station) "vX" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = null +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/structure/handrail, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "wa" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/stellardelight/deck2/port) +"wc" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/landmark/vermin, +/turf/simulated/open, +/area/stellardelight/deck2/starboard) "wd" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/oxygen, @@ -5741,8 +6014,13 @@ /area/crew_quarters/heads/hos) "wr" = ( /obj/machinery/computer/ship/engines/adv, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "wt" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -5763,7 +6041,7 @@ }, /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "wy" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -5807,10 +6085,12 @@ /area/ai_cyborg_station) "wP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/camera/network/halls, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "wQ" = ( @@ -5842,22 +6122,6 @@ /obj/machinery/holoplant, /turf/simulated/floor/bluegrid, /area/ai) -"wT" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - dir = 4; - id = "shuttleshutter" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/fore) "wV" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -5886,20 +6150,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/transitgateway) -"wX" = ( -/obj/machinery/computer/shuttle_control/explore/sdboat{ - dir = 4 - }, -/obj/machinery/power/apc/angled{ - dir = 8; - name = "night shift APC"; - nightshift_setting = 2 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "wY" = ( /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -5908,9 +6158,15 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "wZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "xb" = ( /obj/machinery/light/small{ dir = 4 @@ -5948,21 +6204,17 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_server_room) "xf" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 4 - }, -/obj/machinery/airlock_sensor{ - dir = 8; - frequency = 1380; - id_tag = null; - pixel_x = 24 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, /obj/structure/handrail{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "xg" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -6013,11 +6265,11 @@ /obj/structure/cable{ icon_state = "4-8" }, -/obj/effect/landmark{ - name = "maint_pred" - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) +"xp" = ( +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "xu" = ( /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; @@ -6079,6 +6331,9 @@ pixel_y = -32 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "xB" = ( @@ -6094,6 +6349,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) "xE" = ( @@ -6116,6 +6372,13 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportroomb) +"xL" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "xM" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -6136,6 +6399,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "xP" = ( @@ -6183,17 +6449,22 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "ya" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 1 - }, /obj/machinery/button/remote/blast_door{ id = "shuttleshutter"; name = "Shutter Control"; pixel_x = 17; pixel_y = 27 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "yb" = ( /obj/structure/sign/deck3{ pixel_x = 32 @@ -6358,21 +6629,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) -"yG" = ( -/obj/machinery/portable_atmospherics/canister/phoron, +"yH" = ( /obj/structure/cable{ - icon_state = "1-8" + icon_state = "4-8" }, -/obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(11,67) - }, -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/turf/simulated/wall/bay/r_wall/blue, +/area/ai_cyborg_station) "yI" = ( /obj/item/weapon/folder{ pixel_x = -4 @@ -6385,7 +6647,6 @@ }, /obj/item/weapon/folder/yellow, /obj/structure/table/darkglass, -/obj/structure/table/darkglass, /obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/lawoffice) @@ -6414,6 +6675,12 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/heads/hop) +"yP" = ( +/obj/structure/sign/warning/falling{ + pixel_x = 32 + }, +/turf/simulated/open, +/area/stellardelight/deck2/starboard) "yR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -6525,6 +6792,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload) +"zk" = ( +/obj/effect/landmark{ + name = "droppod_landing" + }, +/turf/space, +/area/space) "zm" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -6635,6 +6908,16 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/stellardelight/deck3/commandhall) +"zC" = ( +/obj/item/toy/figure/mime, +/obj/item/weapon/pen/crayon/marker/mime, +/obj/item/weapon/pen/crayon/mime, +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "zD" = ( /obj/structure/cable/blue{ icon_state = "1-2" @@ -6655,23 +6938,14 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "zF" = ( -/obj/machinery/power/apc/angled{ - dir = 8; - name = "night shift APC"; - nightshift_setting = 2 - }, /obj/structure/cable{ icon_state = "0-4" }, -/obj/structure/closet/crate, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/power/apc/angled{ + dir = 8 + }, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "zH" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -6760,11 +7034,19 @@ /obj/structure/handrail{ dir = 1 }, -/obj/machinery/atmospherics/binary/pump/fuel{ - dir = 4 +/obj/machinery/power/apc{ + pixel_y = -28; + req_access = null; + req_one_access = list(11, 67) }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/cable/green, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "zV" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -6777,6 +7059,9 @@ /area/maintenance/stellardelight/deck3/aftstarroom) "zW" = ( /obj/structure/lattice, +/obj/structure/sign/warning/falling{ + pixel_y = 32 + }, /turf/simulated/open, /area/stellardelight/deck2/fore) "zX" = ( @@ -6788,19 +7073,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/tcommsat/computer) -"Ab" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - id = "shuttleshutter" - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/fore) "Ae" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -6878,6 +7150,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/stellardelight/deck2/starboard) "Aq" = ( @@ -6898,7 +7173,7 @@ dir = 5 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "At" = ( /obj/structure/table/glass, /obj/item/device/flashlight/lamp/green, @@ -6946,6 +7221,32 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_cyborg_station) +"AD" = ( +/obj/structure/handrail, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "sdboat_docker"; + pixel_x = 5; + pixel_y = 25 + }, +/obj/machinery/airlock_sensor{ + dir = 8; + frequency = 1380; + id_tag = null; + pixel_x = 25; + pixel_y = 2 + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "AE" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -6964,6 +7265,10 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) +"AK" = ( +/obj/random/trash_pile, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardaft) "AP" = ( /obj/machinery/power/apc/angled{ dir = 4 @@ -7006,7 +7311,7 @@ stripe_color = "#454545" }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "AU" = ( /obj/machinery/light/small, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -7057,13 +7362,23 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "Bb" = ( -/obj/item/device/radio/intercom{ - dir = 1; - pixel_x = -32; - pixel_y = 24 +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/structure/panic_button/small{ + pixel_x = -29; + pixel_y = 30 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Bd" = ( /obj/machinery/alarm/angled{ dir = 8 @@ -7109,7 +7424,7 @@ dir = 4 }, /turf/simulated/floor/tiled/steel_ridged, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Bj" = ( /obj/machinery/message_server, /turf/simulated/floor/tiled/techfloor/grid, @@ -7225,9 +7540,6 @@ /area/crew_quarters/heads/cmo) "BA" = ( /obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/door/airlock/angled_bay/external/glass{ dir = 4; frequency = 1380; @@ -7244,6 +7556,9 @@ pixel_y = 32; req_one_access = list(13) }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/portdock) "BB" = ( @@ -7298,7 +7613,7 @@ /obj/random/maintenance/research, /obj/random/maintenance/research, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "BH" = ( /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) @@ -7388,17 +7703,22 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "BW" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 +/obj/machinery/power/terminal{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/structure/cable{ + icon_state = "0-4" }, -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "BY" = ( /obj/machinery/newscaster{ layer = 3.3; @@ -7419,6 +7739,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/effect/landmark/vermin, /turf/simulated/open, /area/stellardelight/deck2/fore) "Cc" = ( @@ -7583,7 +7904,7 @@ /area/crew_quarters/bar) "CC" = ( /turf/simulated/wall/bay/r_wall/steel, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "CD" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; @@ -7618,6 +7939,9 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor, /area/stellardelight/deck2/starboard) "CJ" = ( @@ -7633,6 +7957,12 @@ }, /turf/simulated/open, /area/stellardelight/deck2/starboard) +"CK" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/window/bay/reinforced, +/obj/structure/low_wall/bay/reinforced/steel, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardaft) "CO" = ( /obj/effect/overmap/visitable/ship/stellar_delight, /turf/space, @@ -7720,6 +8050,12 @@ }, /turf/simulated/open, /area/crew_quarters/bar) +"De" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/ai_cyborg_station) "Df" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -7747,6 +8083,11 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) +"Dk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardaft) "Dn" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -7762,13 +8103,9 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_cyborg_station) "Du" = ( -/obj/structure/table/rack/shelf, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/item/weapon/storage/fancy/candle_box, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/vending/wardrobe/clowndrobe, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Dw" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -7897,8 +8234,21 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "clownmimeoffice"; + name = "Window Lockdown"; + pixel_x = 23; + pixel_y = 7 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "DY" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -7918,7 +8268,7 @@ /area/maintenance/stellardelight/deck3/starboardcent) "Ec" = ( /turf/simulated/wall/bay/steel, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "Ed" = ( /turf/simulated/wall/bay/r_wall/steel, /area/stellardelight/deck3/aft) @@ -7970,6 +8320,12 @@ /obj/random/trash_pile, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) +"El" = ( +/obj/effect/landmark{ + name = "carpspawn" + }, +/turf/space, +/area/space) "En" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -7995,6 +8351,9 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) +"Eu" = ( +/turf/simulated/wall/bay/r_wall/blue, +/area/stellardelight/deck2/port) "Ev" = ( /obj/structure/cable/blue{ icon_state = "1-4" @@ -8009,14 +8368,16 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "Ex" = ( -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) -"Ez" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 }, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "EE" = ( /obj/structure/table/rack{ dir = 8; @@ -8082,17 +8443,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_ridged, /area/tcommsat/computer) -"EM" = ( -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/apc/angled{ - dir = 1; - name = "night shift APC"; - nightshift_setting = 2 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "EN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8135,7 +8485,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "EU" = ( /obj/structure/cable/blue{ icon_state = "2-8" @@ -8162,6 +8512,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/stellardelight/deck3/commandhall) +"EX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "EY" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills{ @@ -8212,6 +8572,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Fg" = ( @@ -8421,7 +8782,7 @@ icon_state = "1-2" }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Ge" = ( /obj/structure/table/standard, /obj/item/weapon/aiModule/nanotrasen, @@ -8516,7 +8877,7 @@ dir = 10 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Gv" = ( /obj/structure/sign/deck3{ pixel_x = -32 @@ -8703,6 +9064,9 @@ pixel_x = -32; plane = -34 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Hh" = ( @@ -8748,6 +9112,12 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/aftstarroom) +"Hq" = ( +/obj/structure/sign/warning/falling{ + pixel_y = 32 + }, +/turf/simulated/open, +/area/stellardelight/deck2/fore) "Hs" = ( /turf/simulated/wall/bay/orange, /area/crew_quarters/heads/chief) @@ -8839,7 +9209,7 @@ /obj/random/maintenance, /obj/random/maintenance, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "HH" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -8854,6 +9224,8 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "HN" = ( @@ -8899,6 +9271,9 @@ "HR" = ( /obj/structure/table/steel, /obj/random/contraband, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + pixel_y = 8 + }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportrooma) "HS" = ( @@ -8965,21 +9340,12 @@ /turf/simulated/open, /area/stellardelight/deck2/central) "Ia" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - dir = 4; - id = "shuttleshutter" +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "sdboat" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/aft) +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Ib" = ( /obj/machinery/alarm/angled{ dir = 4 @@ -9039,19 +9405,26 @@ /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) "Ir" = ( -/obj/structure/bed/chair/shuttle, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6 +/obj/structure/bed/chair/shuttle{ + dir = 1 }, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "It" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Iu" = ( @@ -9069,6 +9442,13 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/heads/chief) +"ID" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/landmark/vines, +/turf/simulated/open, +/area/stellardelight/deck2/fore) "IG" = ( /obj/structure/cable/blue{ icon_state = "4-8" @@ -9163,18 +9543,25 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "IS" = ( /obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - name = "glass airlock" - }, /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/door/airlock/angled_bay/hatch{ + name = "Clown and Mime Office"; + req_one_access = list(138,136); + stripe_color = "#454545" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/forestarroomc) +/area/stellardelight/deck3/clownmimeoffice) "IU" = ( /obj/machinery/hologram/holopad, /obj/structure/sign/warning/secure_area{ @@ -9207,6 +9594,12 @@ }, /turf/simulated/floor/airless, /area/maintenance/stellardelight/deck3/portcent) +"IZ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/stellardelight/deck3/aft) "Ja" = ( /obj/machinery/door/airlock/angled_bay/external/glass{ frequency = 1379; @@ -9284,6 +9677,13 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/transitgateway) +"Jm" = ( +/obj/structure/barricade/cutout/clown, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/stellardelight/deck3/clownmimeoffice) "Jn" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/hatch{ @@ -9461,6 +9861,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "JS" = ( @@ -9515,11 +9918,27 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) +"Ke" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Kf" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/camera/network/halls{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Kg" = ( @@ -9543,11 +9962,27 @@ /turf/simulated/floor, /area/stellardelight/deck2/central) "Kj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/machinery/computer/shuttle_control/explore/sdboat{ + dir = 4 }, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/power/apc{ + pixel_y = -28; + req_access = null; + req_one_access = list(11, 67) + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Kk" = ( /obj/structure/table/steel, /obj/random/maintenance/clean, @@ -9591,7 +10026,7 @@ "Kt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Kv" = ( /obj/structure/bed/chair{ dir = 4 @@ -9640,7 +10075,7 @@ /obj/random/mre, /obj/random/mre, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "KD" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -9649,7 +10084,7 @@ icon_state = "4-8" }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "KF" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -9681,6 +10116,9 @@ "KI" = ( /turf/simulated/floor/wood, /area/stellardelight/deck3/readingroom) +"KJ" = ( +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/starboardaft) "KL" = ( /obj/machinery/power/apc/angled{ dir = 8 @@ -9691,6 +10129,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "KM" = ( @@ -9703,6 +10144,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portfore) "KS" = ( @@ -9723,6 +10165,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "KU" = ( @@ -9762,12 +10207,21 @@ }, /obj/machinery/portable_atmospherics/canister/air/airlock, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Le" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/flora/pottedplant/minitree, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) +"Lf" = ( +/obj/structure/sign/warning/falling{ + pixel_x = -32 + }, +/turf/simulated/open, +/area/stellardelight/deck2/starboard) "Lh" = ( /obj/machinery/hologram/holopad, /obj/structure/cable/blue{ @@ -9845,7 +10299,7 @@ dir = 5 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Lz" = ( /obj/machinery/newscaster{ pixel_x = 30 @@ -9907,11 +10361,16 @@ /turf/simulated/floor/wood, /area/stellardelight/deck3/cafe) "LO" = ( -/obj/structure/cable{ +/obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "LP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -9942,6 +10401,7 @@ dir = 4; pixel_x = 27 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) "LR" = ( @@ -9997,14 +10457,7 @@ icon_state = "1-2" }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) -"LZ" = ( -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6 - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/turf/simulated/wall/rshull, -/area/shuttle/sdboat/aft) +/area/maintenance/stellardelight/deck3/starboardaft) "Mc" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10058,7 +10511,7 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice) "Mo" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -10087,12 +10540,13 @@ /turf/simulated/floor, /area/ai_cyborg_station) "Mr" = ( -/obj/structure/table/rack, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/machinery/chemical_dispenser/bar_coffee/full, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/clowndouble, +/obj/structure/curtain/black{ + color = "#361447" + }, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Ms" = ( /obj/structure/table/reinforced, /obj/item/weapon/stamp/hop, @@ -10125,6 +10579,13 @@ /obj/random/maintenance, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardfore) +"Mv" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/landmark/vines, +/turf/simulated/open, +/area/stellardelight/deck2/fore) "Mw" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -10133,6 +10594,9 @@ /area/maintenance/stellardelight/deck3/starboardcent) "Mx" = ( /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "My" = ( @@ -10141,13 +10605,19 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) +"MA" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/maintenance/stellardelight/deck3/portaft) "MB" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 }, /obj/random/trash_pile, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "MC" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -10272,6 +10742,9 @@ dir = 4 }, /obj/effect/floor_decal/arrivals, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "MV" = ( @@ -10292,13 +10765,21 @@ icon_state = "1-2" }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "MX" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "MZ" = ( /obj/machinery/alarm/angled{ dir = 8 @@ -10323,6 +10804,13 @@ }, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck3/cryo) +"Nd" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/effect/landmark/vines, +/turf/simulated/open, +/area/stellardelight/deck2/port) "Ne" = ( /obj/structure/cable{ icon_state = "1-8" @@ -10341,7 +10829,7 @@ dir = 4 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Nf" = ( /obj/machinery/light{ dir = 4 @@ -10382,6 +10870,9 @@ /obj/structure/sign/nanotrasen{ pixel_x = -32 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Nm" = ( @@ -10571,6 +11062,16 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portaft) +"NS" = ( +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "NT" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 @@ -10619,16 +11120,11 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck3/starboarddock) "NZ" = ( -/obj/structure/closet/crate, -/obj/random/contraband, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/maintenance, -/obj/random/mre, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/item/weapon/bedsheet/mimedouble, +/obj/structure/bed/double/padded, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "Oa" = ( /obj/machinery/door/firedoor/glass, /obj/structure/sign/poster{ @@ -10732,6 +11228,9 @@ "Ou" = ( /obj/item/device/radio/beacon, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Ov" = ( @@ -10783,6 +11282,12 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/stellardelight/deck3/cafe) +"OA" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/wall/bay/r_wall/blue, +/area/ai_cyborg_station) "OC" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/angled_bay/hatch{ @@ -10957,6 +11462,13 @@ "OX" = ( /turf/simulated/floor, /area/maintenance/stellardelight/deck3/portcent) +"OY" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/landmark/vines, +/turf/simulated/open, +/area/stellardelight/deck2/starboard) "Pa" = ( /obj/structure/lattice, /turf/simulated/open, @@ -11021,11 +11533,21 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload) "Pl" = ( -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass{ + name = "Starstuff Cockpit"; + req_one_access = list(67) }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Pm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11053,12 +11575,20 @@ }, /turf/simulated/floor/tiled/dark, /area/lawoffice) +"Pp" = ( +/obj/effect/landmark/start/clown, +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Pq" = ( /obj/structure/bed/chair{ dir = 8 }, /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/foreportrooma) +"Ps" = ( +/obj/machinery/space_heater, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/forestarroomb) "Px" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -11073,8 +11603,24 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/machinery/camera/network/halls{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) +"PB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "PC" = ( /obj/machinery/alarm/angled{ dir = 4 @@ -11156,24 +11702,6 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) -"PU" = ( -/obj/structure/sign/directions/stairs_down{ - pixel_x = 32; - pixel_y = 18 - }, -/obj/structure/sign/directions/medical{ - pixel_x = 32; - pixel_y = 12 - }, -/obj/structure/sign/directions/engineering{ - pixel_x = 32; - pixel_y = 6 - }, -/obj/structure/sign/directions/cargo{ - pixel_x = 32 - }, -/turf/simulated/open, -/area/stellardelight/deck3/aft) "PV" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -11201,20 +11729,24 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Qe" = ( -/obj/structure/cable/green{ +/obj/structure/cable{ icon_state = "4-8" }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1380; - id_tag = "sd_bittyshuttle"; - pixel_y = 29 +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/handrail, -/obj/effect/shuttle_landmark/shuttle_initializer/sdboat, /obj/effect/overmap/visitable/ship/landable/sd_boat, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/effect/shuttle_landmark/shuttle_initializer/sdboat, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Qf" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -11222,6 +11754,16 @@ /obj/effect/landmark/start/ce, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/heads/chief) +"Qh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Qi" = ( /obj/structure/sign/painting/public{ pixel_x = -30 @@ -11260,16 +11802,6 @@ "Qp" = ( /turf/simulated/wall/bay/r_wall/steel, /area/crew_quarters/bar) -"Qq" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - dir = 8; - pixel_x = -27 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "Qs" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -11308,6 +11840,9 @@ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "QB" = ( @@ -11407,13 +11942,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardcent) -"QR" = ( -/obj/structure/table/steel_reinforced, -/obj/structure/panic_button{ - pixel_x = -32 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) "QS" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11442,8 +11970,8 @@ /obj/structure/cable{ icon_state = "2-8" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "QZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11457,13 +11985,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) -"Rb" = ( -/obj/structure/bed/chair/shuttle, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 29 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) "Rc" = ( /obj/machinery/porta_turret/ai_defense, /obj/structure/cable/cyan{ @@ -11565,7 +12086,7 @@ dir = 8 }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Ru" = ( /obj/machinery/holoplant, /obj/machinery/camera/network/command{ @@ -11583,11 +12104,14 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Rw" = ( -/obj/structure/bed/chair/shuttle{ - dir = 8 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Rx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -11686,7 +12210,8 @@ dir = 4; door_color = "#e6ab22"; name = "Shield Generator"; - req_access = list(11,24); + req_access = null; + req_one_access = list(11,24); stripe_color = "#e6ab22" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11695,25 +12220,38 @@ /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/central) "RW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/portables_connector{ + dir = 1 }, -/obj/structure/handrail{ - dir = 8 +/obj/machinery/door/window/southright{ + dir = 1; + req_one_access = list(11,67) }, -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "RX" = ( /turf/simulated/wall/bay/steel, /area/stellardelight/deck2/central) "RY" = ( -/obj/structure/bed/chair/shuttle, +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "RZ" = ( /obj/structure/cable/blue{ icon_state = "1-2" @@ -11768,6 +12306,9 @@ pixel_y = -32 }, /obj/effect/floor_decal/steeldecal/steel_decals5, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Sm" = ( @@ -11782,9 +12323,6 @@ }, /area/tcommsat/chamber) "Sn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -11794,6 +12332,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Sp" = ( @@ -11802,6 +12343,12 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/foreportrooma) +"Sw" = ( +/obj/machinery/alarm/angled{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/stellardelight/deck3/portaft) "Sz" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11854,15 +12401,14 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "SJ" = ( -/obj/structure/bed/chair/bay/shuttle{ - dir = 8 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/machinery/light, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "SK" = ( /obj/structure/lattice, /turf/space, @@ -12075,6 +12621,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 8; name = "night shift APC"; nightshift_setting = 2 @@ -12127,6 +12674,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "TE" = ( @@ -12193,6 +12743,7 @@ /area/ai_server_room) "TO" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/monotile, /area/stellardelight/deck3/commandhall) "TP" = ( @@ -12315,10 +12866,12 @@ /area/stellardelight/deck3/exterior) "Uy" = ( /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/camera/network/halls, /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 1 }, +/obj/machinery/station_map{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "UA" = ( @@ -12342,6 +12895,16 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) +"UD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "UF" = ( /obj/machinery/light/small, /turf/simulated/floor, @@ -12406,7 +12969,7 @@ "UQ" = ( /obj/machinery/door/firedoor/glass, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "UR" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -12457,6 +13020,7 @@ dir = 8; pixel_x = -27 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "UX" = ( @@ -12496,6 +13060,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/cable{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Ve" = ( @@ -12521,6 +13088,21 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck3/starboardfore) +"Vh" = ( +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "shuttleshutter" + }, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 6 + }, +/turf/simulated/floor/reinforced/airless, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Vi" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -12539,8 +13121,9 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/obj/effect/landmark/start/mime, +/turf/simulated/floor/carpet/bcarpet, +/area/stellardelight/deck3/clownmimeoffice) "Vm" = ( /obj/structure/lattice, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12609,11 +13192,16 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_cyborg_station) "Vw" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/bed/chair/shuttle{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Vx" = ( /obj/structure/cable/blue{ icon_state = "1-4" @@ -12668,6 +13256,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/weapon/folder/white_cmo, /turf/simulated/floor/tiled/eris/white/cargo, /area/crew_quarters/heads/cmo) "VG" = ( @@ -12772,30 +13361,57 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "Wg" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/structure/bed/chair/shuttle{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Wi" = ( /obj/structure/closet/secure_closet/personal, /turf/simulated/floor/bluegrid, /area/ai) "Wj" = ( /obj/machinery/computer/ship/helm/adv, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/fore) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) +"Wl" = ( +/obj/structure/sign/warning/falling{ + pixel_x = -32 + }, +/turf/simulated/open, +/area/stellardelight/deck2/port) "Wn" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 +/obj/machinery/power/smes/buildable{ + charge = 500000 }, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Wp" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/open, @@ -12816,7 +13432,7 @@ icon_state = "1-2" }, /turf/simulated/floor, -/area/maintenance/stellardelight/deck3/portaft) +/area/maintenance/stellardelight/deck3/starboardaft) "Ws" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -12840,17 +13456,22 @@ /turf/simulated/floor/airless, /area/stellardelight/deck3/exterior) "Ww" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = null - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/structure/handrail{ dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/shuttle/sdboat/aft) +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/machinery/light, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "sdboat_docker_pump_out_internal" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" + }, +/turf/simulated/floor/tiled, +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Wx" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -12921,21 +13542,12 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/stellardelight/deck3/foreportrooma) "WK" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/angled/open{ - dir = 4; - id = "shuttleshutter" +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor, -/area/shuttle/sdboat/fore) +/area/shuttle/sdboat/fore{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "WL" = ( /obj/structure/closet/crate, /obj/random/contraband, @@ -12967,6 +13579,7 @@ /area/lawoffice) "WQ" = ( /obj/machinery/power/apc/angled{ + cell_type = /obj/item/weapon/cell/super; dir = 4; name = "night shift APC"; nightshift_setting = 2 @@ -13028,17 +13641,15 @@ /turf/simulated/floor/tiled/eris/white/cargo, /area/crew_quarters/heads/cmo) "Xb" = ( -/obj/machinery/alarm/angled{ - dir = 8 - }, -/turf/simulated/floor/tiled/techfloor/grid, -/area/maintenance/stellardelight/deck3/forestarroomc) +/turf/simulated/floor/carpet/gaycarpet, +/area/stellardelight/deck3/clownmimeoffice) "Xc" = ( /obj/structure/lattice, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/effect/landmark/vermin, /turf/simulated/open, /area/crew_quarters/bar) "Xd" = ( @@ -13099,6 +13710,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/item/weapon/folder/white_rd, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/heads/hor) "Xo" = ( @@ -13147,6 +13759,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "XD" = ( @@ -13444,6 +14059,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "YB" = ( @@ -13553,6 +14171,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 8 }, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/aft) "YS" = ( @@ -13565,12 +14186,12 @@ /turf/simulated/open, /area/crew_quarters/bar) "Zd" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "sdboat" }, -/obj/machinery/alarm/angled, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/shuttle/sdboat/aft) +/area/shuttle/sdboat/aft{ + base_turf = /turf/simulated/floor/reinforced/airless + }) "Ze" = ( /turf/simulated/floor/bluegrid{ name = "Mainframe Base"; @@ -13597,6 +14218,9 @@ dir = 4 }, /obj/effect/floor_decal/shuttles/right, +/obj/structure/cable{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/stellardelight/deck3/portdock) "Zj" = ( @@ -13731,9 +14355,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/stellardelight/deck3/starboarddock) -"ZJ" = ( -/turf/simulated/open, -/area/maintenance/stellardelight/deck3/portaft) "ZK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16477,7 +17098,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -17010,7 +17631,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -17881,7 +18502,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -17945,6 +18566,7 @@ Jh Jh Jh Jh +El Jh Jh Jh @@ -17980,8 +18602,7 @@ Jh Jh Jh Jh -Jh -Jh +El Jh Jh Jh @@ -18719,7 +19340,7 @@ Jh Jh Jh Jh -Jh +zk Jh Jh Jh @@ -18815,7 +19436,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -19189,7 +19810,7 @@ NL NL Jh Jh -Jh +zk Jh Jh Jh @@ -19975,7 +20596,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -20303,17 +20924,17 @@ sM sM sM sM -be -fn -Ia -fn -fn -fn -Ia -fn -fn sM sM +Ia +Zd +Zd +Vh +gi +gi +Qh +hg +sM IK SK NL @@ -20442,19 +21063,19 @@ qz Ii hk eJ -eJ WK -eJ -eJ -fn +WK +WK +dQ +Zd +Zd Zd -Qq Wn BW lc ui -fn -sM +EX +NS sM IK Jh @@ -20583,20 +21204,20 @@ qz qz Ii Iz -Ab -QR -mU -wX +WK +WK +Kj +WK gl RY aP -LO -LO -rk +Zd +rX +MX fg -yG -iD -sM +Zd +Zd +Zd sM IK Jh @@ -20725,19 +21346,19 @@ qz qz Ii Iz -Ab +be wr Bb SJ -eJ -Rb +Vw +Vw Vw Rw -Rw +cn iw zS -fn -fn +Zd +xL sM sM IK @@ -20833,7 +21454,7 @@ Ae NL Yg vA -ZJ +dE DT dM bd @@ -20849,7 +21470,7 @@ dE dE dE dE -dE +fP HY ed Bm @@ -20867,13 +21488,13 @@ qz qz Ii Iz -Ab +be Wj ya Pl -mw LO -oJ +LO +LO lB hR MX @@ -20956,7 +21577,7 @@ eF IP YD bC -Ns +ms Ns Ns Hk @@ -20991,7 +21612,7 @@ dE dE dE dE -dE +Sw dE dE dE @@ -21009,19 +21630,19 @@ qz qz Ii Iz -Ab +be jc Ex -dq -eJ -Rb +SJ Vw -gY -fn +Vw +Vw +Zd +Rw sa -fn -fn -fn +Zd +PB +xL sM sM IK @@ -21032,7 +21653,7 @@ NL Jh Jh Jh -Jh +El Jh Jh Jh @@ -21151,20 +21772,20 @@ qz qz Ii hk -Ab -mU -mU -ax +WK +WK +mh +WK gl Ir Wg -ue +Zd ri vX Ww -Ww -iD -sM +UD +Zd +Zd sM IK Jh @@ -21266,7 +21887,7 @@ CS oW oW oW -QF +Nd oW oW oW @@ -21277,7 +21898,7 @@ oW oW QF oW -oW +Wl CS Ii Qu @@ -21293,20 +21914,20 @@ qz qz Ii Iz -eJ -eJ -wT -eJ -eJ -Ez -EM -cQ -ri +mi +WK +WK +WK +dQ +Zd +Zd +Zd +AD Qe xf RW -fn -sM +Ke +NS sM Di af @@ -21439,17 +22060,17 @@ sM sM sM sM -mi -Kj -iM -fn -LZ -kz -fn -fn -fn sM sM +Ia +Zd +Zd +kz +gi +gi +vr +Zd +sM IK SK NL @@ -21465,7 +22086,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -21561,7 +22182,7 @@ oW oW ZS oW -oW +Eu NI IO Ii @@ -21768,7 +22389,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -22097,7 +22718,7 @@ Cp qF qF qF -Cb +Mv qF qF qF @@ -22108,7 +22729,7 @@ QF oW dT hY -oW +Wl oW QF oW @@ -22419,7 +23040,7 @@ Cu pc pc ER -RI +ag Qn Qn Ed @@ -22561,7 +23182,7 @@ ME UI aX ei -PU +ah RI RI Ed @@ -23075,7 +23696,7 @@ qp NF qp Qp -Hf +ba Ie tV cb @@ -23501,7 +24122,7 @@ qp Vm qp Qp -qF +Hq bn tV rc @@ -23511,7 +24132,7 @@ BK aQ aQ sf -aQ +jO aQ BK aQ @@ -23529,7 +24150,7 @@ Tm Tm PL Gj -QB +ab QB QB QB @@ -23671,7 +24292,7 @@ Gj Fr Rl Gj -iV +ae iV iV iV @@ -24833,7 +25454,7 @@ qX nL Gv kt -re +ak RI RI Ed @@ -24975,7 +25596,7 @@ SF pc pc ER -RI +ag YK YK Ed @@ -25110,13 +25731,13 @@ th th ct th -th +De Le TB -pc -pc -pc -pc +IZ +IZ +IZ +IZ YR YR xO @@ -25212,7 +25833,7 @@ qF qF qF qF -KF +ID qF qF qF @@ -25228,9 +25849,9 @@ qF hC aJ ow -ZC -ow +wc ow +yP Ks RG ow @@ -25252,7 +25873,7 @@ Gk sQ uT wo -th +yH jP BC en @@ -25394,7 +26015,7 @@ Gk Ge vb xj -th +yH WZ LP zy @@ -25498,11 +26119,11 @@ Yj Yj Ef FE -FE +Ps eE dx ch -mF +lV zF NZ Ec @@ -25518,7 +26139,7 @@ Io QP xH OG -xH +mT Yx me ow @@ -25536,7 +26157,7 @@ Gk tQ Vt wd -th +yH Ed Cc Ed @@ -25646,7 +26267,7 @@ dx ku mF Vk -mF +zC Ec hr al @@ -25672,13 +26293,13 @@ Gk Gk Gk Gk -Gk -Gk -Gk -th -th -th -th +MA +sZ +sZ +OA +OA +OA +cz ow ok ow @@ -25786,9 +26407,9 @@ FE UF dx uM -mF +xp xo -mF +Jm Ec kp bm @@ -25813,7 +26434,7 @@ ow OE ow ow -ow +Lf CH ow ow @@ -25928,9 +26549,9 @@ Rg FE dx Mr -mF +Pp ip -mF +fj Ec RE bh @@ -25945,8 +26566,8 @@ Hh eb tC Rq -dE -Yg +KJ +by Pa wR Yy @@ -26074,11 +26695,11 @@ Xb QW DW IS -hB +bB HL -hB -hB -hB +bB +bB +bB pt aB Mw @@ -26087,8 +26708,8 @@ ON Xd Ja Ly -dE -Yg +KJ +by ow Pa ow @@ -26103,8 +26724,8 @@ ow ow ow ow -ZC -ow +OY +yP ow ZM ow @@ -26212,8 +26833,8 @@ FD FD EZ CC -CC -CC +jy +jy CC CC Vg @@ -26230,26 +26851,26 @@ LR me tk qS -Yg -Yg -Yg -Yg -Yg -Yg -Yg -Yg -Yg -Yg +by +by +by +by +by +by +by +by +by +by Bg -Yg -Yg -Yg -Yg -Yg -Yg -Yg +by +by +by +by +by +by +by ff -Yg +by aA nr lT @@ -26353,7 +26974,6 @@ DQ DQ DQ DQ -DQ UU DQ DQ @@ -26361,6 +26981,7 @@ DQ DQ DQ DQ +DQ ez xH DE @@ -26386,9 +27007,9 @@ Ne iS iS Kz -iS -FG -JW +Dk +qY +AK Ld KD vy @@ -26511,18 +27132,18 @@ NL NL qy NL -Yg -dE -ZJ +by +KJ +KJ le ww ww MB Kt iv -dE +KJ UQ -dE +KJ HF nD BG @@ -26653,29 +27274,29 @@ NL NL we NL -Yg -Yg -Yg -Yg -ki -ki -Yg -Yg -Yg -Yg -Yg -Yg -vq -Yg -Yg -Yg -Yg -Yg -Yg -Yg -ki -ki -Yg +by +by +by +by +CK +CK +by +by +by +by +by +by +ur +by +by +by +by +by +by +by +CK +CK +by hQ lq lq @@ -26712,7 +27333,7 @@ NL Jh Jh Jh -Jh +El Jh Jh Jh @@ -27279,7 +27900,7 @@ NL NL Jh Jh -Jh +zk Jh Jh Jh @@ -27500,7 +28121,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -27763,7 +28384,7 @@ Jh Jh Jh Jh -Jh +zk Jh Jh Jh @@ -28242,7 +28863,7 @@ Jh Jh Jh Jh -Jh +zk Jh Jh Jh @@ -28751,7 +29372,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh @@ -29485,6 +30106,7 @@ Jh Jh Jh Jh +El Jh Jh Jh @@ -29531,8 +30153,7 @@ Jh Jh Jh Jh -Jh -Jh +El Jh Jh Jh @@ -29581,6 +30202,7 @@ Jh Jh Jh Jh +El Jh Jh Jh @@ -29697,8 +30319,7 @@ Jh Jh Jh Jh -Jh -Jh +El Jh Jh Jh @@ -30229,7 +30850,7 @@ Jh Jh Jh Jh -Jh +El Jh Jh Jh diff --git a/maps/stellardelight/stellar_delight_areas.dm b/maps/stellardelight/stellar_delight_areas.dm index b144f459eb..47bb681c0a 100644 --- a/maps/stellardelight/stellar_delight_areas.dm +++ b/maps/stellardelight/stellar_delight_areas.dm @@ -6,7 +6,7 @@ dynamic_lighting = TRUE /area/maintenance/stellardelight - name = "maintenance" + name = "Maintenance" icon = 'icons/turf/areas_vr.dmi' icon_state = "purblasqu" flags = RAD_SHIELDED @@ -35,67 +35,67 @@ icon_state = "deckmaint1" /area/maintenance/stellardelight/deck1/portfore - name = "deck one port forward maintenance" + name = "Deck One Port Forward Maintenance" /area/maintenance/stellardelight/deck1/starboardfore - name = "deck one starboard forward maintenance" + name = "Deck One Starboard Forward Maintenance" /area/maintenance/stellardelight/deck1/portcent - name = "deck one port center maintenance" + name = "Deck One Port Center Maintenance" /area/maintenance/stellardelight/deck1/starboardcent - name = "deck one starboard center maintenance" + name = "Deck One Starboard Center Maintenance" /area/maintenance/stellardelight/deck1/portaft - name = "deck one port aft maintenance" + name = "Deck One Port Aft Maintenance" /area/maintenance/stellardelight/deck1/exploration - name = "exploration maintenance" + name = "Exploration Maintenance" /area/maintenance/stellardelight/deck1/starboardaft - name = "deck one starboard aft maintenance" + name = "Deck One starboard aft Maintenance" /area/maintenance/stellardelight/deck2 icon_state = "deckmaint2" /area/maintenance/stellardelight/deck2/portfore - name = "deck two port forward maintenance" + name = "Deck Two Port Forward Maintenance" /area/maintenance/stellardelight/deck2/starboardfore - name = "deck two starboard forward maintenance" + name = "Deck Two Starboard Forward Maintenance" /area/maintenance/stellardelight/deck2/portaft - name = "deck two port aft maintenance" + name = "Deck Two Port Aft Maintenance" /area/maintenance/stellardelight/deck2/starboardaft - name = "deck two starboard aft maintenance" + name = "Deck Two Starboard Aft Maintenance" /area/maintenance/stellardelight/deck2/portsolars - name = "deck two port solar array" + name = "Deck Two Port Solar Array" /area/maintenance/stellardelight/deck2/starboardsolars - name = "deck two starboard solar array" + name = "Deck Two Starboard Solar Array" /area/maintenance/stellardelight/deck2/atmos - name = "atmospherics maintenance" + name = "Atmospherics Maintenance" /area/maintenance/stellardelight/deck3 icon_state = "deckmaint3" /area/maintenance/stellardelight/deck3/portfore - name = "deck three port forward maintenance" + name = "Deck Three Port Forward Maintenance" /area/maintenance/stellardelight/deck3/starboardfore - name = "deck three starboard forward maintenance" + name = "Deck Three Starboard Forward Maintenance" /area/maintenance/stellardelight/deck3/portcent - name = "deck three port central maintenance" + name = "Deck Three Port Central Maintenance" /area/maintenance/stellardelight/deck3/starboardcent - name = "deck three starboard central maintenance" + name = "Deck Three Starboard Central Maintenance" /area/maintenance/stellardelight/deck3/portaft - name = "deck three port aft maintenance" + name = "Deck Three Port Aft Maintenance" /area/maintenance/stellardelight/deck3/starboardaft - name = "deck three starboard aft maintenance" + name = "Deck Three Starboard Aft Maintenance" /area/maintenance/stellardelight/deck3/foreportrooma - name = "deck three forward port construction a" + name = "Deck Three Forward Port Construction A" /area/maintenance/stellardelight/deck3/foreportroomb - name = "deck three forward port construction b" + name = "Deck Three Forward Port Construction B" /area/maintenance/stellardelight/deck3/forestarrooma - name = "deck three forward starboard construction a" + name = "Deck Three Forward Starboard Construction A" /area/maintenance/stellardelight/deck3/forestarroomb - name = "deck three forward starboard construction b" + name = "Deck Three Forward Starboard Construction B" /area/maintenance/stellardelight/deck3/forestarroomc - name = "deck three forward starboard construction c" + name = "Deck Three Forward Starboard Construction C" /area/maintenance/stellardelight/deck3/aftstarroom - name = "deck three aft starboard construction " + name = "Deck Three Aft Starboard Construction" /area/maintenance/stellardelight/deck3/portfore @@ -129,6 +129,7 @@ soundproofed = TRUE limit_mob_size = FALSE block_suit_sensors = TRUE + forbid_events = TRUE /area/stellardelight/deck1/dorms/dorm1 name = "Dormitory One" @@ -277,6 +278,10 @@ /area/stellardelight/deck3/readingroom name = "Reading Rooms" sound_env = SMALL_SOFTFLOOR + flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT + soundproofed = TRUE + block_suit_sensors = TRUE + forbid_events = TRUE /area/stellardelight/deck3/portdock name = "Port Dock" @@ -286,6 +291,9 @@ name = "Starboard Dock" ambience = AMBIENCE_ARRIVALS +/area/stellardelight/deck3/clownmimeoffice + name = "Clown and Mime Office" + /area/stellardelight/deck1/exterior name = "Deck One Exterior" /area/stellardelight/deck2/exterior diff --git a/maps/stellardelight/stellar_delight_defines.dm b/maps/stellardelight/stellar_delight_defines.dm index d3b87fde9c..3cafb69e00 100644 --- a/maps/stellardelight/stellar_delight_defines.dm +++ b/maps/stellardelight/stellar_delight_defines.dm @@ -4,22 +4,20 @@ #define Z_LEVEL_SHIP_HIGH 3 #define Z_LEVEL_CENTCOM 4 #define Z_LEVEL_MISC 5 -#define Z_LEVEL_BEACH 6 -#define Z_LEVEL_BEACH_CAVE 7 -#define Z_LEVEL_AEROSTAT 8 -#define Z_LEVEL_AEROSTAT_SURFACE 9 -#define Z_LEVEL_DEBRISFIELD 10 -#define Z_LEVEL_FUELDEPOT 11 -#define Z_LEVEL_OVERMAP 12 -#define Z_LEVEL_OFFMAP1 13 -#define Z_LEVEL_GATEWAY 14 +#define Z_LEVEL_SPACE_ROCKS 6 +#define Z_LEVEL_BEACH 7 +#define Z_LEVEL_BEACH_CAVE 8 +#define Z_LEVEL_AEROSTAT 9 +#define Z_LEVEL_AEROSTAT_SURFACE 10 +#define Z_LEVEL_DEBRISFIELD 11 +#define Z_LEVEL_FUELDEPOT 12 +#define Z_LEVEL_OVERMAP 13 +#define Z_LEVEL_OFFMAP1 14 +#define Z_LEVEL_GATEWAY 15 +#define Z_LEVEL_OM_ADVENTURE 16 //Camera networks #define NETWORK_HALLS "Halls" -#define NETWORK_TCOMMS "Telecommunications" //Using different from Polaris one for better name -#define NETWORK_OUTSIDE "Outside" -#define NETWORK_EXPLORATION "Exploration" -#define NETWORK_XENOBIO "Xenobiology" /datum/map/stellar_delight/New() ..() @@ -50,14 +48,15 @@ lobby_screens = list("youcanttaketheskyfromme") id_hud_icons = 'icons/mob/hud_jobs_vr.dmi' -/* + holomap_smoosh = list(list( - Z_LEVEL_SURFACE_LOW, - Z_LEVEL_SURFACE_MID, - Z_LEVEL_SURFACE_HIGH)) -*/ + Z_LEVEL_SHIP_LOW, + Z_LEVEL_SHIP_MID, + Z_LEVEL_SHIP_HIGH)) + station_name = "NRV Stellar Delight" station_short = "Stellar Delight" + facility_type = "ship" dock_name = "Virgo-3B Colony" dock_type = "surface" boss_name = "Central Command" @@ -70,7 +69,7 @@ shuttle_leaving_dock = "The shuttle has departed. Estimate %ETA% until arrival at %dock_name%." shuttle_called_message = "A scheduled crew transfer to the %dock_name% is occuring. The shuttle will arrive shortly. Those departing should proceed to deck three, aft within %ETA%." shuttle_recall_message = "The scheduled crew transfer has been cancelled." - shuttle_name = "Evacuation Shuttle" + shuttle_name = "Crew Transport" emergency_shuttle_docked_message = "The evacuation shuttle has arrived. You have approximately %ETD% to board the shuttle." emergency_shuttle_leaving_dock = "The emergency shuttle has departed. Estimate %ETA% until arrival at %dock_name%." emergency_shuttle_called_message = "An emergency evacuation has begun, and an off-schedule shuttle has been called. It will arrive at deck three, aft in approximately %ETA%." @@ -86,7 +85,6 @@ NETWORK_EXPLORATION, NETWORK_MEDICAL, NETWORK_MINE, - NETWORK_OUTSIDE, NETWORK_RESEARCH, NETWORK_RESEARCH_OUTPOST, NETWORK_ROBOTS, @@ -131,6 +129,7 @@ lateload_z_levels = list( list("Ship - Central Command"), list("Ship - Misc"), //Shuttle transit zones, holodeck templates, etc + list("V3b Asteroid Field"), list("Desert Planet - Z1 Beach","Desert Planet - Z2 Cave"), list("Remmi Aerostat - Z1 Aerostat","Remmi Aerostat - Z2 Surface"), list("Debris Field - Z1 Space"), @@ -139,7 +138,7 @@ list("Offmap Ship - Talon V2") ) - lateload_single_pick = list( + lateload_gateway = list( list("Carp Farm"), list("Snow Field"), list("Listening Post"), @@ -150,6 +149,10 @@ list("Wild West") ) + lateload_overmap = list( + list("Grass Cave") + ) + ai_shell_restricted = TRUE ai_shell_allowed_levels = list( Z_LEVEL_SHIP_LOW, @@ -169,8 +172,6 @@ mining_station_z = list(Z_LEVEL_SPACE_LOW) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) */ - lateload_single_pick = null //Nothing right now. - planet_datums_to_make = list(/datum/planet/virgo3b, /datum/planet/virgo4) @@ -182,17 +183,13 @@ . += "As an employee or contractor of NanoTrasen, operators of the Adephagia and one of the galaxy's largest corporations, you're probably just here to do a job." return jointext(., "
") -/* + /datum/map/stellar_delight/perform_map_generation() - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SURFACE_MINE, world.maxx, world.maxy) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SURFACE_MINE, 64, 64) // Create the mining ore distribution map. - - new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SOLARS, world.maxx, world.maxy) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SOLARS, 64, 64) // Create the mining ore distribution map. - + new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, world.maxx, world.maxy) // Create the mining Z-level. + new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64) // Create the mining ore distribution map. return 1 -*/ + /datum/skybox_settings/stellar_delight icon_state = "space5" @@ -205,12 +202,6 @@ Z_LEVEL_BEACH ) -// For making the 6-in-1 holomap, we calculate some offsets -#define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels. -#define SHIP_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns -#define SHIP_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*TETHER_MAP_SIZE) - TETHER_HOLOMAP_CENTER_GUTTER) / 2) // 80 -#define SHIP_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (2*TETHER_MAP_SIZE)) / 2) // 30 - /obj/effect/landmark/map_data/stellar_delight height = 3 @@ -246,6 +237,11 @@ return cached_skybox_image.add_overlay("glow") +// For making the 6-in-1 holomap, we calculate some offsets +#define SHIP_MAP_SIZE 140 // Width and height of compiled in tether z levels. +#define SHIP_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns +#define SHIP_HOLOMAP_MARGIN_X ((HOLOMAP_ICON_SIZE - (2*SHIP_MAP_SIZE) - SHIP_HOLOMAP_CENTER_GUTTER) / 2) // 80 +#define SHIP_HOLOMAP_MARGIN_Y ((HOLOMAP_ICON_SIZE - (2*SHIP_MAP_SIZE)) / 2) // 30 // We have a bunch of stuff common to the station z levels /datum/map_z_level/stellar_delight @@ -258,18 +254,24 @@ name = "Deck 1" base_turf = /turf/space transit_chance = 33 + holomap_offset_x = SHIP_HOLOMAP_MARGIN_X + holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y /datum/map_z_level/stellar_delight/deck_two z = Z_LEVEL_SHIP_MID name = "Deck 2" base_turf = /turf/simulated/open transit_chance = 33 + holomap_offset_x = SHIP_HOLOMAP_MARGIN_X + holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y + SHIP_MAP_SIZE /datum/map_z_level/stellar_delight/deck_three z = Z_LEVEL_SHIP_HIGH name = "Deck 3" base_turf = /turf/simulated/open transit_chance = 33 + holomap_offset_x = HOLOMAP_ICON_SIZE - SHIP_HOLOMAP_MARGIN_X - SHIP_MAP_SIZE + holomap_offset_y = SHIP_HOLOMAP_MARGIN_Y + SHIP_MAP_SIZE /datum/map_template/ship_lateload allow_duplicates = FALSE @@ -312,6 +314,26 @@ name = "Misc" flags = MAP_LEVEL_ADMIN|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_XENOARCH_EXEMPT +#include "../submaps/space_rocks/space_rocks.dm" +/datum/map_template/ship_lateload/space_rocks + name = "V3b Asteroid Field" + desc = "Space debris is common in V3b's orbit due to the proximity of Virgo 3" + mappath = 'maps/submaps/space_rocks/space_rocks.dmm' + + associated_map_datum = /datum/map_z_level/ship_lateload/space_rocks + +/datum/map_template/ship_lateload/space_rocks/on_map_loaded(z) + . = ..() + seed_submaps(list(Z_LEVEL_SPACE_ROCKS), 60, /area/sdmine/unexplored, /datum/map_template/space_rocks) + new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_SPACE_ROCKS, world.maxx - 4, world.maxy - 4) + new /datum/random_map/noise/ore/spacerocks(null, 1, 1, Z_LEVEL_SPACE_ROCKS, 64, 64) + +/datum/map_z_level/ship_lateload/space_rocks + z = Z_LEVEL_SPACE_ROCKS + name = "V3b Asteroid Field" + base_turf = /turf/space + flags = MAP_LEVEL_PLAYER|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES + /datum/map_template/ship_lateload/overmap name = "Overmap" desc = "Overmap lives here :3" @@ -330,370 +352,3 @@ desc = "The Virgo 2 Aerostat away mission." mappath = 'maps/expedition_vr/aerostat/aerostat_science_outpost.dmm' associated_map_datum = /datum/map_z_level/common_lateload/away_aerostat - - - -////////////////SHUTTLE TIME/////////////////// - -////////////////////////////////////////////////////////////// -// Escape shuttle and pods -/datum/shuttle/autodock/ferry/emergency/escape - name = "Escape" - location = FERRY_LOCATION_OFFSITE - shuttle_area = /area/shuttle/escape - warmup_time = 10 - landmark_offsite = "escape_cc" - landmark_station = "escape_station" - landmark_transition = "escape_transit" - move_time = SHUTTLE_TRANSIT_DURATION_RETURN - move_direction = SOUTH - docking_controller_tag = "escape_shuttle" - -/datum/shuttle/autodock/ferry/escape_pod/portescape - name = "Port Escape Pod" - location = FERRY_LOCATION_STATION - shuttle_area = /area/stellardelight/deck2/portescape - warmup_time = 0 - landmark_station = "port_ship_berth" - landmark_offsite = "port_escape_cc" - landmark_transition = "port_escape_transit" - docking_controller_tag = "port_escape_pod" - move_time = SHUTTLE_TRANSIT_DURATION_RETURN - move_direction = EAST - -/datum/shuttle/autodock/ferry/escape_pod/starboardescape - name = "Starboard Escape Pod" - location = FERRY_LOCATION_STATION - shuttle_area = /area/stellardelight/deck2/starboardescape - warmup_time = 0 - landmark_station = "starboard_ship_berth" - landmark_offsite = "starboard_escape_cc" - landmark_transition = "starboard_escape_transit" - docking_controller_tag = "starboard_escape_pod" - move_time = SHUTTLE_TRANSIT_DURATION_RETURN - move_direction = WEST - - -////////////////////////////////////////////////////////////// -// Supply shuttle -/datum/shuttle/autodock/ferry/supply/cargo - name = "Supply" - location = FERRY_LOCATION_OFFSITE - shuttle_area = /area/shuttle/supply - warmup_time = 10 - landmark_offsite = "supply_cc" - landmark_station = "supply_station" - docking_controller_tag = "supply_shuttle" - flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY - move_direction = WEST - -/////EXPLORATION SHUTTLE -// The shuttle's 'shuttle' computer -/obj/machinery/computer/shuttle_control/explore/stellardelight/exploration - name = "boat control console" - shuttle_tag = "Exploration Shuttle" - req_one_access = null - -// A shuttle lateloader landmark -/obj/effect/shuttle_landmark/shuttle_initializer/exploration - name = "Exploration Shuttle Landing Pad" - base_area = /area/stellardelight/deck1/shuttlebay - base_turf = /turf/simulated/floor/reinforced - landmark_tag = "sd_explo" - docking_controller = "explodocker_bay" - shuttle_type = /datum/shuttle/autodock/overmap/exboat - -// The 'shuttle' -/datum/shuttle/autodock/overmap/exboat - name = "Exploration Shuttle" - current_location = "sd_explo" - docking_controller_tag = "explodocker" - shuttle_area = /area/stellardelight/deck1/exploshuttle - fuel_consumption = 0 - defer_initialisation = TRUE - range = 1 - -/////MINING SHUTTLE -// The shuttle's 'shuttle' computer -/obj/machinery/computer/shuttle_control/explore/stellardelight/mining - name = "boat control console" - shuttle_tag = "Mining Shuttle" - req_one_access = null - -// A shuttle lateloader landmark -/obj/effect/shuttle_landmark/shuttle_initializer/mining - name = "Mining Shuttle Landing Pad" - base_area = /area/stellardelight/deck1/shuttlebay - base_turf = /turf/simulated/floor/reinforced - landmark_tag = "sd_mining" - docking_controller = "miningdocker_bay" - shuttle_type = /datum/shuttle/autodock/overmap/mineboat - -// The 'shuttle' -/datum/shuttle/autodock/overmap/mineboat - name = "Mining Shuttle" - current_location = "sd_mining" - docking_controller_tag = "miningdocker" - shuttle_area = /area/stellardelight/deck1/miningshuttle - fuel_consumption = 0 - defer_initialisation = TRUE - range = 1 - -/////STARSTUFF///// -// The shuttle's 'shuttle' computer -/obj/machinery/computer/shuttle_control/explore/sdboat - name = "Starstuff control console" - shuttle_tag = "Starstuff" - req_one_access = list(access_pilot) - -/obj/effect/overmap/visitable/ship/landable/sd_boat - name = "NTV Starstuff" - desc = "A small shuttle from the NRV Stellar Delight." - vessel_mass = 1000 - vessel_size = SHIP_SIZE_TINY - shuttle = "Starstuff" - known = TRUE - -// A shuttle lateloader landmark -/obj/effect/shuttle_landmark/shuttle_initializer/sdboat - name = "Port Shuttlepad" - base_area = /area/stellardelight/deck3/exterior - base_turf = /turf/simulated/floor/reinforced/airless - landmark_tag = "port_shuttlepad" - docking_controller = "sd_port_landing" - shuttle_type = /datum/shuttle/autodock/overmap/sdboat - -/datum/shuttle/autodock/overmap/sdboat - name = "Starstuff" - current_location = "port_shuttlepad" - docking_controller_tag = "sd_bittyshuttle" - shuttle_area = list(/area/shuttle/sdboat/fore,/area/shuttle/sdboat/aft) - fuel_consumption = 2 - defer_initialisation = TRUE - -/area/shuttle/sdboat/fore - icon = 'icons/turf/areas_vr.dmi' - icon_state = "yelwhitri" - name = "Starstuff Cockpit" - requires_power = 1 - -/area/shuttle/sdboat/aft - icon = 'icons/turf/areas_vr.dmi' - icon_state = "yelwhitri" - name = "Starstuff Crew Compartment" - requires_power = 1 - -/////Virgo Flyer///// -// The shuttle's 'shuttle' computer -/obj/machinery/computer/shuttle_control/explore/ccboat - name = "Virgo Flyer control console" - shuttle_tag = "Virgo Flyer" - req_one_access = list(access_pilot) - -/obj/effect/overmap/visitable/ship/landable/ccboat - name = "NTV Virgo Flyer" - desc = "A small shuttle from Central Command." - vessel_mass = 1000 - vessel_size = SHIP_SIZE_TINY - shuttle = "Virgo Flyer" - known = TRUE - -// A shuttle lateloader landmark -/obj/effect/shuttle_landmark/shuttle_initializer/ccboat - name = "Central Command Shuttlepad" - base_area = /area/shuttle/centcom/ccbay - base_turf = /turf/simulated/floor/reinforced - landmark_tag = "cc_shuttlepad" - docking_controller = "cc_landing_pad" - shuttle_type = /datum/shuttle/autodock/overmap/ccboat - -/datum/shuttle/autodock/overmap/ccboat - name = "Virgo Flyer" - current_location = "cc_shuttlepad" - docking_controller_tag = "ccboat" - shuttle_area = /area/shuttle/ccboat - fuel_consumption = 0 - defer_initialisation = TRUE - -/area/shuttle/ccboat - icon = 'icons/turf/areas_vr.dmi' - icon_state = "yelwhitri" - name = "Virgo Flyer" - requires_power = 0 - -/area/shuttle/centcom/ccbay - icon = 'icons/turf/areas_vr.dmi' - icon_state = "bluwhisqu" - name = "Central Command Shuttle Bay" - requires_power = 0 - dynamic_lighting = 0 - -/////LANDING LANDMARKS///// -/obj/effect/shuttle_landmark/premade/sd/deck1/portairlock - name = "Near Deck 1 Port Airlock" - landmark_tag = "sd-1-23-54" -/obj/effect/shuttle_landmark/premade/sd/deck1/aft - name = "Near Deck 1 Aft" - landmark_tag = "sd-1-67-15" -/obj/effect/shuttle_landmark/premade/sd/deck1/fore - name = "Near Deck 1 Fore" - landmark_tag = "sd-1-70-130" -/obj/effect/shuttle_landmark/premade/sd/deck1/starboard - name = "Near Deck 1 Starboard" - landmark_tag = "sd-1-115-85" - -/obj/effect/shuttle_landmark/premade/sd/deck2/port - name = "Near Deck 2 Port" - landmark_tag = "sd-2-25-98" -/obj/effect/shuttle_landmark/premade/sd/deck2/starboard - name = "Near Deck 2 Starboard" - landmark_tag = "sd-2-117-98" - -/obj/effect/shuttle_landmark/premade/sd/deck3/portairlock - name = "Near Deck 3 Port Airlock" - landmark_tag = "sd-3-22-78" -/obj/effect/shuttle_landmark/premade/sd/deck3/portlanding - name = "Near Deck 3 Port Landing Pad" - landmark_tag = "sd-3-36-33" -/obj/effect/shuttle_landmark/premade/sd/deck3/starboardlanding - name = "Near Deck 3 Starboard Landing Pad" - landmark_tag = "sd-3-104-33" -/obj/effect/shuttle_landmark/premade/sd/deck3/starboardairlock - name = "Near Deck 3 Starboard Airlock" - landmark_tag = "sd-3-120-78" - -/obj/item/weapon/paper/dockingcodes/sd - name = "Stellar Delight Docking Codes" - codes_from_z = Z_LEVEL_SHIP_LOW - -/////FOR CENTCOMM (at least)///// -/obj/effect/overmap/visitable/sector/virgo3b - name = "Virgo 3B" - desc = "Full of phoron, and home to the NSB Adephagia." - scanner_desc = @{"[i]Registration[/i]: NSB Adephagia -[i]Class[/i]: Installation -[i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF -[b]Notice[/b]: NanoTrasen Base, authorized personnel only"} - known = TRUE - in_space = FALSE - - icon = 'icons/obj/overmap_vr.dmi' - icon_state = "virgo3b" - - skybox_icon = 'icons/skybox/virgo3b.dmi' - skybox_icon_state = "small" - skybox_pixel_x = 0 - skybox_pixel_y = 0 - - initial_restricted_waypoints = list("Central Command Shuttlepad" = list("cc_shuttlepad")) - -/////SD Starts at V3b to pick up crew refuel and repair (And to make sure it doesn't spawn on hazards) -/obj/effect/overmap/visitable/sector/virgo3b/Initialize() - . = ..() - for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in world) - sd.forceMove(loc, SOUTH) - return - -/obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM) - . = ..() - announce_atc(AM,going = FALSE) - -/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(var/atom/movable/AM) - . = ..() - announce_atc(AM,going = TRUE) - -/obj/effect/overmap/visitable/sector/virgo3b/proc/announce_atc(var/atom/movable/AM, var/going = FALSE) - var/message = "Sensor contact for vessel '[AM.name]' has [going ? "left" : "entered"] ATC control area." - //For landables, we need to see if their shuttle is cloaked - if(istype(AM, /obj/effect/overmap/visitable/ship/landable)) - var/obj/effect/overmap/visitable/ship/landable/SL = AM //Phew - var/datum/shuttle/autodock/multi/shuttle = SSshuttles.shuttles[SL.shuttle] - if(!istype(shuttle) || !shuttle.cloaked) //Not a multishuttle (the only kind that can cloak) or not cloaked - atc.msg(message) - - //For ships, it's safe to assume they're big enough to not be sneaky - else if(istype(AM, /obj/effect/overmap/visitable/ship)) - atc.msg(message) - -/obj/item/weapon/paper/sdshield - name = "ABOUT THE SHIELD GENERATOR" - info = "

ABOUT THE SHIELD GENERATOR



If you're up here you are more than likely worried about hitting rocks or some other such thing. It is good to worry about such things as that is an inevitability.

The Stellar Delight is a rather compact vessel, so a setting of 55 to the range will just barely cover her aft.

It is recommended that you turn off all of the different protection types except multi dimensional warp and whatever it is you're worried about running into. (probably meteors (hyperkinetic)).

With only those two and all the other default settings, the shield uses more than 6 MW to run, which is more than the ship can ordinarily produce. AS SUCH, it is also recommended that you reduce the input cap to whatever you find reasonable (being as it defaults to 1 MW, which is the entirety of the stock power supply) and activate and configure the shield BEFORE you need it.

The shield takes some time to expand its range to the desired specifications, and on top of that, under the default low power setting, takes around 40 seconds to spool up. Once it is active, the fully charged internal capacitors will last for around 1 to 2 minutes before depleting fully. You can increase the passive energy use to decrease the spool up time, but it also uses the stored energy much faster, so, that is not recommended except in dire emergencies.

So, this shield is not intended to be run indefinitely, unless you seriously beef up the ship's engine and power supply.

Fortunately, if you've got a good pilot, you shouldn't really need the shield generator except in rare cases and only for short distances. Still, it is a good idea to configure the shield to be ready before you need it.

Good luck out there - Budly Gregington" - -/obj/item/weapon/book/manual/sd_guide - name = "Stellar Delight User's Guide" - icon = 'icons/obj/library.dmi' - icon_state ="newscodex" - item_state = "newscodex" - author = "Central Command" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - title = "Stellar Delight User's Guide" - -/obj/item/weapon/book/manual/sd_guide/New() - ..() - dat = {" - - - - - -

Stellar Delight Operations

-

- Welcome to the Stellar Delight! Before you get started there are a few things you ought to know. -

- The Stellar Delight is a Nanotrasen response vessel operating in the Virgo-Erigone system. It's primary duty is in answering calls for help, investigating anomalies in space around the system, and generally responding to requests from Central Command or whoever else needs the services the vessel can provide. It has fully functioning security, medical, and research facilities, as well as a host of civillian facilities, in addition to the standard things one might expect to find on such a ship. That is to say, the ship doesn't have a highly defined specialization, it is just as capable as a small space station might be. -

- Notably though, there are some research facilities that are not safe to carry around. There is a refurbished Aerostat that has been set up over Virgo 2 that posesses a number of different, more dangerous research facilities. The command staff of this vessel has access to its docking codes in their offices. -

- Mining and Exploration will probably also want to disembark to do their respective duties. -

- The ship is ordinarily protected from many space hazards by an array of point defense turrets, however, it should be noted that this defense network is not infallible. If the ship encounters a dangerous environment, occasionally hazardous material may slip past the network and damage the ship. -


-

Before Moving the Ship

-

- The ship requires power to fuel and run its engines and sensors. While there may be some charge in the ship at the start of the shift, it is HIGHLY RECOMMENDED that the engine be started before attempting to move the ship. If any of the components responsible for moving the ship lose power (including but not limited to the helm control console and the thrusters), then you will be incapable of adjusting the ship's speed or heading until the problem is resolved. -

- Additionally, the shield generator should be configured before the ship moves, as it takes time to calibrate before it can be activated. The shield should not be run indefinitely however, as it uses more power than the ship ordinarily generates. You can however activate it for a short time if you know that you need to proceed through a dangerous reigon of space. For more information, see the configuration guide sheet in the shield control room on deck 3, aft of the Command Office section. -


-

Starting and Moving the Ship

-

- The ship can of course move around on its own, but a few steps need to/should be taken before you can do so. -

- -FIRST. You should appoint a pilot. If there isn't a pilot, or the pilot isn't responding, you should fax for a pilot. If no pilots respond to the fax within a reasonable timeframe, then, if you are qualified to fly Nanotrasen spacecraft you may fly the ship. Appointing a pilot to the bridge however should always be done even if you know how to fly and have access to the helm control console. Refusing to attempt to appoint a pilot and just flying the ship yourself can be grounds for demotion to pilot. -

- -SECOND. In order for the ship to move one must start the engines. The ship's fuel pump in Atmospherics must be turned on and configured. Atmospheric technicians may elect to modify the fuel mix to help the ship go faster or make the fuel last longer. Either way, once the fuel pump is on, you may use the engine control console on the bridge to activate the engines. -

- Once these steps have been taken, the helm control console should respond to input commands from the pilot. -


-

Disembarking

-

- Being a response vessel, the Stellar Delight has 3 shuttles in total. -

- The mining and exploration shuttles are located in the aft of deck 1 between their respective departments. Both of these shuttles are short jump shuttles, meaning, they are not suitable for more than ferrying people back and forth between the ship and the present destination. They do have a small range that they can traverse in their bluespace hops, but they must be within one 'grid square' of a suitable landing site to jump. As such, it is recommended that you avoid flying away from wherever either of these shuttles are without establishing a flight plan with the away teams to indicate a time of returning. In cases where the mining team and the exploration team want to go to different places, it may be necessary to fly from one location to the other now and then to facilitate both operations. However, it is recommended that exploration and mining be encouraged to enter the same operations areas, as the mining team is poorly armed, and the exploration team is ideally equipped for offsite defense and support of ship personnel. -

- There is also the Starstuff, a long range capable shuttle which is ordinarily docked on the port landing pad of deck 3. This shuttle is meant for general crew transport, but does require a pilot to be flown. -

- In cases where the shuttles will be docking with another facility, such as the Science outpost on the Virgo 2 Aerostat, docking codes may be required in order to be accessed. Anywhere requiring such codes will need to have them entered into the given shuttle's short jump console. It is recommended that anyone operating such a shuttle take note of the Stellar Delight's docking codes, as they will need them to dock with the ship. Any Nanotrasen owned facility that requires them that your ship has authorization to access will have the codes stored in the Command Offices. -

- A final note on disembarking. While it may not necessarily be their job to do so, it is highly encouraged for the Command staff to attempt to involve volunteers in off ship operations as necessary. Just make sure to let let it be known what kind of operation is happening when you ask. This being a response ship, it is very good to get as much help to handle whatever the issue is as thoroughly as possible. -

- All that said, have a safe trip. - Central Command Officer Alyssa Trems - - "} - -//The pathfinder doesn't have a OM shuttle that they are in charge of, and so, doesn't need pilot access. -//Mostly to prevent explo from just commandeering the Starstuff as the explo shuttle without involving a pilot every round. -/datum/job/pathfinder - access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_explorer, access_gateway, access_pathfinder) - minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_explorer, access_gateway, access_pathfinder) - -//Same as above, to discorage explo from taking off with the small ship without asking, SAR should not need pilot access. -/datum/job/sar - access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks) - minimal_access = list(access_medical, access_medical_equip, access_morgue) \ No newline at end of file diff --git a/maps/stellardelight/stellar_delight_jobs.dm b/maps/stellardelight/stellar_delight_jobs.dm new file mode 100644 index 0000000000..2541edfd9c --- /dev/null +++ b/maps/stellardelight/stellar_delight_jobs.dm @@ -0,0 +1,30 @@ +//The pathfinder doesn't have a OM shuttle that they are in charge of, and so, doesn't need pilot access. +//Mostly to prevent explo from just commandeering the Starstuff as the explo shuttle without involving a pilot every round. +/datum/job/pathfinder + access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_explorer, access_gateway, access_pathfinder) + minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_explorer, access_gateway, access_pathfinder) + +//Same as above, to discorage explo from taking off with the small ship without asking, SAR should not need pilot access. +/datum/job/sar + access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks) + minimal_access = list(access_medical, access_medical_equip, access_morgue) + +/datum/job/hop + alt_titles = list("Crew Resources Officer" = /datum/alt_title/cro, "Deputy Manager" = /datum/alt_title/deputy_manager, "Staff Manager" = /datum/alt_title/staff_manager, + "Facility Steward" = /datum/alt_title/facility_steward, "First Mate" = /datum/alt_title/first_mate) + +/datum/alt_title/first_mate + title = "First Mate" + +/datum/job/atmos + alt_titles = list("Atmospheric Engineer" = /datum/alt_title/atmos_engi, "Atmospheric Maintainer" = /datum/alt_title/atmos_maint, "Disposals Technician" = /datum/alt_title/disposals_tech, + "Fuel Technician" = /datum/alt_title/refuel_tech) + +/datum/alt_title/refuel_tech + title = "Fuel Technician" + +/datum/job/warden + alt_titles = list("Brig Sentry" = /datum/alt_title/brig_sentry, "Armory Superintendent" = /datum/alt_title/armory_superintendent, "Master-at-Arms" = /datum/alt_title/master_at_arms) + +/datum/alt_title/master_at_arms + title = "Master-at-Arms" \ No newline at end of file diff --git a/maps/stellardelight/stellar_delight_misc.dm b/maps/stellardelight/stellar_delight_misc.dm deleted file mode 100644 index 064f2e73d6..0000000000 --- a/maps/stellardelight/stellar_delight_misc.dm +++ /dev/null @@ -1,133 +0,0 @@ -/////////////////////////////////////////////////////////// -/////Misc stuff from the tether that's likely to get used in one way or another!/////` - -/obj/effect/landmark/arrivals - name = "JoinLateShuttle" - delete_me = 1 - -/obj/effect/landmark/arrivals/New() - latejoin += loc - ..() - -var/global/list/latejoin_tram = list() - -/obj/effect/landmark/tram - name = "JoinLateTram" - delete_me = 1 - -/obj/effect/landmark/tram/New() - latejoin_tram += loc // There's no tram but you know whatever man! - ..() - -/datum/spawnpoint/tram - display_name = "Tram Station" - msg = "will arrive to the station shortly by shuttle" - -/datum/spawnpoint/tram/New() - ..() - turfs = latejoin_tram - -/obj/machinery/camera/network/halls - network = list(NETWORK_HALLS) - -/obj/machinery/camera/network/exploration - network = list(NETWORK_EXPLORATION) - -/obj/machinery/camera/network/research/xenobio - network = list(NETWORK_RESEARCH, NETWORK_XENOBIO) - -/obj/machinery/computer/security/xenobio - name = "xenobiology camera monitor" - desc = "Used to access the xenobiology cell cameras." - icon_keyboard = "mining_key" - icon_screen = "mining" - network = list(NETWORK_XENOBIO) - circuit = /obj/item/weapon/circuitboard/security/xenobio - light_color = "#F9BBFC" - -/obj/item/weapon/circuitboard/security/xenobio - name = T_BOARD("xenobiology camera monitor") - build_path = /obj/machinery/computer/security/xenobio - network = list(NETWORK_XENOBIO) - req_access = list() - -/obj/machinery/vending/wallmed1/public - products = list(/obj/item/stack/medical/bruise_pack = 8,/obj/item/stack/medical/ointment = 8,/obj/item/weapon/reagent_containers/hypospray/autoinjector = 16,/obj/item/device/healthanalyzer = 4) - -/turf/unsimulated/mineral/virgo3b - blocks_air = TRUE - -/area/tether/surfacebase/tram - name = "\improper Tram Station" - icon_state = "dk_yellow" - -/turf/simulated/floor/maglev - name = "maglev track" - desc = "Magnetic levitation tram tracks. Caution! Electrified!" - icon = 'icons/turf/flooring/maglevs.dmi' - icon_state = "maglevup" - - var/area/shock_area = /area/tether/surfacebase/tram - -/turf/simulated/floor/maglev/Initialize() - . = ..() - shock_area = locate(shock_area) - -// Walking on maglev tracks will shock you! Horray! -/turf/simulated/floor/maglev/Entered(var/atom/movable/AM, var/atom/old_loc) - if(isliving(AM) && !(AM.is_incorporeal()) && prob(50)) - track_zap(AM) -/turf/simulated/floor/maglev/attack_hand(var/mob/user) - if(prob(75)) - track_zap(user) -/turf/simulated/floor/maglev/proc/track_zap(var/mob/living/user) - if (!istype(user)) return - if (electrocute_mob(user, shock_area, src)) - var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread - s.set_up(5, 1, src) - s.start() - -/turf/unsimulated/floor/steel - icon = 'icons/turf/flooring/tiles_vr.dmi' - icon_state = "steel" - -// Some turfs to make floors look better in centcom tram station. - -/turf/unsimulated/floor/techfloor_grid - name = "floor" - icon = 'icons/turf/flooring/techfloor.dmi' - icon_state = "techfloor_grid" - -/turf/unsimulated/floor/maglev - name = "maglev track" - desc = "Magnetic levitation tram tracks. Caution! Electrified!" - icon = 'icons/turf/flooring/maglevs.dmi' - icon_state = "maglevup" - -/turf/unsimulated/wall/transit - icon = 'icons/turf/transit_vr.dmi' - -/turf/unsimulated/floor/transit - icon = 'icons/turf/transit_vr.dmi' - -/obj/effect/floor_decal/transit/orange - icon = 'icons/turf/transit_vr.dmi' - icon_state = "transit_techfloororange_edges" - -/obj/effect/transit/light - icon = 'icons/turf/transit_128.dmi' - icon_state = "tube1-2" - -VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/grass/sif) -/turf/simulated/floor/outdoors/grass/sif - turf_layers = list( - /turf/simulated/floor/outdoors/rocks/virgo3b, - /turf/simulated/floor/outdoors/dirt/virgo3b - ) - -VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/dirt) -/turf/simulated/floor/outdoors/dirt/virgo3b - icon = 'icons/turf/flooring/asteroid.dmi' - icon_state = "asteroid" - -VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) diff --git a/maps/stellardelight/stellar_delight_shuttle_defs.dm b/maps/stellardelight/stellar_delight_shuttle_defs.dm new file mode 100644 index 0000000000..e83c05be9e --- /dev/null +++ b/maps/stellardelight/stellar_delight_shuttle_defs.dm @@ -0,0 +1,287 @@ +////////////////SHUTTLE TIME/////////////////// + +////////////////////////////////////////////////////////////// +// Escape shuttle and pods +/datum/shuttle/autodock/ferry/emergency/escape + name = "Escape" + location = FERRY_LOCATION_OFFSITE + shuttle_area = /area/shuttle/escape + warmup_time = 10 + landmark_offsite = "escape_cc" + landmark_station = "escape_station" + landmark_transition = "escape_transit" + move_time = SHUTTLE_TRANSIT_DURATION_RETURN + move_direction = SOUTH + docking_controller_tag = "escape_shuttle" + +/datum/shuttle/autodock/ferry/escape_pod/portescape + name = "Port Escape Pod" + location = FERRY_LOCATION_STATION + shuttle_area = /area/stellardelight/deck2/portescape + warmup_time = 0 + landmark_station = "port_ship_berth" + landmark_offsite = "port_escape_cc" + landmark_transition = "port_escape_transit" + docking_controller_tag = "port_escape_pod" + move_time = SHUTTLE_TRANSIT_DURATION_RETURN + move_direction = EAST + +/datum/shuttle/autodock/ferry/escape_pod/starboardescape + name = "Starboard Escape Pod" + location = FERRY_LOCATION_STATION + shuttle_area = /area/stellardelight/deck2/starboardescape + warmup_time = 0 + landmark_station = "starboard_ship_berth" + landmark_offsite = "starboard_escape_cc" + landmark_transition = "starboard_escape_transit" + docking_controller_tag = "starboard_escape_pod" + move_time = SHUTTLE_TRANSIT_DURATION_RETURN + move_direction = WEST + + +////////////////////////////////////////////////////////////// +// Supply shuttle +/datum/shuttle/autodock/ferry/supply/cargo + name = "Supply" + location = FERRY_LOCATION_OFFSITE + shuttle_area = /area/shuttle/supply + warmup_time = 10 + landmark_offsite = "supply_cc" + landmark_station = "supply_station" + docking_controller_tag = "supply_shuttle" + flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY + move_direction = WEST + +/////EXPLORATION SHUTTLE +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/stellardelight/exploration + name = "boat control console" + shuttle_tag = "Exploration Shuttle" + req_one_access = null + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/exploration + name = "Exploration Shuttle Landing Pad" + base_area = /area/stellardelight/deck1/shuttlebay + base_turf = /turf/simulated/floor/reinforced + landmark_tag = "sd_explo" + docking_controller = "explodocker_bay" + shuttle_type = /datum/shuttle/autodock/overmap/exboat + +// The 'shuttle' +/datum/shuttle/autodock/overmap/exboat + name = "Exploration Shuttle" + current_location = "sd_explo" + docking_controller_tag = "explodocker" + shuttle_area = /area/stellardelight/deck1/exploshuttle + fuel_consumption = 0 + defer_initialisation = TRUE + range = 1 + +/////MINING SHUTTLE +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/stellardelight/mining + name = "boat control console" + shuttle_tag = "Mining Shuttle" + req_one_access = null + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/mining + name = "Mining Shuttle Landing Pad" + base_area = /area/stellardelight/deck1/shuttlebay + base_turf = /turf/simulated/floor/reinforced + landmark_tag = "sd_mining" + docking_controller = "miningdocker_bay" + shuttle_type = /datum/shuttle/autodock/overmap/mineboat + +// The 'shuttle' +/datum/shuttle/autodock/overmap/mineboat + name = "Mining Shuttle" + current_location = "sd_mining" + docking_controller_tag = "miningdocker" + shuttle_area = /area/stellardelight/deck1/miningshuttle + fuel_consumption = 0 + defer_initialisation = TRUE + range = 1 + +/////STARSTUFF///// +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/sdboat + name = "Starstuff control console" + shuttle_tag = "Starstuff" + req_one_access = list(access_pilot) + +/obj/effect/overmap/visitable/ship/landable/sd_boat + name = "NTV Starstuff" + desc = "A small shuttle from the NRV Stellar Delight." + vessel_mass = 2500 + vessel_size = SHIP_SIZE_TINY + shuttle = "Starstuff" + known = TRUE + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/sdboat + name = "Port Shuttlepad" + base_area = /area/stellardelight/deck3/exterior + base_turf = /turf/simulated/floor/reinforced/airless + landmark_tag = "port_shuttlepad" + docking_controller = "sd_port_landing" + shuttle_type = /datum/shuttle/autodock/overmap/sdboat + +/datum/shuttle/autodock/overmap/sdboat + name = "Starstuff" + current_location = "port_shuttlepad" + docking_controller_tag = "sdboat_docker" + shuttle_area = list(/area/shuttle/sdboat/fore,/area/shuttle/sdboat/aft) + fuel_consumption = 1 + defer_initialisation = TRUE + +/area/shuttle/sdboat/fore + icon = 'icons/turf/areas_vr.dmi' + icon_state = "yelwhitri" + name = "Starstuff Cockpit" + requires_power = 1 + +/area/shuttle/sdboat/aft + icon = 'icons/turf/areas_vr.dmi' + icon_state = "yelwhitri" + name = "Starstuff Crew Compartment" + requires_power = 1 + +/////Virgo Flyer///// +// The shuttle's 'shuttle' computer +/obj/machinery/computer/shuttle_control/explore/ccboat + name = "Virgo Flyer control console" + shuttle_tag = "Virgo Flyer" + req_one_access = list(access_pilot) + +/obj/effect/overmap/visitable/ship/landable/ccboat + name = "NTV Virgo Flyer" + desc = "A small shuttle from Central Command." + vessel_mass = 1000 + vessel_size = SHIP_SIZE_TINY + shuttle = "Virgo Flyer" + known = TRUE + +// A shuttle lateloader landmark +/obj/effect/shuttle_landmark/shuttle_initializer/ccboat + name = "Central Command Shuttlepad" + base_area = /area/shuttle/centcom/ccbay + base_turf = /turf/simulated/floor/reinforced + landmark_tag = "cc_shuttlepad" + docking_controller = "cc_landing_pad" + shuttle_type = /datum/shuttle/autodock/overmap/ccboat + +/datum/shuttle/autodock/overmap/ccboat + name = "Virgo Flyer" + current_location = "cc_shuttlepad" + docking_controller_tag = "ccboat" + shuttle_area = /area/shuttle/ccboat + fuel_consumption = 0 + defer_initialisation = TRUE + +/area/shuttle/ccboat + icon = 'icons/turf/areas_vr.dmi' + icon_state = "yelwhitri" + name = "Virgo Flyer" + requires_power = 0 + +/area/shuttle/centcom/ccbay + icon = 'icons/turf/areas_vr.dmi' + icon_state = "bluwhisqu" + name = "Central Command Shuttle Bay" + requires_power = 0 + dynamic_lighting = 0 + +/////LANDING LANDMARKS///// +/obj/effect/shuttle_landmark/premade/sd/deck1/portairlock + name = "Near Deck 1 Port Airlock" + landmark_tag = "sd-1-23-54" +/obj/effect/shuttle_landmark/premade/sd/deck1/aft + name = "Near Deck 1 Aft" + landmark_tag = "sd-1-67-15" +/obj/effect/shuttle_landmark/premade/sd/deck1/fore + name = "Near Deck 1 Fore" + landmark_tag = "sd-1-70-130" +/obj/effect/shuttle_landmark/premade/sd/deck1/starboard + name = "Near Deck 1 Starboard" + landmark_tag = "sd-1-115-85" + +/obj/effect/shuttle_landmark/premade/sd/deck2/port + name = "Near Deck 2 Port" + landmark_tag = "sd-2-25-98" +/obj/effect/shuttle_landmark/premade/sd/deck2/starboard + name = "Near Deck 2 Starboard" + landmark_tag = "sd-2-117-98" + +/obj/effect/shuttle_landmark/premade/sd/deck3/portairlock + name = "Near Deck 3 Port Airlock" + landmark_tag = "sd-3-22-78" +/obj/effect/shuttle_landmark/premade/sd/deck3/portlanding + name = "Near Deck 3 Port Landing Pad" + landmark_tag = "sd-3-36-33" +/obj/effect/shuttle_landmark/premade/sd/deck3/starboardlanding + name = "Near Deck 3 Starboard Landing Pad" + landmark_tag = "sd-3-104-33" +/obj/effect/shuttle_landmark/premade/sd/deck3/starboardairlock + name = "Near Deck 3 Starboard Airlock" + landmark_tag = "sd-3-120-78" + +/obj/item/weapon/paper/dockingcodes/sd + name = "Stellar Delight Docking Codes" + codes_from_z = Z_LEVEL_SHIP_LOW + +/////FOR CENTCOMM (at least)///// +/obj/effect/overmap/visitable/sector/virgo3b + name = "Virgo 3B" + desc = "Full of phoron, and home to the NSB Adephagia." + scanner_desc = @{"[i]Registration[/i]: NSB Adephagia +[i]Class[/i]: Installation +[i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF +[b]Notice[/b]: NanoTrasen Base, authorized personnel only"} + known = TRUE + in_space = TRUE + + icon = 'icons/obj/overmap_vr.dmi' + icon_state = "virgo3b" + + skybox_icon = 'icons/skybox/virgo3b.dmi' + skybox_icon_state = "small" + skybox_pixel_x = 0 + skybox_pixel_y = 0 + + initial_generic_waypoints = list("sr-c","sr-n","sr-s") + initial_restricted_waypoints = list("Central Command Shuttlepad" = list("cc_shuttlepad")) + + extra_z_levels = list(Z_LEVEL_SPACE_ROCKS) + +/////SD Starts at V3b to pick up crew refuel and repair (And to make sure it doesn't spawn on hazards) +/obj/effect/overmap/visitable/sector/virgo3b/Initialize() + . = ..() + for(var/obj/effect/overmap/visitable/ship/stellar_delight/sd in world) + sd.forceMove(loc, SOUTH) + return + +/obj/effect/overmap/visitable/sector/virgo3b/Crossed(var/atom/movable/AM) + . = ..() + announce_atc(AM,going = FALSE) + +/obj/effect/overmap/visitable/sector/virgo3b/Uncrossed(var/atom/movable/AM) + . = ..() + announce_atc(AM,going = TRUE) + +/obj/effect/overmap/visitable/sector/virgo3b/proc/announce_atc(var/atom/movable/AM, var/going = FALSE) + var/message = "Sensor contact for vessel '[AM.name]' has [going ? "left" : "entered"] ATC control area." + //For landables, we need to see if their shuttle is cloaked + if(istype(AM, /obj/effect/overmap/visitable/ship/landable)) + var/obj/effect/overmap/visitable/ship/landable/SL = AM //Phew + var/datum/shuttle/autodock/multi/shuttle = SSshuttles.shuttles[SL.shuttle] + if(!istype(shuttle) || !shuttle.cloaked) //Not a multishuttle (the only kind that can cloak) or not cloaked + atc.msg(message) + + //For ships, it's safe to assume they're big enough to not be sneaky + else if(istype(AM, /obj/effect/overmap/visitable/ship)) + atc.msg(message) + +/obj/effect/overmap/visitable/sector/virgo3b/get_space_zlevels() + return list(Z_LEVEL_SPACE_ROCKS) diff --git a/maps/stellardelight/stellar_delight_telecomms.dm b/maps/stellardelight/stellar_delight_telecomms.dm index c1d35782a7..7ddefa3365 100644 --- a/maps/stellardelight/stellar_delight_telecomms.dm +++ b/maps/stellardelight/stellar_delight_telecomms.dm @@ -3,8 +3,9 @@ // #### Relays #### // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. -/obj/machinery/telecomms/relay/preset/sd +/obj/machinery/telecomms/relay/preset/station id = "SD Relay" + listening_level = 9 autolinkers = list("sd_relay") // #### Hub #### diff --git a/maps/stellardelight/stellar_delight_things.dm b/maps/stellardelight/stellar_delight_things.dm new file mode 100644 index 0000000000..90c50ddf4f --- /dev/null +++ b/maps/stellardelight/stellar_delight_things.dm @@ -0,0 +1,176 @@ +/obj/machinery/camera/network/halls + network = list(NETWORK_HALLS) + +/area/tether/surfacebase/tram + name = "\improper Tram Station" + icon_state = "dk_yellow" + +/turf/simulated/floor/maglev + name = "maglev track" + desc = "Magnetic levitation tram tracks. Caution! Electrified!" + icon = 'icons/turf/flooring/maglevs.dmi' + icon_state = "maglevup" + + var/area/shock_area = /area/tether/surfacebase/tram + +/turf/simulated/floor/maglev/Initialize() + . = ..() + shock_area = locate(shock_area) + +// Walking on maglev tracks will shock you! Horray! +/turf/simulated/floor/maglev/Entered(var/atom/movable/AM, var/atom/old_loc) + if(isliving(AM) && !(AM.is_incorporeal()) && prob(50)) + track_zap(AM) +/turf/simulated/floor/maglev/attack_hand(var/mob/user) + if(prob(75)) + track_zap(user) +/turf/simulated/floor/maglev/proc/track_zap(var/mob/living/user) + if (!istype(user)) return + if (electrocute_mob(user, shock_area, src)) + var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread + s.set_up(5, 1, src) + s.start() + + +/obj/item/weapon/paper/sdshield + name = "ABOUT THE SHIELD GENERATOR" + info = "

ABOUT THE SHIELD GENERATOR



If you're up here you are more than likely worried about hitting rocks or some other such thing. It is good to worry about such things as that is an inevitability.

The Stellar Delight is a rather compact vessel, so a setting of 55 to the range will just barely cover her aft.

It is recommended that you turn off all of the different protection types except multi dimensional warp and whatever it is you're worried about running into. (probably meteors (hyperkinetic)).

With only those two and all the other default settings, the shield uses more than 6 MW to run, which is more than the ship can ordinarily produce. AS SUCH, it is also recommended that you reduce the input cap to whatever you find reasonable (being as it defaults to 1 MW, which is the entirety of the stock power supply) and activate and configure the shield BEFORE you need it.

The shield takes some time to expand its range to the desired specifications, and on top of that, under the default low power setting, takes around 40 seconds to spool up. Once it is active, the fully charged internal capacitors will last for a few minutes before depleting fully. You can increase the passive energy use to decrease the spool up time, but it also uses the stored energy much faster, so, that is not recommended except in dire emergencies.

So, this shield is not intended to be run indefinitely, unless you seriously beef up the ship's engine and power supply.

Fortunately, if you've got a good pilot, you shouldn't really need the shield generator except in rare cases and only for short distances. Still, it is a good idea to configure the shield to be ready before you need it.

Good luck out there - Budly Gregington" + +/obj/item/weapon/book/manual/sd_guide + name = "Stellar Delight User's Guide" + icon = 'icons/obj/library.dmi' + icon_state ="newscodex" + item_state = "newscodex" + author = "Central Command" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + title = "Stellar Delight User's Guide" + +/obj/item/weapon/book/manual/sd_guide/New() + ..() + dat = {" + + + + + +

Stellar Delight Operations

+

+ Welcome to the Stellar Delight! Before you get started there are a few things you ought to know. +

+ The Stellar Delight is a Nanotrasen response vessel operating in the Virgo-Erigone system. It's primary duty is in answering calls for help, investigating anomalies in space around the system, and generally responding to requests from Central Command or whoever else needs the services the vessel can provide. It has fully functioning security, medical, and research facilities, as well as a host of civillian facilities, in addition to the standard things one might expect to find on such a ship. That is to say, the ship doesn't have a highly defined specialization, it is just as capable as a small space station might be. +

+ Notably though, there are some research facilities that are not safe to carry around. There is a refurbished Aerostat that has been set up over Virgo 2 that posesses a number of different, more dangerous research facilities. The command staff of this vessel has access to its docking codes in their offices. +

+ Mining and Exploration will probably also want to disembark to do their respective duties. +

+ The ship is ordinarily protected from many space hazards by an array of point defense turrets, however, it should be noted that this defense network is not infallible. If the ship encounters a dangerous environment, occasionally hazardous material may slip past the network and damage the ship. +


+

Before Moving the Ship

+

+ The ship requires power to fuel and run its engines and sensors. While there may be some charge in the ship at the start of the shift, it is HIGHLY RECOMMENDED that the engine be started before attempting to move the ship. If any of the components responsible for moving the ship lose power (including but not limited to the helm control console and the thrusters), then you will be incapable of adjusting the ship's speed or heading until the problem is resolved. +

+ Additionally, the shield generator should be configured before the ship moves, as it takes time to calibrate before it can be activated. The shield should not be run indefinitely however, as it uses more power than the ship ordinarily generates. You can however activate it for a short time if you know that you need to proceed through a dangerous reigon of space. For more information, see the configuration guide sheet in the shield control room on deck 3, aft of the Command Office section. +


+

Starting and Moving the Ship

+

+ The ship can of course move around on its own, but a few steps need to/should be taken before you can do so. +

+ -FIRST. You should appoint a pilot. If there isn't a pilot, or the pilot isn't responding, you should fax for a pilot. If no pilots respond to the fax within a reasonable timeframe, then, if you are qualified to fly Nanotrasen spacecraft you may fly the ship. Appointing a pilot to the bridge however should always be done even if you know how to fly and have access to the helm control console. Refusing to attempt to appoint a pilot and just flying the ship yourself can be grounds for demotion to pilot. +

+ -SECOND. In order for the ship to move one must start the engines. The ship's fuel pump in Atmospherics must be turned on and configured. Atmospheric technicians may elect to modify the fuel mix to help the ship go faster or make the fuel last longer. Either way, once the fuel pump is on, you may use the engine control console on the bridge to activate the engines. +

+ Once these steps have been taken, the helm control console should respond to input commands from the pilot. +


+

Disembarking

+

+ Being a response vessel, the Stellar Delight has 3 shuttles in total. +

+ The mining and exploration shuttles are located in the aft of deck 1 between their respective departments. Both of these shuttles are short jump shuttles, meaning, they are not suitable for more than ferrying people back and forth between the ship and the present destination. They do have a small range that they can traverse in their bluespace hops, but they must be within one 'grid square' of a suitable landing site to jump. As such, it is recommended that you avoid flying away from wherever either of these shuttles are without establishing a flight plan with the away teams to indicate a time of returning. In cases where the mining team and the exploration team want to go to different places, it may be necessary to fly from one location to the other now and then to facilitate both operations. However, it is recommended that exploration and mining be encouraged to enter the same operations areas, as the mining team is poorly armed, and the exploration team is ideally equipped for offsite defense and support of ship personnel. +

+ There is also the Starstuff, a long range capable shuttle which is ordinarily docked on the port landing pad of deck 3. This shuttle is meant for general crew transport, but does require a pilot to be flown. +

+ In cases where the shuttles will be docking with another facility, such as the Science outpost on the Virgo 2 Aerostat, docking codes may be required in order to be accessed. Anywhere requiring such codes will need to have them entered into the given shuttle's short jump console. It is recommended that anyone operating such a shuttle take note of the Stellar Delight's docking codes, as they will need them to dock with the ship. Any Nanotrasen owned facility that requires them that your ship has authorization to access will have the codes stored in the Command Offices. +

+ A final note on disembarking. While it may not necessarily be their job to do so, it is highly encouraged for the Command staff to attempt to involve volunteers in off ship operations as necessary. Just make sure to let let it be known what kind of operation is happening when you ask. This being a response ship, it is very good to get as much help to handle whatever the issue is as thoroughly as possible. +

+ All that said, have a safe trip. - Central Command Officer Alyssa Trems + + "} + +// ### Wall Machines On Full Windows ### +// To make sure wall-mounted machines placed on full-tile windows are clickable they must be above the window +// +/obj/item/device/radio/intercom + layer = ABOVE_WINDOW_LAYER +/obj/item/weapon/storage/secure/safe + layer = ABOVE_WINDOW_LAYER +/obj/machinery/airlock_sensor + layer = ABOVE_WINDOW_LAYER +/obj/machinery/alarm + layer = ABOVE_WINDOW_LAYER +/obj/machinery/button + layer = ABOVE_WINDOW_LAYER +/obj/machinery/access_button + layer = ABOVE_WINDOW_LAYER +/obj/machinery/computer/guestpass + layer = ABOVE_WINDOW_LAYER +/obj/machinery/computer/security/telescreen + layer = ABOVE_WINDOW_LAYER +/obj/machinery/door_timer + layer = ABOVE_WINDOW_LAYER +/obj/machinery/embedded_controller + layer = ABOVE_WINDOW_LAYER +/obj/machinery/firealarm + layer = ABOVE_WINDOW_LAYER +/obj/machinery/flasher + layer = ABOVE_WINDOW_LAYER +/obj/machinery/keycard_auth + layer = ABOVE_WINDOW_LAYER +/obj/machinery/light_switch + layer = ABOVE_WINDOW_LAYER +/obj/machinery/mineral/processing_unit_console + layer = ABOVE_WINDOW_LAYER +/obj/machinery/mineral/stacking_unit_console + layer = ABOVE_WINDOW_LAYER +/obj/machinery/newscaster + layer = ABOVE_WINDOW_LAYER +/obj/machinery/power/apc + layer = ABOVE_WINDOW_LAYER +/obj/machinery/requests_console + layer = ABOVE_WINDOW_LAYER +/obj/machinery/status_display + layer = ABOVE_WINDOW_LAYER +/obj/machinery/vending/wallmed1 + layer = ABOVE_WINDOW_LAYER +/obj/machinery/vending/wallmed2 + layer = ABOVE_WINDOW_LAYER +/obj/structure/closet/fireaxecabinet + layer = ABOVE_WINDOW_LAYER +/obj/structure/extinguisher_cabinet + layer = ABOVE_WINDOW_LAYER +/obj/structure/mirror + layer = ABOVE_WINDOW_LAYER +/obj/structure/noticeboard + layer = ABOVE_WINDOW_LAYER + +/obj/item/device/multitool/scioutpost + name = "science outpost linked multitool" + desc = "It has the data for the science outpost's quantum pad pre-loaded... assuming you didn't override it." + +/obj/item/device/multitool/scioutpost/Initialize() + . = ..() + for(var/obj/machinery/power/quantumpad/scioutpost/outpost in world) + connectable = outpost + if(connectable) + icon_state = "multitool_red" + return + +/obj/machinery/power/quantumpad/scioutpost + diff --git a/maps/stellardelight/stellar_delight_turfs.dm b/maps/stellardelight/stellar_delight_turfs.dm new file mode 100644 index 0000000000..9e7927efe2 --- /dev/null +++ b/maps/stellardelight/stellar_delight_turfs.dm @@ -0,0 +1,47 @@ +/turf/unsimulated/mineral/virgo3b + blocks_air = TRUE + +/turf/unsimulated/floor/steel + icon = 'icons/turf/flooring/tiles_vr.dmi' + icon_state = "steel" + +// Some turfs to make floors look better in centcom tram station. + +/turf/unsimulated/floor/techfloor_grid + name = "floor" + icon = 'icons/turf/flooring/techfloor.dmi' + icon_state = "techfloor_grid" + +/turf/unsimulated/floor/maglev + name = "maglev track" + desc = "Magnetic levitation tram tracks. Caution! Electrified!" + icon = 'icons/turf/flooring/maglevs.dmi' + icon_state = "maglevup" + +/turf/unsimulated/wall/transit + icon = 'icons/turf/transit_vr.dmi' + +/turf/unsimulated/floor/transit + icon = 'icons/turf/transit_vr.dmi' + +/obj/effect/floor_decal/transit/orange + icon = 'icons/turf/transit_vr.dmi' + icon_state = "transit_techfloororange_edges" + +/obj/effect/transit/light + icon = 'icons/turf/transit_128.dmi' + icon_state = "tube1-2" + +VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/grass/sif) +/turf/simulated/floor/outdoors/grass/sif + turf_layers = list( + /turf/simulated/floor/outdoors/rocks/virgo3b, + /turf/simulated/floor/outdoors/dirt/virgo3b + ) + +VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/dirt) +/turf/simulated/floor/outdoors/dirt/virgo3b + icon = 'icons/turf/flooring/asteroid.dmi' + icon_state = "asteroid" + +VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) diff --git a/maps/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index 2e1eb62ece..5660e5c1e5 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -132,7 +132,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "aq" = ( -/obj/machinery/telecomms/relay/preset/tether, +/obj/machinery/telecomms/relay, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/atmos) "ar" = ( @@ -168,6 +168,37 @@ }, /turf/simulated/floor/wood, /area/ship/ert/commander) +"au" = ( +/obj/machinery/light/no_nightshift{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack/steel, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/weapon/rig/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/obj/item/clothing/head/helmet/ert/medical, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "av" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/cable/yellow{ @@ -177,12 +208,152 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/gunnery) +"aw" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "ax" = ( /obj/structure/hull_corner{ dir = 8 }, /turf/simulated/shuttle/plating/airless/carry, /area/shuttle/ert_ship_boat) +"ay" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/obj/item/clothing/shoes/magboots/adv, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"az" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = -3 + }, +/obj/item/weapon/storage/backpack/ert/security, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 3 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 9 + }, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 12 + }, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"aA" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/weapon/rig/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/obj/item/clothing/head/helmet/ert/security, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"aB" = ( +/obj/effect/floor_decal/industrial/outline/grey, +/obj/structure/table/rack/steel, +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = -2 + }, +/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = 6 + }, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double, +/obj/item/weapon/storage/belt/utility/holding, +/obj/item/weapon/storage/belt/utility/holding, +/obj/item/weapon/storage/belt/utility/holding, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "aC" = ( /obj/machinery/power/pointdefense{ id_tag = "vonbraun_pd" @@ -203,10 +374,104 @@ /obj/fiftyspawner/tritium, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) +"aE" = ( +/obj/machinery/alarm/alarms_hidden{ + dir = 1; + pixel_y = -26 + }, +/obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/weapon/rig/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/suit/armor/vest/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "aF" = ( /obj/machinery/porta_turret/stationary/CIWS, /turf/simulated/floor/reinforced/airless, /area/ship/ert/atmos) +"aG" = ( +/obj/structure/table/rack/steel, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = -3 + }, +/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 3 + }, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/machinery/light/no_nightshift, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 9 + }, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 12 + }, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) +"aH" = ( +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = -2 + }, +/obj/item/weapon/storage/belt/medical/emt, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/medical/emt{ + pixel_y = 6 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = -2 + }, +/obj/item/clothing/accessory/storage/white_vest, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/white_vest{ + pixel_y = 6 + }, +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/storage/belt/medical/holding, +/obj/item/weapon/storage/belt/medical/holding, +/obj/item/weapon/storage/belt/medical/holding, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/barracks) "aI" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -226,6 +491,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) +"aJ" = ( +/obj/item/device/multitool/tether_buffered, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/atmos) "aK" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -316,19 +585,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/airless, /area/ship/ert/gunnery) -"bI" = ( -/obj/machinery/light/no_nightshift{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/table/rack/steel, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "bJ" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8 @@ -530,32 +786,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) -"do" = ( -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/clothing/mask/gas{ - pixel_x = -4; - pixel_y = -4 - }, -/obj/item/clothing/mask/gas{ - pixel_x = -2; - pixel_y = -2 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = 2; - pixel_y = 2 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 6; - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "dp" = ( /obj/structure/table/rack/steel, /obj/item/weapon/rig/ert/assetprotection{ @@ -1060,43 +1290,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) -"fJ" = ( -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = -4 - }, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = -2 - }, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = 2 - }, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = 4 - }, -/obj/item/weapon/storage/belt/medical/emt{ - pixel_y = 6 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = -4 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = -2 - }, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = 2 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = 4 - }, -/obj/item/clothing/accessory/storage/white_vest{ - pixel_y = 6 - }, -/obj/structure/table/rack/steel, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "fP" = ( /obj/structure/table/steel_reinforced, /obj/item/rig_module/chem_dispenser/combat, @@ -2658,30 +2851,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) -"pa" = ( -/obj/structure/table/steel_reinforced, -/obj/item/device/mapping_unit/ert{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/device/mapping_unit/ert{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/device/mapping_unit/ert{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/device/mapping_unit/ert{ - pixel_x = 6; - pixel_y = -6 - }, -/obj/machinery/alarm/alarms_hidden{ - dir = 1; - pixel_y = -26 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "pb" = ( /obj/structure/medical_stand, /obj/structure/sink{ @@ -2691,28 +2860,6 @@ }, /turf/simulated/floor/tiled/white, /area/ship/ert/med_surg) -"pd" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = -3 - }, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 3 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/machinery/light/no_nightshift, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 6 - }, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 9 - }, -/obj/item/weapon/storage/backpack/ert/medical{ - pixel_y = 12 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "pf" = ( /obj/effect/landmark/map_data/ert_ship, /turf/space, @@ -2729,25 +2876,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/med) -"pn" = ( -/obj/effect/floor_decal/industrial/outline/grey, -/obj/structure/table/rack/steel, -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = -2 - }, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = 2 - }, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = 4 - }, -/obj/item/weapon/storage/belt/utility/chief/full{ - pixel_y = 6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "po" = ( /obj/machinery/door/airlock/glass_medical{ name = "Medical Bay"; @@ -5256,27 +5384,6 @@ "DS" = ( /turf/simulated/wall/rshull, /area/ship/ert/hallways_aft) -"Ec" = ( -/obj/structure/table/rack/steel, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = -3 - }, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = 3 - }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = 6 - }, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = 9 - }, -/obj/item/weapon/storage/backpack/ert/security{ - pixel_y = 12 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "Ed" = ( /obj/machinery/light/no_nightshift{ dir = 4 @@ -6995,26 +7102,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled/techmaint, /area/shuttle/ert_ship_boat) -"MX" = ( -/obj/structure/table/steel_reinforced, -/obj/item/device/mapping_unit/ert{ - pixel_x = -6; - pixel_y = -6 - }, -/obj/item/device/mapping_unit/ert{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/device/mapping_unit/ert{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/device/mapping_unit/ert{ - pixel_x = 6; - pixel_y = -6 - }, -/turf/simulated/floor/tiled/techfloor, -/area/ship/ert/barracks) "MZ" = ( /turf/simulated/wall/rshull, /area/ship/ert/med_surg) @@ -15392,7 +15479,7 @@ kP kP rS aq -gA +aJ CT qR pV @@ -19507,7 +19594,7 @@ xA xA Jd mF -Ec +az tH gx SF @@ -19791,7 +19878,7 @@ WH Rw Jd mF -MX +aA tH xg SF @@ -20075,7 +20162,7 @@ WH eX iX mT -pn +aB tH xi BF @@ -20217,7 +20304,7 @@ WH ff ip mV -pa +aE tH qJ BU @@ -20354,12 +20441,12 @@ yz yz ab nq -bI +au Wo Wo AX eG -pd +aG tH xt BU @@ -20497,11 +20584,11 @@ yz cu Zo Zo -do -do +aw +ay ip mV -fJ +aH tH xv Ce diff --git a/maps/submaps/depreciated_vr/talon.dm b/maps/submaps/depreciated_vr/talon.dm index 3493a45ed0..70355b0d97 100644 --- a/maps/submaps/depreciated_vr/talon.dm +++ b/maps/submaps/depreciated_vr/talon.dm @@ -240,6 +240,12 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/clothing/suit/space/void/pilot/talon name = "talon pilot's voidsuit" +/obj/item/clothing/head/helmet/space/void/mining/talon + name = "talon miner's voidsuit helmet" + camera_networks = list(NETWORK_TALON_HELMETS) +/obj/item/clothing/suit/space/void/mining/talon + name = "talon miner's voidsuit" + /obj/item/device/gps/command/taloncap gps_tag = "TALC" /obj/item/device/gps/security/talonguard @@ -250,6 +256,8 @@ Once in open space, consider disabling nonessential power-consuming electronics gps_tag = "TALE" /obj/item/device/gps/explorer/talonpilot gps_tag = "TALP" +/obj/item/device/gps/mining/talonminer + gps_tag = "TALM" /obj/structure/closet/secure_closet/talon_captain name = "talon captain's locker" @@ -365,6 +373,29 @@ Once in open space, consider disabling nonessential power-consuming electronics /obj/item/device/gps/explorer/talonpilot ) +/obj/structure/closet/secure_closet/talon_miner + name = "talon miner's locker" + req_access = list(access_talon) + closet_appearance = /decl/closet_appearance/secure_closet/talon/miner + + starts_with = list( + /obj/item/device/radio/headset/talon, + /obj/item/clothing/head/helmet/space/void/refurb/mining/talon, + /obj/item/clothing/suit/space/void/refurb/mining/talon, + /obj/item/weapon/tank/oxygen, + /obj/item/device/suit_cooling_unit, + /obj/item/device/gps/mining/talonminer, + /obj/item/clothing/gloves/black, + /obj/item/device/analyzer, + /obj/item/weapon/storage/bag/ore, + /obj/item/device/flashlight/lantern, + /obj/item/weapon/shovel, + /obj/item/weapon/pickaxe, + /obj/item/weapon/mining_scanner, + /obj/item/clothing/glasses/material, + /obj/item/clothing/glasses/meson + ) + /obj/machinery/vending/medical_talon //Not a subtype for *reasons* name = "NanoMed Plus" desc = "Medical drug dispenser." @@ -468,6 +499,13 @@ Once in open space, consider disabling nonessential power-consuming electronics hard_drive.store_file(new/datum/computer_file/program/camera_monitor/talon_helmet()) set_autorun("tsensormonitor") +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner + name = "miner's laptop" + +/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/miner/install_default_programs() + ..() + hard_drive.store_file(new/datum/computer_file/program/ship_nav()) + //Generic modular consoles scattered around /obj/item/modular_computer/console/preset/talon name = "talon modular computer" diff --git a/maps/submaps/engine_submaps/engine.dm b/maps/submaps/engine_submaps/engine.dm index 74db547fb2..63a0552c6d 100644 --- a/maps/submaps/engine_submaps/engine.dm +++ b/maps/submaps/engine_submaps/engine.dm @@ -4,6 +4,9 @@ var/clean_turfs // A list of lists, where each list is (x, ) /obj/effect/landmark/engine_loader/New() +INITIALIZE_IMMEDIATE(/obj/effect/landmark/engine_loader) + +/obj/effect/landmark/engine_loader/Initialize() if(SSmapping.engine_loader) warning("Duplicate engine_loader landmarks: [log_info_line(src)] and [log_info_line(SSmapping.engine_loader)]") delete_me = TRUE diff --git a/maps/submaps/pois_vr/debris_field/debris14.dmm b/maps/submaps/pois_vr/debris_field/debris14.dmm index 91a5ef114a..6a346d6692 100644 --- a/maps/submaps/pois_vr/debris_field/debris14.dmm +++ b/maps/submaps/pois_vr/debris_field/debris14.dmm @@ -32,7 +32,6 @@ /area/tether_away/debrisfield/shuttle_buffer) "h" = ( /obj/structure/lattice, -/obj/structure/lattice, /turf/space, /area/tether_away/debrisfield/shuttle_buffer) "i" = ( diff --git a/maps/submaps/pois_vr/debris_field/mining_drones.dmm b/maps/submaps/pois_vr/debris_field/mining_drones.dmm index c94ba77182..cff4af2101 100644 --- a/maps/submaps/pois_vr/debris_field/mining_drones.dmm +++ b/maps/submaps/pois_vr/debris_field/mining_drones.dmm @@ -95,13 +95,6 @@ }, /turf/simulated/floor/airless, /area/submap/debrisfield/mining_outpost) -"r" = ( -/obj/random/multiple/underdark/ores, -/obj/structure/closet/syndicate/resources{ - name = "storage locker" - }, -/turf/simulated/floor/tiled/airless, -/area/submap/debrisfield/mining_outpost) "s" = ( /obj/structure/bed/chair{ dir = 4 @@ -303,7 +296,7 @@ d h m z -r +H g S g diff --git a/maps/submaps/space_rocks/bittynest1.dmm b/maps/submaps/space_rocks/bittynest1.dmm new file mode 100644 index 0000000000..9d73c9b765 --- /dev/null +++ b/maps/submaps/space_rocks/bittynest1.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"L" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest1) +"P" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/bittynest1) +"W" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest1) +"Y" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest1) + +(1,1,1) = {" +a +a +a +a +P +P +a +a +a +a +"} +(2,1,1) = {" +a +a +a +P +P +P +P +W +a +a +"} +(3,1,1) = {" +a +a +P +P +W +W +W +W +P +a +"} +(4,1,1) = {" +a +P +P +W +W +P +P +P +P +a +"} +(5,1,1) = {" +P +P +W +W +W +W +W +Y +P +P +"} +(6,1,1) = {" +P +P +W +W +W +L +W +W +W +P +"} +(7,1,1) = {" +P +P +W +W +W +W +W +W +W +P +"} +(8,1,1) = {" +a +P +P +Y +W +W +W +W +P +P +"} +(9,1,1) = {" +a +a +P +P +P +P +P +P +P +a +"} +(10,1,1) = {" +a +a +a +a +a +P +P +a +a +a +"} diff --git a/maps/submaps/space_rocks/bittynest2.dmm b/maps/submaps/space_rocks/bittynest2.dmm new file mode 100644 index 0000000000..cb840bd5a4 --- /dev/null +++ b/maps/submaps/space_rocks/bittynest2.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/bittynest2) +"B" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest2) +"R" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest2) +"W" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest2) + +(1,1,1) = {" +a +a +a +a +v +v +a +v +v +a +"} +(2,1,1) = {" +a +a +v +v +v +v +v +v +v +a +"} +(3,1,1) = {" +a +v +v +v +v +W +R +v +v +v +"} +(4,1,1) = {" +a +v +v +v +W +W +B +W +v +v +"} +(5,1,1) = {" +v +v +v +W +W +W +W +W +v +a +"} +(6,1,1) = {" +v +v +W +W +W +W +W +v +v +v +"} +(7,1,1) = {" +v +v +R +B +W +W +W +W +v +a +"} +(8,1,1) = {" +v +v +v +W +W +v +v +W +a +a +"} +(9,1,1) = {" +a +v +v +v +v +v +v +W +a +a +"} +(10,1,1) = {" +a +a +a +v +v +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/bittynest3.dmm b/maps/submaps/space_rocks/bittynest3.dmm new file mode 100644 index 0000000000..7f845fd0c9 --- /dev/null +++ b/maps/submaps/space_rocks/bittynest3.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"p" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest3) +"N" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest3) +"Q" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest3) +"Z" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/bittynest3) + +(1,1,1) = {" +a +a +Q +a +Z +Z +Z +Z +a +a +"} +(2,1,1) = {" +a +Z +Q +Q +Q +Z +Z +Z +Z +a +"} +(3,1,1) = {" +a +Z +Z +Q +Q +p +Q +Z +Z +Z +"} +(4,1,1) = {" +Z +Z +Z +Z +Z +Q +Q +Q +Z +Z +"} +(5,1,1) = {" +Z +Z +Z +p +Q +Z +Q +Q +Z +a +"} +(6,1,1) = {" +Z +Z +Q +Q +Q +Q +Q +Z +Z +a +"} +(7,1,1) = {" +Z +Z +Q +N +Q +Q +Q +Z +Z +a +"} +(8,1,1) = {" +a +Z +Z +Q +Q +Z +Z +Z +Z +a +"} +(9,1,1) = {" +a +a +Z +Z +Z +Z +Z +Z +a +a +"} +(10,1,1) = {" +a +a +a +Z +Z +Z +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/bittynest4.dmm b/maps/submaps/space_rocks/bittynest4.dmm new file mode 100644 index 0000000000..2c4f133951 --- /dev/null +++ b/maps/submaps/space_rocks/bittynest4.dmm @@ -0,0 +1,145 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"m" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest4) +"x" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest4) +"P" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/bittynest4) +"V" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/bittynest4) + +(1,1,1) = {" +a +a +V +V +V +P +V +V +a +a +"} +(2,1,1) = {" +a +V +V +V +P +P +P +V +V +a +"} +(3,1,1) = {" +V +V +P +P +P +x +V +V +V +V +"} +(4,1,1) = {" +V +V +P +P +V +V +V +V +V +V +"} +(5,1,1) = {" +a +V +P +V +V +m +P +x +V +V +"} +(6,1,1) = {" +V +V +P +V +P +P +P +P +P +V +"} +(7,1,1) = {" +V +V +P +P +P +P +V +V +P +V +"} +(8,1,1) = {" +V +V +V +P +V +V +V +P +P +V +"} +(9,1,1) = {" +a +V +V +V +V +V +P +m +V +V +"} +(10,1,1) = {" +a +a +V +V +V +P +P +V +V +a +"} diff --git a/maps/submaps/space_rocks/clearing.dmm b/maps/submaps/space_rocks/clearing.dmm new file mode 100644 index 0000000000..3ffa6ed085 --- /dev/null +++ b/maps/submaps/space_rocks/clearing.dmm @@ -0,0 +1,148 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"v" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/clearing) +"y" = ( +/obj/random/contraband/nofail, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/clearing) +"P" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/clearing) +"W" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/clearing) + +(1,1,1) = {" +a +a +a +a +v +v +a +a +a +a +"} +(2,1,1) = {" +a +a +v +v +v +v +v +v +a +a +"} +(3,1,1) = {" +a +v +v +v +v +v +v +v +v +a +"} +(4,1,1) = {" +a +v +v +v +v +v +v +v +v +a +"} +(5,1,1) = {" +v +v +v +v +P +v +v +v +v +v +"} +(6,1,1) = {" +v +v +v +W +v +y +v +v +v +v +"} +(7,1,1) = {" +a +v +v +v +v +v +v +v +v +a +"} +(8,1,1) = {" +a +v +v +v +v +v +v +v +v +a +"} +(9,1,1) = {" +a +a +v +v +v +v +v +v +a +a +"} +(10,1,1) = {" +a +a +a +a +v +v +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/seventemple.dmm b/maps/submaps/space_rocks/seventemple.dmm new file mode 100644 index 0000000000..1c5162c676 --- /dev/null +++ b/maps/submaps/space_rocks/seventemple.dmm @@ -0,0 +1,498 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/structure/loot_pile/surface/alien/medical, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"f" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/seventemple) +"h" = ( +/obj/structure/loot_pile/surface/alien/end, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"m" = ( +/turf/simulated/shuttle/floor/alien, +/area/submap/space_rocks/seventemple) +"p" = ( +/obj/structure/loot_pile/surface/bones, +/turf/simulated/shuttle/floor/alien/blue, +/area/submap/space_rocks/seventemple) +"q" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/seventemple) +"t" = ( +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"w" = ( +/obj/structure/loot_pile/surface/alien/security, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"y" = ( +/obj/structure/loot_pile/surface/drone, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) +"F" = ( +/turf/simulated/shuttle/floor/alien/blue, +/area/submap/space_rocks/seventemple) +"J" = ( +/turf/simulated/wall/eris/r_wall, +/area/submap/space_rocks/seventemple) +"R" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/seventemple) +"Y" = ( +/obj/structure/loot_pile/surface/alien/engineering, +/turf/simulated/shuttle/floor/alienplating/vacuum, +/area/submap/space_rocks/seventemple) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +J +a +a +a +a +f +J +J +J +f +a +a +a +a +J +a +a +a +"} +(3,1,1) = {" +a +J +J +J +a +a +f +J +J +t +J +J +f +a +a +J +J +J +a +a +"} +(4,1,1) = {" +a +a +J +f +f +f +f +J +Y +t +t +J +f +f +f +f +J +a +a +a +"} +(5,1,1) = {" +a +a +a +f +R +f +f +J +t +t +t +J +f +f +f +f +a +a +a +a +"} +(6,1,1) = {" +a +a +f +f +f +f +f +J +t +y +t +J +f +f +R +f +f +a +a +a +"} +(7,1,1) = {" +a +f +f +f +f +f +J +J +t +m +t +J +J +f +f +f +f +f +a +a +"} +(8,1,1) = {" +a +f +f +f +f +J +J +m +t +t +t +m +J +J +f +f +f +f +a +a +"} +(9,1,1) = {" +a +f +q +f +J +J +t +t +t +F +t +t +t +J +J +f +f +f +a +a +"} +(10,1,1) = {" +J +f +f +f +J +w +t +t +F +p +F +t +t +h +J +f +f +f +J +a +"} +(11,1,1) = {" +a +f +f +f +J +J +t +t +t +F +t +t +t +J +J +f +f +f +a +a +"} +(12,1,1) = {" +a +f +f +f +f +J +J +m +t +t +t +m +J +J +f +f +f +f +a +a +"} +(13,1,1) = {" +a +f +f +f +f +f +J +J +t +m +t +J +J +f +f +f +q +f +a +a +"} +(14,1,1) = {" +a +a +f +f +f +f +f +J +t +y +t +J +f +f +f +f +f +a +a +a +"} +(15,1,1) = {" +a +a +a +f +R +f +f +J +t +t +t +J +f +f +R +f +a +a +a +a +"} +(16,1,1) = {" +a +a +J +f +f +f +f +J +b +t +t +J +f +f +f +f +J +a +a +a +"} +(17,1,1) = {" +a +J +J +J +a +a +f +J +J +t +J +J +f +a +a +J +J +J +a +a +"} +(18,1,1) = {" +a +a +J +a +a +a +a +f +J +J +J +f +a +a +a +a +J +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/space_rocks.dm b/maps/submaps/space_rocks/space_rocks.dm new file mode 100644 index 0000000000..3951d51171 --- /dev/null +++ b/maps/submaps/space_rocks/space_rocks.dm @@ -0,0 +1,61 @@ +#include "space_rocks_pois.dm" +#include "space_rocks_stuff.dm" + +/turf/simulated/mineral/vacuum/sdmine/make_ore(var/rare_ore) + if(mineral) + return + var/mineral_name + if(rare_ore) + mineral_name = pickweight(list( + "marble" = 3, + "uranium" = 10, + "platinum" = 10, + "hematite" = 20, + "carbon" = 5, + "diamond" = 1, + "gold" = 8, + "silver" = 8, + "phoron" = 18, + "lead" = 2, + "verdantium" = 1)) + else + mineral_name = pickweight(list( + "marble" = 2, + "uranium" = 5, + "platinum" = 5, + "hematite" = 35, + "carbon" = 5, + "gold" = 3, + "silver" = 3, + "phoron" = 25, + "lead" = 1)) + + if(mineral_name && (mineral_name in GLOB.ore_data)) + mineral = GLOB.ore_data[mineral_name] + UpdateMineral() + update_icon() + +/datum/random_map/noise/ore/spacerocks + descriptor = "asteroid field ore distribution map" + deep_val = 0.2 + rare_val = 0.1 + +/datum/random_map/noise/ore/spacerocks/check_map_sanity() + return 1 //Totally random, but probably beneficial. + +/area/sdmine/ + ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg') + base_turf = /turf/simulated/mineral/floor/vacuum +/area/sdmine/unexplored + name = "asteroid field" + icon_state = "unexplored" +/area/sdmine/explored + name = "asteroid field" + icon_state = "explored" + + +/obj/effect/overmap/visitable/sector/virgo3b/generate_skybox(zlevel) + var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small") + + if(zlevel == Z_LEVEL_SPACE_ROCKS) + return smallone \ No newline at end of file diff --git a/maps/submaps/space_rocks/space_rocks.dmm b/maps/submaps/space_rocks/space_rocks.dmm new file mode 100644 index 0000000000..13f3f7d605 --- /dev/null +++ b/maps/submaps/space_rocks/space_rocks.dmm @@ -0,0 +1,19911 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/space, +/area/space) +"b" = ( +/obj/effect/shuttle_landmark/premade/spacerocks/north, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/sdmine/explored) +"v" = ( +/obj/effect/shuttle_landmark/premade/spacerocks/south, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/sdmine/explored) +"y" = ( +/obj/effect/shuttle_landmark/premade/spacerocks/center, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/sdmine/explored) +"D" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/sdmine/explored) +"J" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/sdmine/unexplored) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(8,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(11,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(13,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(14,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(15,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(21,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(22,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(23,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(24,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(25,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(26,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(27,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(28,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +a +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(29,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(30,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(31,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(32,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(33,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(34,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(35,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(36,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(37,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +a +"} +(38,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +a +"} +(39,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +D +D +D +D +J +J +J +J +J +J +J +J +J +D +D +a +a +a +a +a +a +"} +(40,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +a +a +D +D +D +D +D +D +D +D +J +J +J +J +J +D +D +D +D +a +a +a +a +a +a +"} +(41,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(42,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(43,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(44,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(45,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(46,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(47,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(48,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(49,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(50,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(51,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +v +D +D +D +D +D +D +a +a +a +a +a +a +a +a +"} +(52,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(53,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(54,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +"} +(55,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +"} +(56,1,1) = {" +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +"} +(57,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +"} +(58,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +D +D +D +a +a +a +a +a +"} +(59,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +a +a +a +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +"} +(60,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +"} +(61,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(62,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(63,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(64,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(65,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(66,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(67,1,1) = {" +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +"} +(68,1,1) = {" +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(69,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(70,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(71,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(72,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(73,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +"} +(74,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(75,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(76,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(77,1,1) = {" +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(78,1,1) = {" +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(79,1,1) = {" +a +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(80,1,1) = {" +a +a +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +"} +(81,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +y +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(82,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(83,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +b +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(84,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(85,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(86,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(87,1,1) = {" +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +D +D +D +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(88,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +D +D +D +D +D +D +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(89,1,1) = {" +a +a +a +a +a +a +a +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(90,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +D +J +J +J +J +J +J +J +D +D +D +D +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(91,1,1) = {" +a +a +a +a +a +a +a +a +D +D +D +J +J +J +J +J +J +J +J +J +J +J +D +D +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(92,1,1) = {" +a +a +a +a +a +a +a +a +D +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +D +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +"} +(93,1,1) = {" +a +a +a +a +a +a +a +a +a +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(94,1,1) = {" +a +a +a +a +a +a +a +a +D +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(95,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(96,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(97,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(98,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(99,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(100,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(101,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(102,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(103,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(104,1,1) = {" +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(105,1,1) = {" +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(106,1,1) = {" +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(107,1,1) = {" +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(108,1,1) = {" +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(109,1,1) = {" +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(110,1,1) = {" +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(111,1,1) = {" +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(112,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +"} +(113,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +"} +(114,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +"} +(115,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +"} +(116,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +"} +(117,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +"} +(118,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +"} +(119,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +"} +(120,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +"} +(121,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(122,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(123,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(124,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(125,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(126,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(127,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +a +J +J +a +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(128,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(129,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(130,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(131,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(132,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(133,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +J +J +J +J +J +J +J +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(134,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(135,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(136,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(137,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(138,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(139,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(140,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/space_rocks_pois.dm b/maps/submaps/space_rocks/space_rocks_pois.dm new file mode 100644 index 0000000000..3c42dc57d6 --- /dev/null +++ b/maps/submaps/space_rocks/space_rocks_pois.dm @@ -0,0 +1,96 @@ +#if MAP_TEST +#include "bittynest1.dmm" +#include "bittynest2.dmm" +#include "bittynest3.dmm" +#include "bittynest4.dmm" +#include "clearing.dmm" +#include "seventemple.dmm" +#include "spacecrystals.dmm" +#include "tunnel1.dmm" +#include "tunnel2.dmm" +#endif + +/area/submap/space_rocks + name = "POI - Space Rocks" + ambience = AMBIENCE_FOREBODING + +/area/submap/space_rocks/bittynest1 + name = "POI - Bittynest1" + +/datum/map_template/space_rocks/bittynest1 + name = "Bittynest1" + desc = "A smol nest for smol badguys" + mappath = 'bittynest1.dmm' + cost = 5 + +/area/submap/space_rocks/bittynest2 + name = "POI - Bittynest2" + +/datum/map_template/space_rocks/bittynest2 + name = "Bittynest2" + desc = "A smol nest for smol badguys" + mappath = 'bittynest2.dmm' + cost = 5 + +/area/submap/space_rocks/bittynest3 + name = "POI - Bittynest3" + +/datum/map_template/space_rocks/bittynest3 + name = "Bittynest3" + desc = "A smol nest for smol badguys" + mappath = 'bittynest3.dmm' + cost = 5 + +/area/submap/space_rocks/bittynest4 + name = "POI - Bittynest4" + +/datum/map_template/space_rocks/bittynest4 + name = "Bittynest4" + desc = "A smol nest for smol badguys" + mappath = 'bittynest4.dmm' + cost = 5 + +/area/submap/space_rocks/tunnel1 + name = "POI - Tunnel1" + +/datum/map_template/space_rocks/tunnel1 + name = "Tunnel1" + desc = "A tunnel left behind!" + mappath = 'tunnel1.dmm' + cost = 10 + +/area/submap/space_rocks/tunnel2 + name = "POI - Tunnel2" + +/datum/map_template/space_rocks/tunnel2 + name = "Tunnel2" + desc = "A tunnel left behind!" + mappath = 'tunnel2.dmm' + cost = 10 + +/area/submap/space_rocks/spacecrystals + name = "POI - Space Crystals" + +/datum/map_template/space_rocks/tunnel2 + name = "Space Crystals" + desc = "Some crystals living in space!" + mappath = 'spacecrystals.dmm' + cost = 10 + +/area/submap/space_rocks/clearing + name = "POI - Clearing" + +/datum/map_template/space_rocks/clearing + name = "Clearing" + desc = "A clear spot for mischief to happen." + mappath = 'clearing.dmm' + cost = 10 + +/area/submap/space_rocks/seventemple + name = "POI - Temple of the Seven" + +/datum/map_template/space_rocks/seventemple + name = "Temple of the Seven" + desc = "A mysterious space!" + mappath = 'seventemple.dmm' + cost = 25 diff --git a/maps/submaps/space_rocks/space_rocks_stuff.dm b/maps/submaps/space_rocks/space_rocks_stuff.dm new file mode 100644 index 0000000000..cacb70e387 --- /dev/null +++ b/maps/submaps/space_rocks/space_rocks_stuff.dm @@ -0,0 +1,30 @@ +/////LANDING LANDMARKS +/obj/effect/shuttle_landmark/premade/spacerocks/center + name = "asteroid field center" + landmark_tag = "sr-c" + +/obj/effect/shuttle_landmark/premade/spacerocks/north + name = "asteroid field north" + landmark_tag = "sr-n" + +/obj/effect/shuttle_landmark/premade/spacerocks/south + name = "asteroid field south" + landmark_tag = "sr-s" + +/obj/tether_away_spawner/asteroidbaddies + name = "Asteroid Mob Spawner" + faction = "space_rock" + atmos_comp = TRUE + prob_spawn = 100 + prob_fall = 40 + //guard = 20 + mobs_to_pick_from = list( + /mob/living/simple_mob/animal/space/bats = 10, + /mob/living/simple_mob/vore/alienanimals/space_jellyfish = 15, + /mob/living/simple_mob/vore/alienanimals/startreader = 15, + /mob/living/simple_mob/vore/alienanimals/space_ghost = 6, + /mob/living/simple_mob/vore/oregrub = 1, + /mob/living/simple_mob/animal/space/carp = 3, + /mob/living/simple_mob/animal/space/carp/large = 1, + /mob/living/simple_mob/animal/space/carp/large/huge = 1 + ) diff --git a/maps/submaps/space_rocks/spacecrystals.dmm b/maps/submaps/space_rocks/spacecrystals.dmm new file mode 100644 index 0000000000..6d799f7a1c --- /dev/null +++ b/maps/submaps/space_rocks/spacecrystals.dmm @@ -0,0 +1,471 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/spacecrystals) +"j" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/spacecrystals) +"W" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/spacecrystals) +"X" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/spacecrystals) +"Z" = ( +/obj/machinery/crystal, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/spacecrystals) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(4,1,1) = {" +a +a +a +a +W +W +W +W +W +W +a +a +a +a +a +a +a +a +a +a +"} +(5,1,1) = {" +a +a +a +W +W +c +c +c +c +W +W +a +a +a +a +a +a +a +a +a +"} +(6,1,1) = {" +a +a +a +W +c +c +c +c +c +c +W +a +a +a +a +a +a +a +a +a +"} +(7,1,1) = {" +a +a +W +W +X +j +c +c +c +c +W +W +W +W +W +W +a +a +a +a +"} +(8,1,1) = {" +a +a +W +c +c +c +c +c +c +Z +c +c +c +c +W +W +a +a +a +a +"} +(9,1,1) = {" +a +a +W +c +c +c +c +Z +c +c +c +Z +c +c +c +W +W +a +a +a +"} +(10,1,1) = {" +a +a +W +W +c +c +c +c +c +c +c +c +c +j +c +c +W +a +a +a +"} +(11,1,1) = {" +a +a +a +W +W +W +c +c +c +Z +c +c +c +c +c +c +W +a +a +a +"} +(12,1,1) = {" +a +a +a +a +a +W +c +c +c +c +c +c +c +c +c +c +W +a +a +a +"} +(13,1,1) = {" +a +a +a +a +W +W +c +Z +c +c +c +Z +c +c +X +W +W +a +a +a +"} +(14,1,1) = {" +a +a +a +W +W +c +c +c +c +Z +c +c +W +W +W +W +a +a +a +a +"} +(15,1,1) = {" +a +a +a +W +c +c +j +X +c +c +c +W +W +a +a +a +a +a +a +a +"} +(16,1,1) = {" +a +a +a +W +c +c +c +c +c +c +W +W +a +a +a +a +a +a +a +a +"} +(17,1,1) = {" +a +a +a +W +c +c +c +c +c +W +W +a +a +a +a +a +a +a +a +a +"} +(18,1,1) = {" +a +a +a +W +W +c +W +c +W +W +a +a +a +a +a +a +a +a +a +a +"} +(19,1,1) = {" +a +a +a +a +W +W +W +W +W +a +a +a +a +a +a +a +a +a +a +a +"} +(20,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/tunnel1.dmm b/maps/submaps/space_rocks/tunnel1.dmm new file mode 100644 index 0000000000..ac611ad185 --- /dev/null +++ b/maps/submaps/space_rocks/tunnel1.dmm @@ -0,0 +1,251 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/template_noop) +"b" = ( +/turf/simulated/floor/airless, +/area/submap/space_rocks/tunnel1) +"k" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel1) +"l" = ( +/turf/simulated/wall, +/area/submap/space_rocks/tunnel1) +"x" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel1) +"L" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/tunnel1) +"Z" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel1) + +(1,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(3,1,1) = {" +L +l +L +L +L +L +l +x +L +L +L +L +l +x +x +L +L +L +l +L +"} +(4,1,1) = {" +L +b +L +L +Z +L +b +x +x +L +L +x +b +L +x +x +x +x +b +L +"} +(5,1,1) = {" +x +b +b +x +k +x +b +b +x +x +x +x +b +b +x +x +L +x +b +b +"} +(6,1,1) = {" +x +b +b +x +x +x +b +b +x +x +x +x +b +b +x +Z +k +x +b +b +"} +(7,1,1) = {" +L +b +L +k +x +L +b +x +x +x +x +x +b +x +x +L +x +x +b +L +"} +(8,1,1) = {" +L +l +x +x +L +L +l +L +x +x +L +L +l +L +L +L +L +L +l +L +"} +(9,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} +(10,1,1) = {" +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +a +"} diff --git a/maps/submaps/space_rocks/tunnel2.dmm b/maps/submaps/space_rocks/tunnel2.dmm new file mode 100644 index 0000000000..9de921541c --- /dev/null +++ b/maps/submaps/space_rocks/tunnel2.dmm @@ -0,0 +1,275 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/template_noop) +"f" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/floor/airless, +/area/submap/space_rocks/tunnel2) +"i" = ( +/turf/simulated/floor/airless, +/area/submap/space_rocks/tunnel2) +"l" = ( +/obj/random/underdark/uncertain, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel2) +"q" = ( +/turf/simulated/wall, +/area/submap/space_rocks/tunnel2) +"z" = ( +/obj/tether_away_spawner/asteroidbaddies, +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel2) +"C" = ( +/turf/simulated/mineral/floor/vacuum{ + ignore_cavegen = 1 + }, +/area/submap/space_rocks/tunnel2) +"L" = ( +/turf/simulated/mineral/vacuum/sdmine, +/area/submap/space_rocks/tunnel2) + +(1,1,1) = {" +a +a +L +L +C +C +L +L +a +a +"} +(2,1,1) = {" +a +a +q +i +i +i +i +q +a +a +"} +(3,1,1) = {" +a +a +L +C +f +i +L +L +a +a +"} +(4,1,1) = {" +a +a +L +C +C +C +L +L +a +a +"} +(5,1,1) = {" +a +a +L +C +C +C +L +L +a +a +"} +(6,1,1) = {" +a +a +L +L +L +C +l +L +a +a +"} +(7,1,1) = {" +a +a +q +i +i +i +i +q +a +a +"} +(8,1,1) = {" +a +a +L +C +i +i +L +L +a +a +"} +(9,1,1) = {" +a +a +L +C +C +C +C +L +a +a +"} +(10,1,1) = {" +a +a +C +C +C +C +L +L +a +a +"} +(11,1,1) = {" +a +a +C +C +C +C +C +L +a +a +"} +(12,1,1) = {" +a +a +L +C +C +L +C +L +a +a +"} +(13,1,1) = {" +a +a +q +i +i +i +i +q +a +a +"} +(14,1,1) = {" +a +a +L +L +i +i +L +L +a +a +"} +(15,1,1) = {" +a +a +L +L +C +C +C +L +a +a +"} +(16,1,1) = {" +a +a +L +l +C +C +C +L +a +a +"} +(17,1,1) = {" +a +a +L +z +C +C +C +L +a +a +"} +(18,1,1) = {" +a +a +L +L +L +C +C +L +a +a +"} +(19,1,1) = {" +a +a +q +i +i +i +i +q +a +a +"} +(20,1,1) = {" +a +a +L +L +i +i +L +L +a +a +"} diff --git a/maps/submaps/surface_submaps/mountains/temple.dmm b/maps/submaps/surface_submaps/mountains/temple.dmm index 136074820e..229045614f 100644 --- a/maps/submaps/surface_submaps/mountains/temple.dmm +++ b/maps/submaps/surface_submaps/mountains/temple.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/submap/AbandonedTemple) "b" = ( -/turf/simulated/mineral/floor, +/turf/simulated/mineral/floor/cave, /area/submap/AbandonedTemple) "c" = ( /turf/simulated/floor/tiled/asteroid_steel, @@ -206,7 +206,7 @@ /area/submap/AbandonedTemple) "O" = ( /obj/effect/decal/cleanable/blood, -/turf/simulated/mineral/floor, +/turf/simulated/mineral/floor/cave, /area/submap/AbandonedTemple) (1,1,1) = {" diff --git a/maps/submaps/surface_submaps/plains/plains_vr.dm b/maps/submaps/surface_submaps/plains/plains_vr.dm new file mode 100644 index 0000000000..851c72322e --- /dev/null +++ b/maps/submaps/surface_submaps/plains/plains_vr.dm @@ -0,0 +1,348 @@ +// This causes PoI maps to get 'checked' and compiled, when undergoing a unit test. +// This is so CI can validate PoIs, and ensure future changes don't break PoIs, as PoIs are loaded at runtime and the compiler can't catch errors. +// When adding a new PoI, please add it to this list. +#if MAP_TEST +#include "farm1.dmm" +#include "construction1.dmm" +#include "camp1.dmm" +#include "house1.dmm" +#include "beacons.dmm" +#include "Epod.dmm" +#include "Epod2.dmm" +#include "PascalB.dmm" +#include "bonfire.dmm" +#include "Rocky5.dmm" +#include "Field1.dmm" +#include "Thiefc.dmm" +#include "smol2.dmm" +#include "Mechpt.dmm" +#include "Boathouse.dmm" +#include "PooledR.dmm" +#include "Smol3.dmm" +#include "Diner.dmm" +#include "Snow1.dmm" +#include "Snow2.dmm" +#include "Snow3.dmm" +#include "Snow4.dmm" +#include "Snow5.dmm" +#include "SupplyDrop2.dmm" +#include "RationCache.dmm" +#include "Oldhouse.dmm" +#include "PlainsKururak.dmm" +#include "BuriedTreasure.dmm" +#include "BuriedTreasure2.dmm" +#include "BuriedTreasure3.dmm" +#include "methlab.dmm" +#include "hotspring.dmm" +#include "lonehome.dmm" +#include "priderock.dmm" +#include "oldhotel.dmm" +#include "VRDen.dmm" +#include "leopardmanderden.dmm" +#include "greatwolfden.dmm" +#include "syndisniper.dmm" +#include "otieshelter.dmm" +#include "lonewolf.dmm" +#include "emptycabin.dmm" +#include "dogbase.dmm" +#include "drgnplateu.dmm" +#endif + + +// The 'plains' is the area outside the immediate perimeter of the big outpost. +// POIs here should not be dangerous, be mundane, and be somewhat conversative on the loot. Some of the loot can be useful, but it shouldn't trivialize the Wilderness. + +/datum/map_template/surface/plains + name = "Surface Content - Plains" + desc = "Used to make the surface outside the outpost be 16% less boring." + +// To be added: Templates for surface exploration when they are made. + +/datum/map_template/surface/plains/farm1 + name = "Farm 1" + desc = "A small farm tended by a farmbot." + mappath = 'maps/submaps/surface_submaps/plains/farm1_vr.dmm' //VOREStation Edit + cost = 10 + +/datum/map_template/surface/plains/construction1 + name = "Construction Site 1" + desc = "A structure being built. It seems laziness is not limited to engineers." + mappath = 'maps/submaps/surface_submaps/plains/construction1.dmm' + cost = 10 + +/datum/map_template/surface/plains/camp1 + name = "Camp Site 1" + desc = "A small campsite, complete with housing and bonfire." + mappath = 'maps/submaps/surface_submaps/plains/camp1_vr.dmm' //VOREStation Edit + cost = 10 + +/datum/map_template/surface/plains/house1 + name = "House 1" + desc = "A fair sized house out in the frontier, that belonged to a well-traveled explorer." + mappath = 'maps/submaps/surface_submaps/plains/house1_vr.dmm' //VOREStation Edit + cost = 10 + +/datum/map_template/surface/plains/beacons + name = "Collection of Marker Beacons" + desc = "A bunch of marker beacons, scattered in a strange pattern." + mappath = 'maps/submaps/surface_submaps/plains/beacons.dmm' + cost = 5 + fixed_orientation = TRUE + +/datum/map_template/surface/plains/Epod + name = "Emergency Pod" + desc = "A vacant Emergency pod in the middle of nowhere." + mappath = 'maps/submaps/surface_submaps/plains/Epod.dmm' + cost = 5 + +/datum/map_template/surface/plains/Epod2 + name = "Emergency Pod 2" + desc = "A locked Emergency pod in the middle of nowhere." + mappath = 'maps/submaps/surface_submaps/plains/Epod2.dmm' + cost = 5 + +/datum/map_template/surface/plains/normal/Rocky2 + name = "Rocky 2" + desc = "More rocks." + mappath = 'maps/submaps/surface_submaps/plains/Rocky2.dmm' + allow_duplicates = TRUE + cost = 5 + +/datum/map_template/surface/plains/PascalB + name = "Irradiated Manhole Cover" + desc = "How did this old thing get all the way out here?" + mappath = 'maps/submaps/surface_submaps/plains/PascalB.dmm' + cost = 5 + +/datum/map_template/surface/plains/bonfire + name = "Abandoned Bonfire" + desc = "Someone seems to enjoy orange juice a bit too much." + mappath = 'maps/submaps/surface_submaps/plains/bonfire.dmm' + cost = 5 + +/datum/map_template/surface/plains/Rocky5 + name = "Rocky 5" + desc = "More rocks, Less Stalone" + mappath = 'maps/submaps/surface_submaps/plains/Rocky5.dmm' + cost = 5 + +/datum/map_template/surface/plains/Shakden + name = "Shantak Den" + desc = "Not to be confused with Shaq Den" + mappath = 'maps/submaps/surface_submaps/plains/Shakden_vr.dmm' //VOREStation Edit + cost = 10 + +/datum/map_template/surface/plains/Field1 + name = "Field 1" + desc = "A regular field with a tug on it" + mappath = 'maps/submaps/surface_submaps/plains/Field1.dmm' + cost = 20 + +/datum/map_template/surface/plains/Thiefc + name = "Thieves Cave" + desc = "A thieves stash" + mappath = 'maps/submaps/surface_submaps/plains/Thiefc_vr.dmm' //VOREStation Edit + cost = 20 + +/datum/map_template/surface/plains/smol2 + name = "Small 2" + desc = "A small formation of mishaped surgery" + mappath = 'maps/submaps/surface_submaps/plains/smol2.dmm' + cost = 10 + +/datum/map_template/surface/plains/Mechpt + name = "Mechpit" + desc = "A illmade Mech brawling ring" + mappath = 'maps/submaps/surface_submaps/plains/Mechpt.dmm' + cost = 15 + +/datum/map_template/surface/plains/Boathouse + name = "Boathouse" + desc = "A fance house on a lake." + mappath = 'maps/submaps/surface_submaps/plains/Boathouse_vr.dmm' //VOREStation Edit + cost = 30 + +/datum/map_template/surface/plains/PooledR + name = "Pooled Rocks" + desc = "An intresting rocky location" + mappath = 'maps/submaps/surface_submaps/plains/PooledR_vr.dmm' //VOREStation Edit + cost = 15 + +/datum/map_template/surface/plains/Smol3 + name = "Small 3" + desc = "A small stand" + mappath = 'maps/submaps/surface_submaps/plains/Smol3.dmm' + cost = 10 + +/datum/map_template/surface/plains/Diner + name = "Diner" + desc = "Old Timey Tasty" + mappath = 'maps/submaps/surface_submaps/plains/Diner_vr.dmm' //VOREStation Edit + cost = 25 + +/datum/map_template/surface/plains/snow1 + name = "Snow 1" + desc = "Snow" + mappath = 'maps/submaps/surface_submaps/plains/snow1.dmm' + cost = 5 + +/datum/map_template/surface/plains/snow2 + name = "Snow 2" + desc = "More snow" + mappath = 'maps/submaps/surface_submaps/plains/snow2.dmm' + cost = 5 + +/datum/map_template/surface/plains/snow3 + name = "Snow 3" + desc = "Snow Snow Snow" + mappath = 'maps/submaps/surface_submaps/plains/snow3.dmm' + cost = 5 + +/datum/map_template/surface/plains/snow4 + name = "Snow 4" + desc = "Too much snow" + mappath = 'maps/submaps/surface_submaps/plains/snow4.dmm' + cost = 5 + +/datum/map_template/surface/plains/snow5 + name = "Snow 5" + desc = "Please stop the snow" + mappath = 'maps/submaps/surface_submaps/plains/snow5.dmm' + cost = 5 + +/datum/map_template/surface/plains/RationCache + name = "Ration Cache" + desc = "A forgotten cache of emergency rations." + mappath = 'maps/submaps/surface_submaps/plains/RationCache_vr.dmm' //VOREStation Edit + cost = 5 + +/datum/map_template/surface/plains/SupplyDrop2 + name = "Old Supply Drop" + desc = "A drop pod that's clearly been here a while, most of the things inside are rusted and worthless." + mappath = 'maps/submaps/surface_submaps/plains/SupplyDrop2.dmm' + cost = 8 + +/datum/map_template/surface/plains/Oldhouse + name = "Old House" + desc = "Someones old library it seems.." + mappath = 'maps/submaps/surface_submaps/plains/Oldhouse_vr.dmm' //VOREStation Edit + cost = 15 + +/datum/map_template/surface/plains/ChemSpill1 + name = "Ruptured Canister" + desc = "A dumped chemical canister. Looks dangerous." + mappath = 'maps/submaps/surface_submaps/plains/chemspill1_vr.dmm' //VOREStation Edit + cost = 10 + +/datum/map_template/surface/plains/PlainsKururak + name = "Lone Kururak" + desc = "A lone Kururak's den." + mappath = 'maps/submaps/surface_submaps/plains/PlainsKururak.dmm' + cost = 10 + +/datum/map_template/surface/plains/BuriedTreasure1 + name = "Buried Treasure 1" + desc = "A hole in the ground, who knows what might be inside!" + mappath = 'maps/submaps/surface_submaps/plains/BuriedTreasure.dmm' + cost = 10 + template_group = "Shallow Grave" + +/datum/map_template/surface/plains/BuriedTreasure2 + name = "Buried Treasure 2" + desc = "A hole in the ground, who knows what might be inside!" + mappath = 'maps/submaps/surface_submaps/plains/BuriedTreasure2.dmm' + cost = 10 + template_group = "Shallow Grave" + +/datum/map_template/surface/plains/BuriedTreasure3 + name = "Buried Treasure 3" + desc = "A hole in the ground, who knows what might be inside!" + mappath = 'maps/submaps/surface_submaps/plains/BuriedTreasure3.dmm' + cost = 10 + template_group = "Shallow Grave" + +/datum/map_template/surface/plains/oldhotel + name = "Old Hotel" + desc = "A abandoned hotel of sort, wonder why it was left behind." + mappath = 'maps/submaps/surface_submaps/plains/oldhotel.dmm' + cost = 15 + +/datum/map_template/surface/plains/priderock + name = "Pride Rock" + desc = "A quite steep petruding rock from the earth, looks like a good hike." + mappath = 'maps/submaps/surface_submaps/plains/priderock.dmm' + cost = 10 + +/datum/map_template/surface/plains/lonehome + name = "Lone Home" + desc = "A quite inoffensive looking home, damaged but still holding up." + mappath = 'maps/submaps/surface_submaps/plains/lonehome_vr.dmm' //VOREStation Edit + cost = 15 + +/datum/map_template/surface/plains/hotspring + name = "Hot Spring" + desc = "Wait what, a hotspring in a frost planet?" + mappath = 'maps/submaps/surface_submaps/plains/hotspring.dmm' + cost = 5 + +/datum/map_template/surface/plains/methlab + name = "Meth Lab" + desc = "A broken down greenhouse lab?, this does not look safe." + mappath = 'maps/submaps/surface_submaps/plains/methlab.dmm' + cost = 15 + +/datum/map_template/surface/plains/VRDen + name = "VR Den" + desc = "A temporarily abandoned VR den, still functional." + mappath = 'maps/submaps/surface_submaps/plains/VRDen.dmm' + cost = 10 +/datum/map_template/surface/plains/leopardmanderden + name = "Leopardmander Den" + desc = "Den of a voracious but very rare beast." + mappath = 'maps/submaps/surface_submaps/plains/leopardmanderden.dmm' + cost = 10 + +/datum/map_template/surface/plains/greatwolfden + name = "Great Wolf Den" + desc = "Den hosted by the biggest alpha wolf of the wilderness" + mappath = 'maps/submaps/surface_submaps/plains/greatwolfden.dmm' + cost = 15 +/* +/datum/map_template/surface/plains/dogbase + name = "Dog Base" + desc = "A highly secured base with hungry trained canines" + mappath = 'maps/submaps/surface_submaps/plains/dogbase.dmm' + cost = 20 + allow_duplicates = FALSE +*/ +/datum/map_template/surface/plains/emptycabin + name = "Empty Cabin" + desc = "An inconspicuous looking den hosted by a hungry otie" + mappath = 'maps/submaps/surface_submaps/plains/emptycabin.dmm' + cost = 10 + +/datum/map_template/surface/plains/lonewolf + name = "Lone Wolf" + desc = "A large oppressing wolf, supervising from above its cliff" + mappath = 'maps/submaps/surface_submaps/plains/lonewolf.dmm' + cost = 5 +/* +/datum/map_template/surface/plains/otieshelter + name = "Otie Shelter" + desc = "A experimental lab of various breeds of oties" + mappath = 'maps/submaps/surface_submaps/plains/otieshelter.dmm' + cost = 15 + +/datum/map_template/surface/plains/syndisniper + name = "Syndi Sniper" + desc = "Syndicate watch tower, deadly but secluded" + mappath = 'maps/submaps/surface_submaps/plains/syndisniper.dmm' + + cost = 5 +*/ +/datum/map_template/surface/plains/drgnplateu + name = "Dragon Plateu" + desc = "A dangerous plateu of cliffs home to a rampant gold hoarding dragon" + mappath = 'maps/submaps/surface_submaps/plains/drgnplateu.dmm' + cost = 15 + allow_duplicates = FALSE diff --git a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm index 25396ef3c8..734f328ca2 100644 --- a/maps/submaps/surface_submaps/wilderness/emptycabin.dmm +++ b/maps/submaps/surface_submaps/wilderness/emptycabin.dmm @@ -1,328 +1,328 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/template_noop, -/area/template_noop) -"b" = ( -/obj/effect/decal/cleanable/filth, -/obj/item/weapon/bone/arm, -/obj/item/weapon/bone/skull/unathi, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"c" = ( -/obj/structure/curtain/black, -/obj/structure/simple_door/sifwood, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"d" = ( -/obj/structure/closet/wardrobe, -/obj/item/weapon/material/fishing_rod/modern, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"e" = ( -/turf/simulated/wall/sifwood, -/area/submap/EmptyCabin) -"f" = ( -/obj/structure/railing/grey{ - dir = 1 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"g" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/purpledouble, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"i" = ( -/obj/structure/bed/chair/sofa/blue/left{ - dir = 1 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"k" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/bed/chair/sofa/left{ - dir = 8 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"l" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/bed/chair/sofa{ - dir = 8 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"n" = ( -/obj/structure/table/sifwoodentable, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/paper/crumpled/bloody{ - info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..." - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"q" = ( -/obj/structure/railing/grey{ - dir = 4 - }, -/turf/template_noop, -/area/submap/EmptyCabin) -"r" = ( -/obj/effect/landmark/loot_spawn/low, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"t" = ( -/obj/structure/railing/grey, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"y" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/curtain/black, -/obj/structure/grille/rustic, -/turf/simulated/floor/plating, -/area/submap/EmptyCabin) -"z" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "4" - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"A" = ( -/obj/structure/bonfire/permanent/sifwood, -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/steel/techfloor, -/area/submap/EmptyCabin) -"B" = ( -/turf/template_noop, -/area/submap/EmptyCabin) -"C" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"D" = ( -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"F" = ( -/mob/living/simple_mob/otie/friendly/chubby{ - desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit"; - faction = "spiders"; - max_co2 = 0; - max_tox = 0 - }, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"G" = ( -/obj/structure/bed/chair/sofa/blue{ - dir = 1 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"I" = ( -/obj/structure/table/sifwoodentable, -/obj/item/pizzabox/meat, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"J" = ( -/obj/structure/bed/chair/sofa/blue/right{ - dir = 1 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"L" = ( -/obj/structure/table/sifwoodentable, -/obj/item/weapon/flame/candle/candelabra, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"M" = ( -/obj/item/weapon/bone/leg, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"O" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/obj/structure/bed/chair/sofa/right{ - dir = 8 - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"Q" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "5" - }, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "2" - }, -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "3" - }, -/obj/effect/decal/cleanable/blood, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"R" = ( -/obj/structure/loot_pile/surface, -/turf/template_noop, -/area/template_noop) -"T" = ( -/obj/structure/railing/grey{ - dir = 8 - }, -/turf/template_noop, -/area/submap/EmptyCabin) -"V" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "5" - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"W" = ( -/obj/effect/decal/cleanable/blood/drip, -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "2" - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"X" = ( -/obj/item/weapon/bone, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) -"Z" = ( -/obj/effect/decal/cleanable/blood/drip{ - icon_state = "3" - }, -/turf/simulated/floor/wood/sif, -/area/submap/EmptyCabin) - -(1,1,1) = {" -a -q -e -k -l -l -O -C -e -a -"} -(2,1,1) = {" -a -B -D -D -D -D -D -D -t -a -"} -(3,1,1) = {" -a -T -f -e -e -c -e -e -t -a -"} -(4,1,1) = {" -a -a -e -e -b -M -D -e -e -a -"} -(5,1,1) = {" -a -a -e -g -F -X -L -i -e -a -"} -(6,1,1) = {" -a -a -y -n -W -D -I -G -e -a -"} -(7,1,1) = {" -a -a -e -d -Z -r -D -J -e -a -"} -(8,1,1) = {" -a -a -e -e -z -V -Q -e -e -a -"} -(9,1,1) = {" -a -a -R -e -e -A -e -e -a -a -"} -(10,1,1) = {" -a -a -a -R -e -e -e -a -a -a -"} +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/obj/effect/decal/cleanable/filth, +/obj/item/weapon/bone/arm, +/obj/item/weapon/bone/skull/unathi, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"c" = ( +/obj/structure/curtain/black, +/obj/structure/simple_door/sifwood, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"d" = ( +/obj/structure/closet/wardrobe, +/obj/item/weapon/material/fishing_rod/modern, +/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/weapon/storage/toolbox/lunchbox/nymph/filled, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"e" = ( +/turf/simulated/wall/sifwood, +/area/submap/EmptyCabin) +"f" = ( +/obj/structure/railing/grey{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"g" = ( +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/purpledouble, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"i" = ( +/obj/structure/bed/chair/sofa/left/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"k" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa/left{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"l" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"n" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/storage/fancy/candle_box, +/obj/item/weapon/paper/crumpled/bloody{ + info = "I found an otie while picking flowers today. He's so cute! I took him back home, and he seemed quite happy to share food with me. He really likes fish. Though, he never really seems to not be hungry..." + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"q" = ( +/obj/structure/railing/grey{ + dir = 4 + }, +/turf/template_noop, +/area/submap/EmptyCabin) +"r" = ( +/obj/effect/landmark/loot_spawn/low, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"t" = ( +/obj/structure/railing/grey, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"y" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/curtain/black, +/obj/structure/grille/rustic, +/turf/simulated/floor/plating, +/area/submap/EmptyCabin) +"z" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "4" + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"A" = ( +/obj/structure/bonfire/permanent/sifwood, +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/steel/techfloor, +/area/submap/EmptyCabin) +"B" = ( +/turf/template_noop, +/area/submap/EmptyCabin) +"C" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"D" = ( +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"F" = ( +/mob/living/simple_mob/otie/friendly/chubby{ + desc = "The classic bioengineered longdog. This one still probably won't tolerate you. What an absolute unit"; + faction = "spiders"; + max_co2 = 0; + max_tox = 0 + }, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"G" = ( +/obj/structure/bed/chair/sofa/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"I" = ( +/obj/structure/table/sifwoodentable, +/obj/item/pizzabox/meat, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"J" = ( +/obj/structure/bed/chair/sofa/right/blue{ + dir = 1 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"L" = ( +/obj/structure/table/sifwoodentable, +/obj/item/weapon/flame/candle/candelabra, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"M" = ( +/obj/item/weapon/bone/leg, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"O" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/obj/structure/bed/chair/sofa/right{ + dir = 8 + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"Q" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/obj/effect/decal/cleanable/blood, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"R" = ( +/obj/structure/loot_pile/surface, +/turf/template_noop, +/area/template_noop) +"T" = ( +/obj/structure/railing/grey{ + dir = 8 + }, +/turf/template_noop, +/area/submap/EmptyCabin) +"V" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "5" + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"W" = ( +/obj/effect/decal/cleanable/blood/drip, +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "2" + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"X" = ( +/obj/item/weapon/bone, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) +"Z" = ( +/obj/effect/decal/cleanable/blood/drip{ + icon_state = "3" + }, +/turf/simulated/floor/wood/sif, +/area/submap/EmptyCabin) + +(1,1,1) = {" +a +q +e +k +l +l +O +C +e +a +"} +(2,1,1) = {" +a +B +D +D +D +D +D +D +t +a +"} +(3,1,1) = {" +a +T +f +e +e +c +e +e +t +a +"} +(4,1,1) = {" +a +a +e +e +b +M +D +e +e +a +"} +(5,1,1) = {" +a +a +e +g +F +X +L +i +e +a +"} +(6,1,1) = {" +a +a +y +n +W +D +I +G +e +a +"} +(7,1,1) = {" +a +a +e +d +Z +r +D +J +e +a +"} +(8,1,1) = {" +a +a +e +e +z +V +Q +e +e +a +"} +(9,1,1) = {" +a +a +R +e +e +A +e +e +a +a +"} +(10,1,1) = {" +a +a +a +R +e +e +e +a +a +a +"} diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index 598a446e48..4173ca91f0 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -50,7 +50,7 @@ new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_UNDERDARK, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_UNDERDARK, 64, 64) // Create the mining ore distribution map. -#include "../../submaps/surface_submaps/plains/plains.dm" +#include "../../submaps/surface_submaps/plains/plains_vr.dm" #include "../../submaps/surface_submaps/plains/plains_areas.dm" #include "../../submaps/surface_submaps/plains/plains_turfs.dm" /datum/map_template/tether_lateload/tether_plains diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index 76bd7c36af..fd39fa6cc8 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -1897,7 +1897,7 @@ /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/effect/shuttle_landmark/shuttle_initializer/ccboat, /obj/effect/overmap/visitable/ship/landable/ccboat, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/airless, /area/shuttle/ccboat) "gj" = ( /obj/machinery/vending/cola{ @@ -2099,7 +2099,7 @@ /obj/machinery/light/small{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/airless, /area/shuttle/ccboat) "gP" = ( /obj/structure/table/rack, @@ -5573,7 +5573,7 @@ id_tag = null }, /obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/airless, /area/shuttle/ccboat) "wx" = ( /obj/structure/bed/chair/shuttle{ @@ -6550,7 +6550,7 @@ id_tag = "ccboat"; pixel_y = 29 }, -/turf/simulated/floor/tiled/eris/dark/danger, +/turf/simulated/floor/airless, /area/shuttle/ccboat) "Cn" = ( /turf/unsimulated/wall, @@ -7255,7 +7255,7 @@ }, /area/centcom/control) "EE" = ( -/obj/machinery/telecomms/relay/preset/tether, +/obj/machinery/telecomms/relay/preset/station, /turf/unsimulated/floor/steel, /area/centcom/control) "EF" = ( diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm index b080985940..22dd2e4e5e 100644 --- a/maps/tether/submaps/underdark_pois/underdark_things.dm +++ b/maps/tether/submaps/underdark_pois/underdark_things.dm @@ -81,193 +81,6 @@ /mob/living/simple_mob/vore/aggressive/dragon = 1 ) -/obj/random/underdark - name = "random underdark loot" - desc = "Random loot for Underdark." - icon = 'icons/obj/items.dmi' - icon_state = "spickaxe" - -/obj/random/underdark/item_to_spawn() - return pick(prob(3);/obj/random/multiple/underdark/miningdrills, - prob(3);/obj/random/multiple/underdark/ores, - prob(2);/obj/random/multiple/underdark/treasure, - prob(1);/obj/random/multiple/underdark/mechtool) - -/obj/random/underdark/uncertain - icon_state = "upickaxe" - spawn_nothing_percentage = 65 //only 33% to spawn loot - -/obj/random/multiple/underdark/miningdrills - name = "random underdark mining tool loot" - desc = "Random mining tool loot for Underdark." - icon = 'icons/obj/items.dmi' - icon_state = "spickaxe" - -/obj/random/multiple/underdark/miningdrills/item_to_spawn() - return pick( - prob(10);list(/obj/item/weapon/pickaxe/silver), - prob(8);list(/obj/item/weapon/pickaxe/drill), - prob(6);list(/obj/item/weapon/pickaxe/jackhammer), - prob(5);list(/obj/item/weapon/pickaxe/gold), - prob(4);list(/obj/item/weapon/pickaxe/plasmacutter), - prob(2);list(/obj/item/weapon/pickaxe/diamond), - prob(1);list(/obj/item/weapon/pickaxe/diamonddrill) - ) - -/obj/random/multiple/underdark/ores - name = "random underdark mining ore loot" - desc = "Random mining utility loot for Underdark." - icon = 'icons/obj/mining.dmi' - icon_state = "satchel" - -/obj/random/multiple/underdark/ores/item_to_spawn() - return pick( - prob(9);list( - /obj/item/weapon/storage/bag/ore, - /obj/item/weapon/shovel, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/glass, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen, - /obj/item/weapon/ore/hydrogen - ), - prob(7);list( - /obj/item/weapon/storage/bag/ore, - /obj/item/weapon/pickaxe, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium, - /obj/item/weapon/ore/osmium - ), - prob(4);list( - /obj/item/clothing/suit/radiation, - /obj/item/clothing/head/radiation, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium, - /obj/item/weapon/ore/uranium), - prob(2);list( - /obj/item/device/flashlight/lantern, - /obj/item/clothing/glasses/material, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond, - /obj/item/weapon/ore/diamond - ), - prob(1);list( - /obj/item/weapon/mining_scanner, - /obj/item/weapon/shovel/spade, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium, - /obj/item/weapon/ore/verdantium - ) - ) - -/obj/random/multiple/underdark/treasure - name = "random underdark treasure" - desc = "Random treasure loot for Underdark." - icon = 'icons/obj/storage.dmi' - icon_state = "cashbag" - -/obj/random/multiple/underdark/treasure/item_to_spawn() - return pick( - prob(5);list( - /obj/random/coin, - /obj/random/coin, - /obj/random/coin, - /obj/random/coin, - /obj/random/coin, - /obj/item/clothing/head/pirate - ), - prob(4);list( - /obj/item/weapon/storage/bag/cash, - /obj/item/weapon/spacecash/c500, - /obj/item/weapon/spacecash/c100, - /obj/item/weapon/spacecash/c50 - ), - prob(3);list( - /obj/item/clothing/head/hardhat/orange, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold, - /obj/item/stack/material/gold), - prob(1);list( - /obj/item/stack/material/phoron, - /obj/item/stack/material/phoron, - /obj/item/stack/material/phoron, - /obj/item/stack/material/phoron, - /obj/item/stack/material/diamond, - /obj/item/stack/material/diamond, - /obj/item/stack/material/diamond - ) - ) - -/obj/random/multiple/underdark/mechtool - name = "random underdark mech equipment" - desc = "Random mech equipment loot for Underdark." - icon = 'icons/mecha/mecha_equipment.dmi' - icon_state = "mecha_clamp" - -/obj/random/multiple/underdark/mechtool/item_to_spawn() - return pick( - prob(12);list(/obj/item/mecha_parts/mecha_equipment/tool/drill), - prob(10);list(/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp), - prob(8);list(/obj/item/mecha_parts/mecha_equipment/generator), - prob(7);list(/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot/rigged), - prob(6);list(/obj/item/mecha_parts/mecha_equipment/repair_droid), - prob(3);list(/obj/item/mecha_parts/mecha_equipment/gravcatapult), - prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/riggedlaser), - prob(2);list(/obj/item/mecha_parts/mecha_equipment/weapon/energy/flamer/rigged), - prob(1);list(/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill), - ) - //POI STUFF VIRGO3B_TURF_CREATE(/turf/simulated/mineral/ignore_oregen) VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor/ignore_oregen) diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index 951d8f01f2..f658a6da07 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -6134,6 +6134,9 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/public_garden_one) "aks" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/public_garden_maintenence) "akt" = ( @@ -8439,6 +8442,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "anZ" = ( @@ -14084,6 +14088,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/machinery/item_bank{ + dir = 4; + pixel_x = -28 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "axj" = ( @@ -20065,6 +20073,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/effect/landmark/vermin, /turf/simulated/floor/wood, /area/vacant/vacant_bar) "aHe" = ( @@ -27715,6 +27724,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "aVd" = ( @@ -31463,7 +31473,14 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "biK" = ( -/obj/structure/barricade/cutout/mime, +/obj/structure/table/alien/blue{ + desc = "Is this imported?"; + name = "obscure table" + }, +/obj/item/toy/figure/mime, +/obj/item/weapon/pen/crayon/marker/mime, +/obj/item/weapon/pen/crayon/mime, +/obj/item/weapon/cartridge/mime, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "bmK" = ( @@ -31855,6 +31872,10 @@ "cAR" = ( /turf/simulated/floor/looking_glass/center, /area/looking_glass/lg_1) +"cCx" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_one) "cGJ" = ( /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) @@ -31917,6 +31938,16 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"cKo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 1 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "cKr" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/atmospherics/pipe/simple/hidden/aux, @@ -32738,30 +32769,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "fFb" = ( -/obj/machinery/fitness/punching_bag/clown, +/obj/machinery/vending/wardrobe/clowndrobe, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) -"fFT" = ( -/obj/item/clothing/mask/gas/sexyclown, -/obj/item/toy/figure/clown, -/obj/item/clothing/under/sexyclown, -/obj/item/clothing/shoes/clown_shoes, -/obj/item/weapon/bedsheet/clown, -/obj/item/weapon/cartridge/clown, -/obj/item/weapon/stamp/clown, -/obj/item/weapon/storage/backpack/clown, -/obj/item/weapon/bananapeel, -/obj/item/weapon/reagent_containers/food/snacks/pie, -/obj/item/weapon/pen/crayon/marker/rainbow, -/obj/item/weapon/pen/crayon/rainbow, -/obj/item/clothing/mask/emotions, -/obj/structure/closet/secure_closet{ - desc = "Where the Clown keeps their hooliganisms."; - name = "funny locker"; - req_one_access = list(136) - }, -/turf/simulated/floor/carpet/gaycarpet, -/area/tether/surfacebase/funny/clownoffice) "fKm" = ( /obj/random/junk, /obj/random/maintenance/cargo, @@ -32773,6 +32783,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"fOk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/lino, +/area/crew_quarters/visitor_dining) "fOy" = ( /obj/machinery/shower{ pixel_y = 16 @@ -33270,7 +33290,7 @@ "gWO" = ( /obj/structure/table/rack, /obj/effect/floor_decal/rust, -/obj/item/toy/crossbow, +/obj/item/weapon/gun/projectile/revolver/toy/crossbow, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "gYx" = ( @@ -33998,7 +34018,7 @@ /turf/simulated/floor/tiled/freezer, /area/tether/surfacebase/security/brig/bathroom) "iWa" = ( -/obj/structure/bed/chair/bar_stool, +/obj/machinery/vending/wardrobe/mimedrobe, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "iWx" = ( @@ -34111,10 +34131,10 @@ /obj/structure/table/standard{ name = "plastic table frame" }, -/obj/item/device/flashlight/lamp/green, /obj/structure/sign/painting/public{ pixel_y = 30 }, +/obj/item/device/flashlight/lamp/clown, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "jrh" = ( @@ -35005,6 +35025,7 @@ /obj/machinery/alarm{ pixel_y = 25 }, +/obj/item/toy/figure/clown, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "lDW" = ( @@ -35886,6 +35907,10 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"nBZ" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/hallway/lower/first_west) "nDD" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers, @@ -36097,6 +36122,8 @@ /obj/structure/sign/painting/public{ pixel_y = 30 }, +/obj/item/weapon/reagent_containers/food/snacks/pie, +/obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) "okO" = ( @@ -36344,6 +36371,13 @@ /obj/machinery/light/small{ dir = 8 }, +/obj/item/weapon/pen/crayon/marker/rainbow, +/obj/item/weapon/pen/crayon/rainbow, +/obj/item/weapon/stamp/clown, +/obj/item/weapon/cartridge/clown, +/obj/structure/table/standard{ + name = "plastic table frame" + }, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) "oPH" = ( @@ -36458,6 +36492,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) +"ppS" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/storage/primary) "prr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, /turf/simulated/floor/plating, @@ -36550,6 +36588,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"pMd" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/grass, +/area/tether/surfacebase/surface_one_hall) "pPF" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal, /obj/machinery/light/small{ @@ -36677,8 +36719,8 @@ /area/maintenance/lower/trash_pit) "qhs" = ( /obj/structure/table/rack, -/obj/item/toy/crossbow, /obj/item/weapon/coin/silver, +/obj/item/weapon/gun/projectile/revolver/toy/crossbow, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) "qjE" = ( @@ -36898,6 +36940,10 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/crew_quarters/locker) +"qOV" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "qPs" = ( /obj/structure/railing{ dir = 1 @@ -37191,6 +37237,12 @@ /obj/item/weapon/material/minihoe, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) +"rCj" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/vacant/vacant_site/east) "rDJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -38256,6 +38308,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig/storage) +"uHq" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "uHS" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 1 @@ -38444,20 +38500,7 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "vCn" = ( -/obj/item/weapon/pen/crayon/mime, -/obj/item/weapon/pen/crayon/marker/mime, -/obj/item/weapon/cartridge/mime, -/obj/item/weapon/bedsheet/mime, -/obj/item/toy/figure/mime, -/obj/item/clothing/under/sexymime, -/obj/item/clothing/shoes/mime, -/obj/item/clothing/mask/gas/sexymime, -/obj/item/clothing/head/soft/mime, -/obj/structure/closet/secure_closet{ - desc = "..."; - name = "silent storage"; - req_one_access = list(138) - }, +/obj/structure/barricade/cutout/mime, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/funny/mimeoffice) "vDb" = ( @@ -39125,6 +39168,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "xFG" = ( @@ -44629,7 +44673,7 @@ akw akE bdG akW -akN +cCx aly alN amf @@ -45776,7 +45820,7 @@ atG atH atH ahM -anx +nBZ aju aoE apl @@ -48042,7 +48086,7 @@ anp aeW aml afT -afT +ppS afT agJ anj @@ -51899,7 +51943,7 @@ aqf aqf arg aoS -aoj +pMd awI axo ayh @@ -52904,7 +52948,7 @@ agM aCJ aCJ aCJ -aCJ +rCj aCJ aCJ agM @@ -54572,7 +54616,7 @@ uVK ojM cUB wOK -fFT +ylH rxD bbj agT @@ -54640,7 +54684,7 @@ bcT aVf aVB aVf -cwS +cKo aUP aWY aUm @@ -54756,7 +54800,7 @@ aFS aEM aHm aDu -aIu +fOk aJo aDu aKJ @@ -56020,11 +56064,11 @@ aFW auB auB auB -auB +qOV auB auU auB -auB +uHq auB auB auB diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index b439b014b2..016b82e420 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -387,6 +387,15 @@ /obj/structure/window/reinforced, /turf/simulated/floor/wood, /area/tether/surfacebase/medical/centralhall) +"aaH" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/open, +/area/rnd/staircase/secondfloor) "aaI" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -2748,6 +2757,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/security/detective) "aei" = ( @@ -7942,6 +7952,7 @@ }, /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/red/bordercorner, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/middlehall) "amn" = ( @@ -8761,6 +8772,7 @@ /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/item/weapon/deck/cards, /obj/structure/table/glass, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "anG" = ( @@ -10292,7 +10304,7 @@ /obj/machinery/light/small{ dir = 1 }, -/mob/living/simple_mob/animal/passive/snake/noodle, +/mob/living/simple_mob/animal/passive/snake/python/noodle, /turf/simulated/floor/grass, /area/chapel/main) "aqi" = ( @@ -10368,6 +10380,12 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor/plating, /area/maintenance/asmaint2) +"aqt" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/rnd/staircase/secondfloor) "aqu" = ( /obj/structure/table/standard{ name = "plastic table frame" @@ -14927,6 +14945,9 @@ /obj/machinery/atmospherics/pipe/simple/visible/purple{ dir = 5 }, +/obj/effect/landmark{ + name = "maint_pred" + }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/asmaint2) "ayB" = ( @@ -16527,6 +16548,9 @@ dir = 4 }, /obj/machinery/light/small, +/obj/effect/landmark{ + name = "maint_pred" + }, /turf/simulated/floor/plating, /area/maintenance/asmaint2) "aCg" = ( @@ -19645,6 +19669,9 @@ dir = 1; pixel_y = -22 }, +/obj/effect/landmark{ + name = "maint_pred" + }, /turf/simulated/floor, /area/maintenance/lower/rnd) "aIk" = ( @@ -21402,6 +21429,7 @@ "aLM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_two_hall) "aLN" = ( @@ -23637,21 +23665,9 @@ }, /turf/simulated/open, /area/rnd/staircase/secondfloor) -"aPG" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/simulated/open, -/area/rnd/staircase/secondfloor) "aPH" = ( /turf/simulated/open, /area/rnd/staircase/secondfloor) -"aPI" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/open, -/area/rnd/staircase/secondfloor) "aPJ" = ( /turf/simulated/wall, /area/rnd/breakroom) @@ -32817,6 +32833,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"dnD" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/uppersouthstairwell) "dzE" = ( /obj/effect/floor_decal/chapel{ dir = 8 @@ -33060,6 +33080,13 @@ /obj/machinery/light/small, /turf/simulated/floor/plating, /area/tether/surfacebase/fish_farm) +"grX" = ( +/obj/effect/floor_decal/rust, +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "gsU" = ( /obj/structure/table/rack, /obj/random/maintenance/engineering, @@ -33247,6 +33274,12 @@ }, /turf/simulated/floor/bluegrid, /area/ai_upload) +"iLF" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/south) "jcd" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -33262,6 +33295,10 @@ }, /turf/simulated/floor/wood, /area/bridge/meeting_room) +"jlG" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/centralhall) "jtj" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/readingrooms) @@ -33604,6 +33641,12 @@ }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) +"lvb" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/rnd) "lJc" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -33632,6 +33675,10 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, /area/chapel/main) +"lUN" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_two) "lZx" = ( /turf/simulated/wall/r_wall, /area/maintenance/readingrooms) @@ -33700,6 +33747,12 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload_foyer) +"mNT" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/asmaint2) "mNZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -33710,6 +33763,12 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ai_upload_foyer) +"mQc" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/atmos) "mUP" = ( /obj/structure/bed/padded, /obj/effect/floor_decal/techfloor, @@ -33732,6 +33791,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload_foyer) +"ncG" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/wood, +/area/bridge/meeting_room) "ndB" = ( /obj/structure/cable/cyan{ d1 = 1; @@ -33864,6 +33927,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bluegrid, /area/ai) +"pny" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/plating, +/area/maintenance/asmaint2) "pqb" = ( /obj/structure/sink/puddle, /turf/simulated/floor/beach/sand/desert, @@ -34021,6 +34090,15 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/bar) +"qGR" = ( +/obj/effect/floor_decal/corner_techfloor_grid{ + dir = 5 + }, +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/lower/south) "qKR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -34061,6 +34139,10 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai_upload) +"rjM" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/beach/sand/desert, +/area/tether/surfacebase/fish_farm) "rlN" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/ai) @@ -34107,6 +34189,10 @@ /obj/machinery/vending/wardrobe/chapdrobe, /turf/simulated/floor/lino, /area/chapel/office) +"rBf" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "rJc" = ( /obj/effect/floor_decal/corner/paleblue/diagonal, /obj/effect/landmark/start{ @@ -34452,6 +34538,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/ai) +"tZD" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled/techmaint, +/area/tether/surfacebase/surface_two_hall) "tZV" = ( /obj/machinery/light, /turf/simulated/floor/tiled/techfloor/grid, @@ -40534,7 +40627,7 @@ aHm aHE aHE aIJ -aIJ +mNT aHE aHE aHE @@ -40648,7 +40741,7 @@ akX aoi apt aqz -aog +lUN ars atI akX @@ -41683,7 +41776,7 @@ aOU aKb aQw aQw -aQw +pny aQw aRj aHE @@ -41801,7 +41894,7 @@ azq azq azq ayw -axR +rjM axR axR axR @@ -42532,7 +42625,7 @@ aMW aNv aOj aOZ -aPG +aaH aPH aPH aRM @@ -42674,7 +42767,7 @@ aMX aNv aOk aOY -aPH +aOY aPH aPH aRM @@ -42816,7 +42909,7 @@ aIP aIP aOl aPa -aPI +aqt aPH aPH aRM @@ -42948,7 +43041,7 @@ aGw aGw aqZ arf -aEc +lvb aJJ aKh aKU @@ -43962,7 +44055,7 @@ aRm aPJ aYd aWH -aQw +pny aXx aXx aXx @@ -44220,7 +44313,7 @@ aEa avD aFh aFl -aEc +lvb aGy aGy aGy @@ -44261,7 +44354,7 @@ baz aHn aHI baz -aIg +grX baU baU baz @@ -44982,7 +45075,7 @@ baU beQ aKK baz -baU +mQc baU biS bjr @@ -46539,7 +46632,7 @@ baz aIM baU baU -baU +mQc baz bfR bgx @@ -47064,7 +47157,7 @@ aGH aHb aHs aHM -aGF +ncG aIU aGE aAG @@ -47666,7 +47759,7 @@ aLY bbm bbM aZr -aZr +iLF aLY adt adt @@ -48892,7 +48985,7 @@ asV awj avD axF -ayc +tZD ayd azg ayh @@ -48916,7 +49009,7 @@ ayd ayd aKA ayd -ayd +rBf aMG avD asm @@ -49158,7 +49251,7 @@ aex afj agh aaU -aam +jlG aiP akq alS @@ -49634,7 +49727,7 @@ qpA dSO tED aLY -aRC +qGR bcM atW aUc @@ -50161,7 +50254,7 @@ aks akF akJ akJ -akJ +dnD akJ alY amJ @@ -50654,7 +50747,7 @@ aLY aLY aZr aZr -aZr +iLF baO bax eps diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 7ef90d86b9..5a9fd154e5 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -11444,7 +11444,9 @@ /turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "lifeboat1" }, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "ask" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -14316,6 +14318,12 @@ /obj/effect/floor_decal/corner/mauve/bordercorner2, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) +"axt" = ( +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/rnd/staircase/thirdfloor) "axu" = ( /obj/structure/sink{ dir = 8; @@ -14323,6 +14331,13 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) +"axv" = ( +/obj/structure/railing, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/open, +/area/rnd/staircase/thirdfloor) "axw" = ( /obj/structure/cable/green{ d1 = 1; @@ -14437,12 +14452,6 @@ }, /turf/simulated/floor/tiled, /area/rnd/research) -"axF" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/open, -/area/rnd/staircase/thirdfloor) "axG" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light{ @@ -14554,7 +14563,6 @@ "axL" = ( /obj/structure/table/standard, /obj/structure/reagent_dispensers/acid{ - density = 0; pixel_y = -30 }, /obj/item/weapon/hand_labeler, @@ -19896,6 +19904,7 @@ dir = 8; icon_state = "pipe-c" }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aGw" = ( @@ -20141,7 +20150,6 @@ dir = 1 }, /obj/structure/reagent_dispensers/acid{ - density = 0; pixel_y = -30 }, /obj/effect/floor_decal/borderfloor, @@ -20163,6 +20171,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aGW" = ( @@ -21680,7 +21689,10 @@ /area/hallway/lower/third_south) "aJo" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aJp" = ( @@ -21692,7 +21704,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) @@ -22823,7 +22838,10 @@ /area/rnd/robotics/mechbay) "aLA" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "aLB" = ( @@ -22835,7 +22853,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) @@ -23371,12 +23392,17 @@ /turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "lifeboat1" }, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aMF" = ( -/turf/simulated/wall/fancy_shuttle/window{ - fancy_shuttle_tag = "lifeboat1" +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" }, -/area/shuttle/tether) +/turf/simulated/floor, +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aMG" = ( /obj/structure/railing{ dir = 4 @@ -23582,12 +23608,24 @@ /obj/machinery/computer/shuttle_control/tether_backup{ req_one_access = list() }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNb" = ( /obj/structure/closet/emcloset, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNc" = ( /obj/machinery/alarm{ dir = 8; @@ -23670,8 +23708,14 @@ /obj/structure/bed/chair/shuttle{ dir = 8 }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNn" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -23785,8 +23829,14 @@ locked = 1; name = "Shuttle Hatch" }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNA" = ( /obj/machinery/power/apc{ dir = 4; @@ -23886,8 +23936,14 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "aNK" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNL" = ( /obj/structure/window/basic/full, /obj/structure/grille, @@ -23924,8 +23980,14 @@ /obj/structure/bed/chair/shuttle{ dir = 4 }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "aNQ" = ( /obj/machinery/firealarm{ dir = 4; @@ -27179,13 +27241,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/lower/third_south) -"aUq" = ( -/obj/machinery/atmospherics/binary/pump, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) "aUr" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -27234,17 +27289,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aUx" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "aUy" = ( @@ -27398,15 +27454,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"aUN" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) "aUO" = ( /obj/effect/floor_decal/techfloor{ dir = 6 @@ -28621,11 +28668,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aXa" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -31502,17 +31551,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "bbX" = ( -/obj/effect/fancy_shuttle_floor_preview/tourbus{ - dir = 1 - }, /obj/effect/fancy_shuttle/tourbus{ dir = 1; fancy_shuttle_tag = "tourbus" }, +/obj/effect/fancy_shuttle_floor_preview/tourbus{ + dir = 1 + }, /obj/machinery/atmospherics/unary/engine/fancy_shuttle{ dir = 1 }, -/turf/simulated/wall/fancy_shuttle/nondense{ +/turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, /area/shuttle/tourbus/general) @@ -32123,7 +32172,6 @@ /obj/item/weapon/soap/nanotrasen, /obj/item/weapon/soap/deluxe, /obj/item/weapon/staff/gentcane, -/obj/item/toy/crossbow, /obj/item/toy/eight_ball/conch, /obj/item/weapon/cell/potato, /obj/structure/cable/green{ @@ -32133,6 +32181,7 @@ }, /obj/item/device/megaphone, /obj/random/cutout, +/obj/item/weapon/gun/projectile/revolver/toy/crossbow, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bcV" = ( @@ -33400,7 +33449,10 @@ /area/tether/surfacebase/shuttle_pad) "bfj" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "bfk" = ( @@ -33935,7 +33987,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/glass_external/public, +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" + }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) @@ -37792,40 +37847,29 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "ccN" = ( -/obj/machinery/button/remote/airlock{ - desiredstate = 1; - id = "tourbus_left"; - name = "hatch bolt control"; - pixel_x = 4; - pixel_y = 30; - req_one_access = list(19,43,67); - specialfunctions = 4 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/angled_tgmc/security_glass{ - dir = 4; +/obj/machinery/door/airlock/glass_external{ icon_state = "door_locked"; id_tag = "tourbus_left"; locked = 1; - name = "tourbus airlock" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + req_one_access = list() }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "cdf" = ( -/turf/simulated/wall/fancy_shuttle{ +/turf/simulated/wall/fancy_shuttle/nondense{ fancy_shuttle_tag = "tourbus" }, /area/shuttle/tourbus/cockpit) "cdv" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -37835,20 +37879,11 @@ dir = 4 }, /obj/effect/map_helper/airlock/door/simple, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "tourbus_windows"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/obj/machinery/door/airlock/angled_tgmc/security_glass{ - dir = 4; - name = "tourbus airlock" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/door/airlock/glass_external/public{ + frequency = 1380; + id_tag = "tourbus_right" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "ceN" = ( @@ -37858,6 +37893,7 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "cmQ" = ( @@ -37913,6 +37949,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"cta" = ( +/obj/machinery/shipsensors/fancy_shuttle, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/cockpit) "cun" = ( /obj/machinery/atm{ pixel_x = -32 @@ -38035,16 +38077,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/library) -"cUF" = ( -/obj/machinery/computer/shuttle_control/explore/tourbus, -/obj/machinery/light/small{ - dir = 1 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/cockpit) "cVg" = ( /obj/structure/bed/chair/office/dark{ dir = 4 @@ -38185,22 +38217,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "ddn" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; - req_access = list(); - req_one_access = list(11,67) - }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/machinery/computer/ship/helm, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "dgA" = ( @@ -38388,20 +38409,6 @@ }, /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) -"dVW" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) "dVZ" = ( /obj/structure/table/woodentable, /obj/item/clothing/accessory/permit/gun{ @@ -38430,6 +38437,16 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"eaj" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "eeD" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 4 @@ -38487,6 +38504,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"enD" = ( +/obj/effect/landmark/vermin, +/turf/simulated/mineral/floor/cave{ + name = "dirt" + }, +/area/tether/surfacebase/public_garden_three) "eqZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -38500,6 +38523,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "erS" = ( @@ -38540,6 +38564,10 @@ /obj/effect/floor_decal/corner/red/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"eDc" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/triage) "eEW" = ( /obj/machinery/door/airlock{ name = "Internal Affairs"; @@ -38560,9 +38588,14 @@ /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "eGv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/atmospherics/binary/pump, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -38635,8 +38668,14 @@ pixel_x = 23; tag_door = "tether_shuttle_hatch" }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "eMY" = ( /obj/structure/sink{ pixel_y = 20 @@ -38649,6 +38688,10 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"eOP" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/wood, +/area/tether/surfacebase/entertainment) "eQN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -38673,30 +38716,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "fag" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/structure/cable{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28; - req_access = list(); - req_one_access = list(11,67) - }, /obj/structure/closet/emergsuit_wall{ dir = 1; pixel_y = -32 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "faL" = ( @@ -38708,6 +38741,10 @@ /turf/simulated/open, /area/tether/surfacebase/southhall) "fcg" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, /obj/effect/shuttle_landmark{ base_area = /area/tether/surfacebase/shuttle_pad; base_turf = /turf/simulated/floor/reinforced; @@ -38724,9 +38761,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "feu" = ( @@ -38792,6 +38826,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"fsd" = ( +/obj/machinery/item_bank{ + dir = 4; + pixel_x = -28 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "fxh" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -38829,19 +38870,24 @@ /turf/simulated/wall, /area/tether/surfacebase/security/iaa/officecommon) "fzG" = ( -/turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "lifeboat1" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" }, -/area/shuttle/tether) +/obj/machinery/light/floortube, +/turf/simulated/floor/tiled, +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "fEX" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -38861,17 +38907,18 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "fJJ" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, /obj/machinery/power/terminal, /obj/structure/cable/orange, -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "fLx" = ( @@ -38900,25 +38947,20 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "fNO" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 8; - frequency = 1380; - id_tag = "tourbus_docker"; - pixel_x = 28 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, /obj/structure/closet/emergsuit_wall{ dir = 1; pixel_y = -32 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "fOj" = ( @@ -38947,9 +38989,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 }, -/turf/simulated/wall/fancy_shuttle{ +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "tourbus_windows"; + name = "Shuttle Blast Doors" + }, +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, +/turf/simulated/floor, /area/shuttle/tourbus/general) "gfg" = ( /obj/machinery/light{ @@ -39075,19 +39123,22 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "gBr" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/door/window/northleft, /obj/machinery/atmospherics/portables_connector{ dir = 4 }, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/machinery/door/window/southleft{ +/obj/machinery/alarm{ dir = 1; - req_one_access = list(19,43,67) - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + pixel_y = -28 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -39103,49 +39154,57 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) "gCZ" = ( -/obj/machinery/light/small, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/machinery/door/window/northright, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, -/obj/machinery/door/window/southright{ - dir = 1; - req_one_access = list(19,43,67) +/obj/machinery/power/terminal{ + dir = 4 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/light, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "1-4" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gHc" = ( -/obj/structure/bed/chair/bay/chair{ +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gLd" = ( -/obj/machinery/power/smes/buildable{ - charge = 500000 - }, -/obj/structure/cable{ - d2 = 8; - icon_state = "0-8" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, /obj/structure/window/reinforced{ dir = 1 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable/green{ + icon_state = "0-8" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -39166,11 +39225,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/public_garden_three) -"gQb" = ( -/turf/simulated/wall/fancy_shuttle/window{ - fancy_shuttle_tag = "tourbus" - }, -/area/shuttle/tourbus/general) "gRG" = ( /obj/structure/closet/hydrant{ pixel_x = -32 @@ -39189,9 +39243,14 @@ dir = 2; icon_state = "pipe-c" }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "gUL" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -39200,9 +39259,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "gVg" = ( @@ -39294,10 +39350,30 @@ /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_hallway) "hjt" = ( -/obj/machinery/shipsensors/fancy_shuttle, -/turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "tourbus" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/structure/table/standard, +/obj/machinery/power/apc{ + alarms_hidden = 1; + dir = 1; + name = "north bump"; + pixel_y = 28 + }, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "tourbus_windows"; + name = "window blast shields"; + pixel_y = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "hoQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -39314,7 +39390,7 @@ /obj/machinery/atmospherics/unary/engine/fancy_shuttle{ dir = 1 }, -/turf/simulated/wall/fancy_shuttle/nondense{ +/turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, /area/shuttle/tourbus/general) @@ -39490,6 +39566,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"ieh" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) "ieo" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -39592,18 +39672,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) -"ivq" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) "iFr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -39707,6 +39775,26 @@ /obj/structure/window/reinforced, /turf/simulated/wall, /area/tether/surfacebase/medical/storage) +"iUz" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/security/upperhall) "iXM" = ( /obj/structure/cable/green{ d1 = 1; @@ -39758,9 +39846,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, -/turf/simulated/wall/fancy_shuttle{ +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "tourbus_windows"; + name = "Shuttle Blast Doors" + }, +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, +/turf/simulated/floor, /area/shuttle/tourbus/general) "jrn" = ( /obj/structure/cable/green{ @@ -39787,21 +39881,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"jvK" = ( -/obj/structure/table/standard, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/obj/machinery/button/remote/blast_door{ - dir = 4; - id = "tourbus_windows"; - name = "window blast shields" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/cockpit) "jAt" = ( /obj/structure/cable/green{ d1 = 1; @@ -39866,9 +39945,17 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "jER" = ( -/turf/simulated/wall/fancy_shuttle/window{ - fancy_shuttle_tag = "tourbus" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "jFq" = ( /obj/structure/table/reinforced, @@ -40055,26 +40142,17 @@ /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "kcC" = ( -/obj/structure/fuel_port{ - pixel_x = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 6 }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) -"kdx" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/structure/fuel_port, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -40246,6 +40324,10 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +"kFE" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "kFJ" = ( /obj/structure/table/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -40397,6 +40479,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +"lli" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "llH" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -40613,7 +40705,9 @@ /turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "lifeboat1" }, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "lSv" = ( /obj/structure/cable/green{ d1 = 1; @@ -40632,14 +40726,15 @@ /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "lVB" = ( -/obj/structure/bed/chair/bay/chair{ +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ dir = 8 }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -40754,15 +40849,6 @@ }, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) -"mse" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 8 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) "mwz" = ( /obj/effect/floor_decal/corner/red{ dir = 9 @@ -40917,14 +41003,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "ndK" = ( -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/machinery/computer/shuttle_control/explore/tourbus, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "nfl" = ( @@ -40946,14 +41029,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "ngV" = ( -/obj/structure/bed/chair/bay/chair{ +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ dir = 4 }, -/obj/machinery/light/small{ - dir = 8 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -40977,15 +41061,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"nkq" = ( -/obj/machinery/computer/ship/engines{ - dir = 8 - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/cockpit) "nlf" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -41011,6 +41086,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"nnr" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/computer/ship/engines{ + dir = 8 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/cockpit) "nnY" = ( /obj/item/device/radio/intercom{ dir = 4; @@ -41035,6 +41126,16 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"nrQ" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "nsm" = ( /obj/structure/sign/painting/library_secure{ pixel_y = -30 @@ -41156,6 +41257,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"nSh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "nSq" = ( /obj/structure/bed/chair{ dir = 8 @@ -41260,6 +41371,12 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +"oqz" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/tether/surfacebase/shuttle_pad) "oqI" = ( /obj/item/weapon/stool/padded{ dir = 4 @@ -41424,6 +41541,13 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/security/iaa/officeb) +"oPE" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "oPG" = ( /obj/structure/closet/secure_closet/hos, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -41451,12 +41575,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "oSQ" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "oTr" = ( @@ -41728,17 +41851,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "pNk" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/airlock/angled_tgmc/prep/prep_delta{ - name = "cockpit"; - req_one_access = list(19,43,67) - }, /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/cable/green{ + icon_state = "2-8" }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) @@ -42138,13 +42256,33 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "rbR" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, /obj/structure/cable/orange{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) +"rdD" = ( /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/button/remote/airlock{ + desiredstate = 1; + id = "tourbus_left"; + name = "hatch bolt control"; + pixel_x = -28; + pixel_y = 4; + req_one_access = list(19,43,67); + specialfunctions = 4 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -42639,6 +42777,17 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +"sVC" = ( +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "tourbus_windows"; + name = "Shuttle Blast Doors" + }, +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/turf/simulated/floor, +/area/shuttle/tourbus/general) "sWs" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -42817,13 +42966,6 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) -"tOT" = ( -/obj/machinery/computer/ship/helm, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, -/turf/simulated/floor/tiled, -/area/shuttle/tourbus/cockpit) "tPE" = ( /obj/structure/table/reinforced, /obj/item/weapon/book/manual/security_space_law, @@ -42950,7 +43092,11 @@ /area/tether/surfacebase/public_garden_three) "uhm" = ( /obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) @@ -43054,6 +43200,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"uzl" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, +/obj/machinery/light/floortube{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "uAI" = ( /obj/structure/cable/green{ d1 = 1; @@ -43084,11 +43242,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "uLh" = ( -/obj/machinery/computer/ship/sensors, -/obj/effect/floor_decal/fancy_shuttle{ +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 4; + id = "tourbus_windows"; + name = "Shuttle Blast Doors" + }, +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor, /area/shuttle/tourbus/cockpit) "uMD" = ( /obj/machinery/hologram/holopad, @@ -43112,8 +43275,14 @@ landmark_tag = "tether_backup_low"; name = "Surface Hangar" }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat1"; + name = "lifeboat1" + }, /turf/simulated/floor/tiled, -/area/shuttle/tether) +/area/shuttle/tether{ + base_turf = /turf/simulated/floor/reinforced + }) "uWw" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -43521,6 +43690,23 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) +"wnm" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; + frequency = 1380; + id_tag = "tourbus_docker"; + pixel_x = 27; + pixel_y = 4 + }, +/turf/simulated/floor/tiled, +/area/shuttle/tourbus/general) "wob" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder{ @@ -43605,7 +43791,7 @@ /turf/simulated/wall/fancy_shuttle{ fancy_shuttle_tag = "tourbus" }, -/area/shuttle/tourbus/general) +/area/shuttle/tourbus/cockpit) "wBv" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor/glass, @@ -43674,23 +43860,16 @@ /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "wQf" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/bed/chair/shuttle{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/bed/chair/bay/chair{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" - }, /turf/simulated/floor/tiled, /area/shuttle/tourbus/general) "wQs" = ( @@ -43878,9 +44057,22 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "xtq" = ( -/turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "tourbus" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" }, +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/panic_button/small{ + pixel_x = 16; + pixel_y = -31 + }, +/turf/simulated/floor/tiled, /area/shuttle/tourbus/cockpit) "xud" = ( /obj/structure/table/rack/shelf, @@ -44051,16 +44243,22 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "xOa" = ( -/obj/structure/cable{ - d1 = 1; - d2 = 2; +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "tourbus"; + name = "tourbus" + }, +/obj/structure/cable/green{ + dir = 1; icon_state = "1-2" }, -/obj/effect/floor_decal/fancy_shuttle{ - fancy_shuttle_tag = "tourbus" +/obj/machinery/door/airlock/glass{ + name = "Tourbus Cockpit"; + req_access = null; + req_one_access = list(67) }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled, -/area/shuttle/tourbus/general) +/area/shuttle/tourbus/cockpit) "xQv" = ( /obj/structure/table/reinforced, /obj/item/weapon/folder/red_hos, @@ -44170,6 +44368,11 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/security/hos) +"ykY" = ( +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "tourbus" + }, +/area/shuttle/tourbus/general) (1,1,1) = {" aaa @@ -49455,7 +49658,7 @@ aUF xFm aDn hMw -aDn +enD akm aDi aDs @@ -49751,7 +49954,7 @@ aDT arW arW aVE -aWF +lli akn alP aac @@ -50319,7 +50522,7 @@ cAZ arW agw aVG -aWF +nSh aTO akS aly @@ -51345,7 +51548,7 @@ atV ahh auu auu -axF +axt ayr aBe afK @@ -51487,7 +51690,7 @@ atW ahh auu auu -auu +ayB ayB aBg afK @@ -51629,7 +51832,7 @@ akt ahh auu auu -axO +axv ayB aBh aBj @@ -53721,7 +53924,7 @@ bzK agg adW qAt -snE +iUz ajJ aTX aVI @@ -55191,16 +55394,16 @@ aHR awf aJn aKa -xtq -cdf -cdf +aKU cdf wyi -gQb -gQb +wyi +ykY +sVC +sVC ccN -gQb -gQb +ykY +sVC jpB gjD bbX @@ -55333,19 +55536,19 @@ aHR awf aJn aKa -cdf -cdf -jvK -cdf -kdx +aKU +wyi +wyi +hjt +wyi ngV uhm +oPE +rdD uhm -uhm -aUN fag -wyi -wyi +ykY +ykY aKU aOI aPb @@ -55475,19 +55678,19 @@ aXn aIy ats aKD -jER -tOT +aKU +uLh ddn -cdf -aUN +jER +wyi gHc -xOa -xOa -xOa -dVW +uhm +oPE +oPE +uhm wQf gBr -wyi +ykY aKU avs aKj @@ -55617,19 +55820,19 @@ aXp awf aJn aKa -jER -cUF +aKU +uLh ndK pNk xOa aXa -uhm +aXa kcC eGv -aUq +aXa fEX gCZ -wyi +ykY aKU aOI bgW @@ -55759,19 +55962,19 @@ aXu aIz aJn aKa -jER +aKU uLh oSQ -cdf -mse -mse -uhm +xtq +wyi +nrQ +nrQ gUL rbR aUx fJJ gLd -wyi +ykY aKU aOI bgW @@ -55901,19 +56104,19 @@ aIa aOJ ats ieb -cdf -cdf -nkq -cdf -ivq +aKU +wyi +wyi +nnr +wyi lVB -uhm +nrQ fcg -uhm -mse +wnm +nrQ fNO -wyi -wyi +ykY +ykY aKU aOK bgW @@ -56043,16 +56246,16 @@ aIa aIz aJn aKa -hjt -cdf -cdf -cdf +aKU +cta wyi -gQb -gQb +wyi +ykY +sVC +sVC cdv -gQb -gQb +ykY +sVC fWR gjD hpY @@ -56839,7 +57042,7 @@ bmr acR blA bmI -acR +eDc aim ake aGm @@ -56918,7 +57121,7 @@ aPu qbo bhi bhm -beU +fsd bhp beU beU @@ -57421,7 +57624,7 @@ aeG ajh avG akn -alk +eaj alk bdD ayx @@ -57593,7 +57796,7 @@ beX beX bcY bdq -bbk +eOP bbk beS lHr @@ -57892,7 +58095,7 @@ aAN aAN aJn aKU -fzG +aME aME aME aNz @@ -58065,7 +58268,7 @@ biH dyV bja biL -biL +ieh bju biF adG @@ -58178,10 +58381,10 @@ aJn aKU aMF aNa +fzG aNK aNK -aNK -aNK +uzl asj aKU abg @@ -58460,7 +58663,7 @@ arJ arJ arJ aKU -fzG +aME aME aME aME @@ -58602,13 +58805,13 @@ aKn arJ arJ aKU -aKU +oqz aKU aKU aKI aKU aKU -aKU +oqz aKU aKj aOl @@ -59442,7 +59645,7 @@ asX aLd bbU baF -asX +kFE aLd bbU bdJ diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index bb4701048b..72748da792 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -26,6 +26,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) +"cC" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/wood, +/area/tether/midpoint) "cH" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -372,6 +376,10 @@ }, /turf/simulated/floor/wood, /area/tether/midpoint) +"zr" = ( +/obj/effect/landmark/vines, +/turf/simulated/floor/wood, +/area/tether/midpoint) "zG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -8916,7 +8924,7 @@ kz Et zi pK -pK +zr pK pK pK @@ -10762,7 +10770,7 @@ kz Et Pz Or -pK +cC pK pK Tz diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index c32f3fbdc4..76a2226a6b 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -64,6 +64,39 @@ /obj/item/clothing/head/pizzaguy, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"aai" = ( +/obj/machinery/door/airlock/highsecurity{ + name = "Messaging Server"; + req_one_access = list(16,17,61) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/dark, +/area/ai_server_room) +"aaj" = ( +/obj/machinery/door/airlock/glass{ + name = "Medbus Cockpit"; + req_one_access = list(5,67) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "aak" = ( /obj/machinery/light{ dir = 8 @@ -154,8 +187,8 @@ RCon_tag = "Engine - Core"; charge = 2e+006; input_attempt = 1; - input_level = 100000; - output_level = 200000 + input_level = 200000; + output_level = 250000 }, /obj/structure/cable/cyan{ d2 = 2; @@ -870,6 +903,20 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/engine_smes) +"abJ" = ( +/obj/machinery/door/airlock/glass{ + name = "Secbus Cockpit"; + req_one_access = list(1,67) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "abK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -1972,6 +2019,26 @@ /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) +"ads" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1381; + icon_state = "door_locked"; + id_tag = "server_access_inner"; + locked = 1; + name = "Telecoms Server Access"; + req_access = list(61) + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1381; + master_tag = "server_access_airlock"; + name = "interior access button"; + pixel_x = -28; + pixel_y = 0; + req_one_access = list(61) + }, +/turf/simulated/floor/tiled/techfloor, +/area/tcommsat/chamber) "adt" = ( /obj/structure/cable/green{ d1 = 1; @@ -2256,6 +2323,29 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"adN" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + frequency = 1381; + icon_state = "door_locked"; + id_tag = "server_access_outer"; + locked = 1; + name = "Telecoms Server Access"; + req_access = list(61) + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1381; + master_tag = "server_access_airlock"; + name = "exterior access button"; + pixel_x = 0; + pixel_y = 26; + req_one_access = list(61) + }, +/turf/simulated/floor/tiled/techfloor, +/area/tcommsat/chamber) "adQ" = ( /obj/machinery/computer/power_monitor{ dir = 4; @@ -2785,6 +2875,14 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"afa" = ( +/obj/machinery/sleep_console, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "afe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled, @@ -3534,7 +3632,7 @@ dir = 8 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) @@ -5781,19 +5879,16 @@ /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) "amU" = ( -/obj/machinery/power/apc{ - alarms_hidden = 1; - name = "south bump"; - pixel_y = -28; - req_access = list(); - req_one_access = list(11,67) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/obj/structure/bed/chair/shuttle{ - dir = 4 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "medivac blast"; + name = "Shuttle Blast Doors" }, -/obj/structure/cable, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/turf/simulated/floor/plating, +/area/shuttle/medivac/cockpit) "amX" = ( /obj/structure/table/rack/shelf, /obj/item/weapon/tank/oxygen, @@ -5833,7 +5928,7 @@ dir = 8 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -6558,9 +6653,6 @@ "aoJ" = ( /turf/simulated/wall/r_wall, /area/engineering/foyer) -"aoL" = ( -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) "aoN" = ( /obj/machinery/telecomms/bus/preset_four, /turf/simulated/floor/tiled/dark{ @@ -7956,7 +8048,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8402,7 +8494,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8676,6 +8768,7 @@ dir = 4 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_two) "auY" = ( @@ -8967,7 +9060,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -8977,7 +9070,7 @@ icon_state = "comfychair_preview" }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/carpet, /area/engineering/break_room) @@ -13080,7 +13173,7 @@ "aSB" = ( /obj/structure/bed/chair/office/dark, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/engineering_monitoring) @@ -13673,21 +13766,20 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/gravity_gen) "bbl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/borderfloorwhite/corner{ dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "bbs" = ( /obj/structure/bed/chair/office/dark{ dir = 4 }, /obj/effect/landmark/start{ - name = "Station Engineer" + name = "Engineer" }, /turf/simulated/floor/tiled, /area/engineering/foyer) @@ -14060,6 +14152,13 @@ }, /turf/simulated/floor/tiled, /area/engineering/foyer) +"beU" = ( +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/medivac/general) "beY" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -14376,6 +14475,21 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/cargo) +"bnG" = ( +/obj/machinery/door/airlock/glass, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "bnI" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14413,20 +14527,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"bpd" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1381; - icon_state = "door_locked"; - id_tag = "server_access_outer"; - locked = 1; - name = "Telecoms Server Access"; - req_access = list(61) - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tcommsat/chamber) "bpi" = ( /obj/machinery/camera/network/command, /turf/simulated/floor/tiled, @@ -14458,7 +14558,7 @@ icon_state = "1-8" }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "bqj" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -14545,6 +14645,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/pilot_office) +"btm" = ( +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/medivac/engines) "btr" = ( /obj/structure/cable{ d1 = 4; @@ -15379,17 +15489,6 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/maintenance/station/exploration) -"bXn" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - frequency = 1381; - icon_state = "door_locked"; - id_tag = "server_access_inner"; - locked = 1; - name = "Telecoms Server Access"; - req_access = list(61) - }, -/turf/simulated/floor/tiled/techfloor, -/area/tcommsat/chamber) "bXv" = ( /obj/structure/cable/green{ d1 = 1; @@ -15624,6 +15723,17 @@ /obj/item/device/multitool, /turf/simulated/floor/plating, /area/storage/tech) +"cbU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "cbY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -15769,6 +15879,22 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway/prep_room) +"cic" = ( +/obj/machinery/portable_atmospherics/canister/air, +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "cii" = ( /obj/structure/closet/secure_closet/xenoarchaeologist, /turf/simulated/floor/tiled/dark, @@ -15828,8 +15954,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "cjQ" = ( @@ -15862,6 +15989,16 @@ }, /turf/space, /area/space) +"cmX" = ( +/obj/machinery/atmospherics/unary/engine/fancy_shuttle{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/securiship/engines) "cnB" = ( /obj/structure/cable/green{ d1 = 4; @@ -15994,6 +16131,24 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/storage/tech) +"cuj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "cwo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -16176,20 +16331,17 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/power) "cDk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/camera/network/tether{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -16209,6 +16361,17 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +"cDU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "cEE" = ( /turf/simulated/wall/r_wall, /area/bridge/secondary/teleporter) @@ -16295,7 +16458,7 @@ }, /obj/machinery/door/airlock/angled_tgmc{ dir = 4; - req_one_access = list(67) + req_one_access = list(19,43,67) }, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "explo" @@ -16315,7 +16478,7 @@ /area/quartermaster/belterdock) "cIa" = ( /obj/machinery/door/airlock/angled_tgmc/dropship2_pilot{ - req_one_access = list(67) + req_one_access = list(19,43,67) }, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "explo" @@ -16343,6 +16506,14 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge/secondary/teleporter) +"cMD" = ( +/obj/structure/bed/chair/bay/chair, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "cNg" = ( /obj/structure/cable/green{ d1 = 1; @@ -16370,7 +16541,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/angled_tgmc/dropship2_pilot{ - req_one_access = list(67) + req_one_access = list(19,43,67) }, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "explo" @@ -16908,25 +17079,6 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) -"dls" = ( -/obj/machinery/door/airlock/highsecurity{ - name = "Messaging Server"; - req_one_access = list(12,16,17,61) - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/dark, -/area/ai_server_room) "dnU" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -16981,6 +17133,22 @@ /obj/random/tool, /turf/simulated/floor, /area/storage/tech) +"doW" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "dqh" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 8; @@ -17228,6 +17396,18 @@ }, /turf/simulated/floor, /area/maintenance/substation/exploration) +"dAx" = ( +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "dAV" = ( /obj/structure/bed/chair/shuttle, /obj/item/device/radio/intercom{ @@ -17245,6 +17425,30 @@ }, /turf/simulated/floor, /area/tether/exploration) +"dCt" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) +"dDk" = ( +/obj/effect/fancy_shuttle/secbus{ + dir = 1; + fancy_shuttle_tag = "secbus" + }, +/obj/effect/fancy_shuttle_floor_preview/secbus{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/securiship/engines) "dDo" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -17310,7 +17514,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/angled_tgmc{ - req_one_access = list(67) + req_one_access = list(19,43,67) }, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "explo" @@ -17367,8 +17571,11 @@ /obj/effect/floor_decal/corner/red/border{ dir = 8 }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "dNn" = ( /obj/structure/cable/green{ d1 = 1; @@ -17384,7 +17591,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/effect/floor_decal/corner/red/border{ +/obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, /obj/effect/floor_decal/borderfloor/corner2{ @@ -17394,7 +17601,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "dNU" = ( /obj/machinery/firealarm{ dir = 8; @@ -17468,6 +17675,26 @@ /obj/structure/closet/secure_closet/pilot, /turf/simulated/floor/tiled, /area/tether/exploration/pilot_office) +"dRZ" = ( +/obj/machinery/power/terminal{ + dir = 4 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/obj/structure/table/standard, +/obj/item/weapon/tank/phoron, +/obj/random/medical, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "dSp" = ( /turf/simulated/wall, /area/mine/explored/upper_level) @@ -17585,6 +17812,21 @@ }, /turf/simulated/floor/reinforced, /area/tether/exploration) +"dYK" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "dYO" = ( /obj/machinery/portable_atmospherics/canister/empty, /obj/machinery/atmospherics/portables_connector, @@ -17686,6 +17928,12 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/power) +"eif" = ( +/obj/machinery/door/airlock/glass_external, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "ejF" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -17838,26 +18086,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "etg" = ( -/obj/structure/cable{ - icon_state = "4-8" +/obj/machinery/camera/network/tether{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/turf/space, +/area/space) "etY" = ( /turf/simulated/wall, /area/maintenance/station/exploration) @@ -17874,6 +18107,13 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) +"ewT" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/medivac/engines) "exi" = ( /obj/item/device/radio/intercom{ dir = 8; @@ -17906,13 +18146,22 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "eyT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/camera/network/tether{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloorwhite{ dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "ezh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, @@ -17924,7 +18173,7 @@ "eBg" = ( /obj/machinery/door/airlock/angled_tgmc{ dir = 4; - req_one_access = list(67) + req_one_access = list(19,43,67) }, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "explo" @@ -17970,7 +18219,7 @@ }, /obj/machinery/door/airlock/angled_tgmc{ dir = 4; - req_one_access = list(67) + req_one_access = list(19,43,67) }, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "explo" @@ -18177,7 +18426,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "ePh" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 4 @@ -18234,6 +18483,17 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) +"eSM" = ( +/obj/structure/bed/chair/bay/chair, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "eTo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4 @@ -18247,28 +18507,25 @@ fancy_shuttle_tag = "explo" }, /area/shuttle/excursion/general) -"eTQ" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/medivac/general) "eUE" = ( -/obj/machinery/shipsensors{ - dir = 4 +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/airless, -/area/shuttle/medivac/cockpit) +/turf/simulated/floor/plating, +/area/tether/station/dock_two) +"eVl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/securiship/engines) "eVP" = ( /obj/structure/closet/secure_closet/pilot, /obj/effect/floor_decal/borderfloor{ @@ -18454,7 +18711,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "fji" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -18494,7 +18751,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "fkj" = ( /obj/machinery/atmospherics/binary/pump/fuel, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18616,6 +18873,22 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"fpK" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "fpX" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/firealarm{ @@ -18805,9 +19078,10 @@ /turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "fyi" = ( -/turf/simulated/wall/fancy_shuttle/window{ +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "lifeboat2" }, +/turf/simulated/floor, /area/shuttle/large_escape_pod1) "fyF" = ( /obj/machinery/power/apc{ @@ -18883,6 +19157,20 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"fDY" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/holoposter{ + pixel_y = -30 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "fEF" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -19040,6 +19328,26 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"fNX" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/maintenance/common{ + name = "Engine Access"; + req_one_access = list(1,67) + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "fOn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 @@ -19250,6 +19558,19 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/hallway) +"gbm" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "gbt" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/int_door, @@ -19276,6 +19597,17 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"gbR" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "gcc" = ( /obj/machinery/status_display/supply_display{ pixel_y = -32 @@ -19286,9 +19618,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/storage) -"gcw" = ( -/turf/simulated/wall/rshull, -/area/shuttle/medivac/general) "gdu" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -19396,6 +19725,13 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"gio" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/medivac/general) "gjd" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -19553,6 +19889,18 @@ }, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) +"gmx" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) "gnc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -19628,6 +19976,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"gqN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "gsz" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 @@ -19682,6 +20049,14 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) +"gvx" = ( +/obj/machinery/door/window/brigdoor/eastleft, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "gys" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -19750,6 +20125,12 @@ }, /turf/simulated/floor/tiled/dark, /area/gateway) +"gCZ" = ( +/obj/effect/landmark{ + name = "maint_pred" + }, +/turf/simulated/floor, +/area/maintenance/station/eng_lower) "gDl" = ( /obj/machinery/light_switch{ dir = 1; @@ -19980,6 +20361,25 @@ }, /turf/simulated/floor/tiled, /area/tcommsat/computer) +"gPV" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/air, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "gTz" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -20041,12 +20441,6 @@ /obj/machinery/door/firedoor/glass, /obj/structure/grille, /obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /turf/simulated/floor/plating, /area/tether/station/dock_two) "gVL" = ( @@ -20478,6 +20872,14 @@ }, /turf/simulated/floor, /area/storage/tech) +"hnk" = ( +/obj/machinery/bodyscanner, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "hnS" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Telecomms Substation Bypass" @@ -20869,6 +21271,15 @@ /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) +"hBR" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) "hBS" = ( /obj/structure/cable/green{ d1 = 4; @@ -20932,6 +21343,11 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"hDi" = ( +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "hDB" = ( /obj/structure/cable/green{ d1 = 1; @@ -20951,6 +21367,16 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/engineering/hallway) +"hDI" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "dock_d2l"; + landmark_tag = "tether_dockarm_d2l"; + name = "Tether Dock D2L" + }, +/turf/space, +/area/space) "hDW" = ( /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 @@ -21289,20 +21715,10 @@ /area/tether/station/dock_two) "hSz" = ( /obj/effect/floor_decal/borderfloor{ - dir = 4 + dir = 1 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) @@ -21524,9 +21940,10 @@ landmark_tag = "escapepod1_station"; name = "Tether Station" }, -/turf/simulated/wall/fancy_shuttle/window{ +/obj/structure/window/fancy_shuttle{ fancy_shuttle_tag = "lifeboat2" }, +/turf/simulated/floor, /area/shuttle/large_escape_pod1) "iaf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -21607,13 +22024,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"ieY" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, -/area/tether/station/dock_two) "ifp" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 9 @@ -21742,6 +22152,44 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/cargo) +"ijG" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) +"ijM" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"imp" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) "imG" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 8 @@ -21812,6 +22260,18 @@ /obj/random/junk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"ipw" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "ipL" = ( /obj/machinery/alarm{ dir = 1; @@ -21894,6 +22354,24 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"ivC" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "ivO" = ( /obj/machinery/mineral/stacking_unit_console, /turf/simulated/wall, @@ -22072,6 +22550,22 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"iEn" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "iGo" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -22135,7 +22629,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "iJr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 @@ -22217,17 +22711,18 @@ /obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -26 +/obj/machinery/light{ + dir = 8 }, -/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "iOm" = ( @@ -22318,10 +22813,20 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "iUV" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/newscaster{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "iVf" = ( /obj/structure/shuttle/window, @@ -22333,6 +22838,25 @@ }, /turf/simulated/floor/airless, /area/shuttle/belter) +"iVi" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "iVA" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 @@ -22426,9 +22950,18 @@ /obj/machinery/door/firedoor/glass, /obj/structure/grille, /obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 4 + }, /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK" + }, /turf/simulated/floor/plating, /area/tether/station/dock_two) "iZJ" = ( @@ -22452,6 +22985,16 @@ /obj/machinery/door/airlock/maintenance/common, /turf/simulated/floor, /area/maintenance/cargo) +"jcX" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "jeL" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -22477,6 +23020,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/quartermaster/office) "jiq" = ( @@ -22506,6 +23050,25 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/storage) +"jjP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/machinery/access_button{ + command = "cycle_interior"; + frequency = 1380; + master_tag = "dock_d2a1"; + name = "interior access button"; + pixel_x = 28; + pixel_y = 26; + req_one_access = list(13) + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "jjR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -22603,33 +23166,40 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "jqN" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8; + frequency = 1380; + id_tag = "dock_d2a1_pump" }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/light/small, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "dock_d2a1_sensor"; + pixel_y = -25 }, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + frequency = 1380; + id_tag = "dock_d2a1"; + pixel_y = 28 }, -/turf/simulated/floor/plating, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled/dark, /area/tether/station/dock_two) "jqT" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - docking_controller = "dock_d2a1"; - landmark_tag = "tether_dockarm_d2a1"; - name = "Tether Dock D2A1" +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "dock_d2a1"; + name = "exterior access button"; + pixel_x = -5; + pixel_y = -26; + req_one_access = list(13) }, -/turf/space, -/area/space) +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "jsP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -22704,6 +23274,16 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"juV" = ( +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "dock_d2a1"; + landmark_tag = "tether_dockarm_d2a1"; + name = "Tether Dock D2A1" + }, +/turf/space, +/area/space) "jvg" = ( /obj/random/maintenance/medical, /obj/structure/table/rack{ @@ -22734,22 +23314,25 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "securiship_bay"; - pixel_x = -22; - pixel_y = 24 - }, -/obj/effect/floor_decal/steeldecal/steel_decals6{ - dir = 9 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "jyP" = ( /obj/structure/catwalk, /obj/machinery/firealarm{ @@ -22769,6 +23352,21 @@ /obj/machinery/camera/network/mining, /turf/simulated/floor/airless, /area/quartermaster/belterdock) +"jBN" = ( +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 4; + frequency = 1380; + id_tag = "dock_d2l"; + pixel_x = -28 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "jBW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5 @@ -22860,55 +23458,56 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d2a1"; - name = "interior access button"; - pixel_x = 28; - pixel_y = 26; - req_one_access = list(13) - }, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 4 }, +/obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "jGw" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "jHc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "jHU" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1380; - id_tag = "dock_d2a1_pump" +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/light/small, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "dock_d2a1_sensor"; - pixel_y = -25 +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 1 }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1380; - id_tag = "dock_d2a1"; - pixel_y = 28 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/steeldecal/steel_decals7, +/obj/machinery/alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "jJo" = ( /obj/structure/handrail, @@ -22924,6 +23523,18 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"jJE" = ( +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "medivac blast"; + name = "Shuttle Blast Doors" + }, +/turf/simulated/floor/plating, +/area/shuttle/medivac/general) "jJU" = ( /obj/effect/floor_decal/borderfloor{ dir = 6 @@ -22936,6 +23547,25 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/tether/station/dock_one) +"jLk" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -26 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "jLA" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -22958,6 +23588,14 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"jOl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "jOH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -23013,18 +23651,23 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "jRG" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "dock_d2a1"; - name = "exterior access button"; - pixel_x = -5; - pixel_y = -26; - req_one_access = list(13) +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/dark, +/obj/machinery/disposal, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "jRT" = ( /obj/effect/fancy_shuttle/lifeboat2{ @@ -23486,6 +24129,19 @@ fancy_shuttle_tag = "explo" }, /area/shuttle/excursion/cargo) +"kiN" = ( +/obj/structure/fuel_port{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "kjA" = ( /obj/structure/cable{ d1 = 4; @@ -23507,6 +24163,9 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "kkH" = ( @@ -23526,14 +24185,15 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) "klo" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "klO" = ( /obj/effect/floor_decal/industrial/warning/corner, @@ -23664,12 +24324,10 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "kok" = ( -/obj/machinery/shipsensors{ - dir = 1 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" }, -/obj/effect/floor_decal/industrial/warning/full, -/turf/simulated/floor/airless, -/area/shuttle/securiship/cockpit) +/area/shuttle/securiship/general) "koo" = ( /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/conveyor_switch/oneway{ @@ -23695,6 +24353,10 @@ }, /turf/simulated/floor/airless, /area/ai_monitored/storage/eva) +"kpK" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/tether/exploration/crew) "kqW" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -23747,6 +24409,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/quartermaster/qm) +"kuo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "kvF" = ( /obj/machinery/shower{ pixel_y = 16 @@ -23822,8 +24488,16 @@ /turf/simulated/shuttle/floor/yellow, /area/shuttle/mining_outpost/shuttle) "kyb" = ( -/turf/simulated/wall/rshull, -/area/shuttle/securiship/cockpit) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "securiship blast"; + name = "Shuttle Blast Doors" + }, +/turf/simulated/floor/plating, +/area/shuttle/securiship/general) "kyd" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -23836,22 +24510,12 @@ /turf/simulated/floor/tiled, /area/tcommsat/computer) "kzv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "securiship blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/securiship/cockpit) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "kzY" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -23959,6 +24623,20 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"kEt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "kEI" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -23997,8 +24675,11 @@ name = "\improper Telecomms Solar Field" }) "kIc" = ( -/turf/simulated/wall/rshull, -/area/shuttle/securiship/general) +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "kIj" = ( /obj/effect/landmark/map_data/virgo3b, /turf/space, @@ -24080,6 +24761,20 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"kKe" = ( +/obj/structure/bed/chair/shuttle{ + dir = 8 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "kKh" = ( /obj/structure/table/woodentable, /obj/item/weapon/pen, @@ -24090,11 +24785,10 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "kKj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 6 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/general) +/area/shuttle/securiship/engines) "kKF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/landmark/start{ @@ -24103,13 +24797,12 @@ /turf/simulated/floor/tiled, /area/storage/tools) "kKY" = ( -/obj/effect/floor_decal/industrial/warning/full, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 8 +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, -/obj/effect/map_helper/airlock/atmos/pump_out_external, -/turf/simulated/floor/airless, -/area/shuttle/securiship/general) +/area/shuttle/securiship/engines) "kLG" = ( /obj/random/junk, /turf/simulated/floor, @@ -24231,6 +24924,7 @@ dir = 10 }, /obj/item/device/radio/beacon, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "kOF" = ( @@ -24289,12 +24983,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"kPX" = ( -/obj/machinery/computer/ship/helm{ - req_one_access = list(67,58) - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) "kQQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -24347,6 +25035,19 @@ /obj/structure/table/gamblingtable, /turf/simulated/floor/wood/broken, /area/maintenance/station/cargo) +"kTK" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "kUL" = ( /obj/effect/floor_decal/borderfloor{ dir = 9 @@ -24478,6 +25179,13 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/crew) +"kXu" = ( +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "kXF" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment, @@ -24617,19 +25325,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) -"ldE" = ( -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) -"let" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/machinery/atmospherics/portables_connector/aux, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "lfI" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -24660,6 +25355,25 @@ }, /turf/simulated/floor, /area/maintenance/substation/civilian) +"lhv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "lhz" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -24683,10 +25397,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"liG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/general) "liM" = ( /obj/structure/cable/green{ d1 = 1; @@ -24815,6 +25525,14 @@ /obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) +"lof" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "loz" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -24832,7 +25550,7 @@ dir = 10 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "loT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -24898,6 +25616,15 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) +"lsw" = ( +/obj/structure/table/rack, +/obj/item/weapon/handcuffs, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "luK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -24950,6 +25677,25 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) +"lvZ" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "dock_d2l_pump" + }, +/obj/machinery/airlock_sensor{ + frequency = 1380; + id_tag = "dock_d2l_sensor"; + pixel_x = -30; + pixel_y = 8 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "lwa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ dir = 8 @@ -25142,6 +25888,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/camera/network/tether{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lAt" = ( @@ -25179,20 +25928,36 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"lCQ" = ( -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +"lCR" = ( +/obj/machinery/power/terminal{ dir = 8 }, /obj/structure/cable/green{ - icon_state = "4-8" + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/table/standard, +/obj/item/weapon/tank/phoron, +/obj/random/tool, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/obj/structure/fuel_port{ + pixel_y = 32 }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/shuttle/securiship/engines) +"lEm" = ( +/obj/structure/bed/chair/bay/chair{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "lEt" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 5; @@ -25224,12 +25989,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/light, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lFU" = ( @@ -25271,6 +26032,9 @@ name = "south bump"; pixel_y = -32 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lGY" = ( @@ -25378,6 +26142,25 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) +"lJl" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "lJN" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -25422,6 +26205,12 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) +"lKA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "lLp" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/map_helper/airlock/door/int_door, @@ -25539,8 +26328,31 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"lNb" = ( +/obj/structure/bed/chair/shuttle{ + dir = 1 + }, +/obj/structure/sign/nosmoking_1{ + pixel_x = 32 + }, +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "lNz" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -25570,6 +26382,11 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lPD" = ( @@ -25608,6 +26425,24 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"lRe" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "lSs" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -25716,12 +26551,18 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lWx" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lYw" = ( @@ -25740,22 +26581,11 @@ /turf/simulated/floor/tiled, /area/tether/exploration/hallway) "lYR" = ( -/obj/structure/disposalpipe/trunk{ +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, -/obj/machinery/disposal, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 6 - }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "lZz" = ( @@ -25816,12 +26646,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) -"mbN" = ( -/obj/machinery/computer/ship/engines{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) "mdh" = ( /obj/structure/cable/green{ d1 = 2; @@ -25886,36 +26710,6 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/equipment) -"mgU" = ( -/obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 1 - }, -/obj/machinery/button/remote/blast_door{ - id = "securiship blast"; - name = "Shuttle Blast Doors"; - pixel_x = -28; - pixel_y = 28; - req_access = list(67) - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) -"mim" = ( -/obj/machinery/computer/ship/sensors{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) -"mjc" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/structure/closet/emergsuit_wall{ - pixel_x = 27 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "mkL" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -25939,72 +26733,17 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/engineering/engineering_airlock) -"mnd" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux{ - dir = 1 - }, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 4; - frequency = 1380; - id_tag = "securiship_docker"; - pixel_x = -28 - }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/obj/machinery/airlock_sensor{ - pixel_y = 28 - }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - docking_controller = "securiship_bay"; - landmark_tag = "tether_securiship_dock"; - name = "Securiship Dock" - }, -/obj/effect/overmap/visitable/ship/landable/securiship, -/turf/simulated/floor/tiled/eris/techmaint_cargo, -/area/shuttle/securiship/general) "mnj" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/maintenance/station/cargo) "mnt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, /area/tether/station/dock_two) -"mnv" = ( -/obj/machinery/door/airlock/glass_external, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/securiship/general) "mnT" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -26032,16 +26771,6 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/cargo) -"mou" = ( -/obj/machinery/door/airlock/glass_external, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/map_helper/airlock/door/simple, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "mpB" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ @@ -26245,19 +26974,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"myi" = ( -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -28 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) "myq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -26318,11 +27034,9 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/machinery/camera/network/tether{ - dir = 1 - }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/light, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "mAd" = ( @@ -26364,6 +27078,13 @@ }, /turf/simulated/wall/r_wall, /area/maintenance/substation/civilian) +"mBL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/hallway/station/docks) "mBY" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -26379,14 +27100,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/qm) -"mCt" = ( -/obj/structure/cable/cyan{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) "mCI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -26462,31 +27175,6 @@ /area/tcomsat{ name = "\improper Telecomms Lobby" }) -"mFp" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/cockpit) -"mFw" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 24 - }, -/obj/structure/cable/cyan{ - d2 = 2; - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "mFS" = ( /obj/structure/plasticflaps, /obj/structure/window/reinforced{ @@ -26539,18 +27227,25 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"mIR" = ( +"mIV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 6 + }, /obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" + icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume/aux, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/machinery/light/small{ - dir = 8 +/obj/structure/cable{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/eris/techmaint_cargo, -/area/shuttle/securiship/general) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "mJd" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -26636,21 +27331,6 @@ /obj/machinery/camera/network/command, /turf/simulated/floor/tiled/dark, /area/gateway) -"mNy" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 4; - pixel_y = -28 - }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/securiship/general) -"mNU" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "mOz" = ( /obj/machinery/firealarm{ dir = 4; @@ -26676,7 +27356,7 @@ dir = 5 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "mOV" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -26715,11 +27395,20 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "mQh" = ( -/obj/effect/floor_decal/steeldecal/steel_decals6{ +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "mQR" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -26741,6 +27430,13 @@ /obj/machinery/computer/timeclock/premade/south, /turf/simulated/floor/tiled, /area/storage/tools) +"mRq" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/securiship/general) "mRU" = ( /obj/structure/shuttle/engine/propulsion{ dir = 1; @@ -26769,31 +27465,24 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_two) "mUp" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/turf/simulated/floor/tiled, +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, /area/tether/station/dock_two) "mUD" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "mVB" = ( @@ -26826,6 +27515,36 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"mWA" = ( +/obj/machinery/door/airlock/glass_external, +/obj/machinery/access_button{ + command = "cycle_exterior"; + frequency = 1380; + master_tag = "dock_d2l"; + name = "exterior access button"; + pixel_x = -28; + pixel_y = -6; + req_one_access = list(13) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"mXh" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; + icon_state = "space"; + layer = 4; + name = "EXTERNAL AIRLOCK" + }, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) "mYJ" = ( /obj/machinery/suit_cycler/exploration, /obj/effect/floor_decal/borderfloor{ @@ -26895,7 +27614,7 @@ fancy_shuttle_tag = "explo" }, /obj/machinery/door/airlock/angled_tgmc{ - req_one_access = list(67) + req_one_access = list(19,43,67) }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) @@ -26964,14 +27683,26 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"ncX" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +"ncN" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) +"ncX" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "ndU" = ( /obj/machinery/atmospherics/pipe/simple/hidden, @@ -26998,13 +27729,19 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "nfp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "ngr" = ( /obj/effect/floor_decal/industrial/warning{ @@ -27038,35 +27775,27 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) "ngU" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = "dock_d2l_pump" +/obj/structure/cable/green{ + icon_state = "1-8" }, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "dock_d2l_sensor"; - pixel_x = -30; - pixel_y = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 - }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "nhA" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = "dock_d2l_pump" +/obj/effect/floor_decal/borderfloor/corner{ + dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/effect/floor_decal/corner/red/bordercorner{ + dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "nhL" = ( /obj/machinery/sleeper{ @@ -27077,15 +27806,6 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/excursion/general) -"nio" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "njY" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -27267,17 +27987,8 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "nrh" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "dock_d2l"; - name = "exterior access button"; - pixel_x = -28; - pixel_y = -6; - req_one_access = list(13) - }, -/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "nrQ" = ( @@ -27285,9 +27996,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"nst" = ( -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "nsz" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -27306,40 +28014,34 @@ }, /turf/simulated/floor, /area/maintenance/substation/civilian) -"ntd" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "ntt" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/structure/sign/directions/security{ + dir = 4; + pixel_y = -32 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/sign/securearea{ - desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; - icon_state = "space"; - layer = 4; - name = "EXTERNAL AIRLOCK" - }, -/turf/simulated/floor/plating, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) -"nvu" = ( -/obj/effect/shuttle_landmark{ - base_area = /area/space; - base_turf = /turf/space; - docking_controller = "dock_d2l"; - landmark_tag = "tether_dockarm_d2l"; - name = "Tether Dock D2L" +"ntS" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "securiship_docker_pump_out_external" }, -/turf/space, -/area/space) +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/securiship/engines) +"nvu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "nvM" = ( /obj/machinery/light{ dir = 4 @@ -27368,18 +28070,30 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) -"nym" = ( -/obj/machinery/light{ - dir = 4 +"nyq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 }, -/obj/structure/cable/cyan{ +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) + }, +/obj/structure/cable{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "nyL" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -27402,21 +28116,35 @@ /obj/effect/floor_decal/corner/brown/bordercorner2, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"nAr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/securiship/engines) +"nAx" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "nAA" = ( /turf/simulated/floor/tiled/techmaint, /area/tcomfoyer{ name = "\improper Telecomms Storage" }) -"nBA" = ( -/obj/machinery/door/airlock/glass_external, -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/securiship/general) "nCa" = ( /obj/structure/table/rack{ dir = 8; @@ -27476,7 +28204,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "nDW" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -27529,7 +28257,7 @@ }, /obj/effect/floor_decal/steeldecal/steel_decals6, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "nFA" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -27704,12 +28432,6 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) -"nOT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 10 - }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) "nPQ" = ( /obj/structure/grille, /obj/machinery/door/firedoor/glass, @@ -27769,54 +28491,6 @@ /obj/effect/overmap/visitable/sector/virgo3b, /turf/space, /area/space) -"nTL" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+006 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 2; - icon_state = "pdoor0"; - id = "securiship blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/securiship/general) -"nUp" = ( -/obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) -"nUY" = ( -/obj/structure/cable/cyan{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) -"nWj" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 5 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "nWo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 @@ -27826,16 +28500,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"nXm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 8 - }, -/obj/machinery/airlock_sensor{ - pixel_y = 28 - }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "nYi" = ( /obj/machinery/mineral/equipment_vendor/survey, /obj/effect/floor_decal/fancy_shuttle{ @@ -27849,33 +28513,6 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) -"nYL" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/aux{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) -"nZc" = ( -/obj/structure/grille, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 2; - icon_state = "pdoor0"; - id = "securiship blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating, -/area/shuttle/securiship/general) "nZC" = ( /obj/machinery/door/airlock/glass_command{ id_tag = "evadoors"; @@ -27977,13 +28614,6 @@ "oer" = ( /turf/simulated/wall, /area/tether/exploration/pathfinder_office) -"ofa" = ( -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/bed/chair/bay/chair, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) "ofV" = ( /obj/structure/table/standard, /obj/item/weapon/paper/rogueminer, @@ -28033,6 +28663,10 @@ }, /turf/simulated/floor, /area/maintenance/cargo) +"ohH" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/quartermaster/storage) "ohT" = ( /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, @@ -28065,25 +28699,6 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) -"oiK" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/bed/chair/bay/chair, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) -"ojn" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/bed/chair/bay/chair/padded/beige, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "okq" = ( /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 @@ -28097,13 +28712,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"olN" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "omi" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28114,13 +28722,6 @@ }, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) -"omt" = ( -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) -"onE" = ( -/obj/machinery/door/window/brigdoor/eastleft, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) "ops" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28135,12 +28736,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"oqg" = ( -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/securiship/general) "oqq" = ( /obj/effect/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -28149,41 +28744,21 @@ /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"orh" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/table/rack/shelf, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/securiship/general) "ort" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/station/atrium) -"orF" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +"orD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/obj/structure/table/rack/shelf, -/obj/machinery/alarm{ - breach_detection = 0; - dir = 8; - pixel_x = 25; - rcon_setting = 3; - report_danger_level = 0 +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/securiship/general) -"orK" = ( -/obj/structure/bed/chair/bay/chair{ - dir = 1 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) +/area/shuttle/medivac/engines) "orN" = ( /obj/structure/table/rack{ dir = 8; @@ -28221,21 +28796,10 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "osM" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ - dir = 4 +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" }, -/obj/machinery/door/blast/regular{ - density = 0; - icon_state = "pdoor0"; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - opacity = 0 - }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/medivac/cockpit) +/area/shuttle/securiship/cockpit) "osY" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor, @@ -28279,15 +28843,6 @@ }, /turf/simulated/floor, /area/maintenance/substation/civilian) -"owo" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/bed/chair/bay/chair{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/securiship/general) "owQ" = ( /obj/structure/table/steel, /obj/item/weapon/module/power_control, @@ -28300,12 +28855,6 @@ }, /turf/simulated/floor, /area/storage/tech) -"owZ" = ( -/obj/structure/bed/chair/bay/chair/padded/beige{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/securiship/general) "oxa" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; @@ -28514,6 +29063,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"oRf" = ( +/obj/machinery/camera/network/tether{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, +/obj/structure/flora/pottedplant/stoutbush, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "oRC" = ( /obj/machinery/light/small{ dir = 8 @@ -28573,6 +29141,16 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) +"oTR" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "oUP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -28588,12 +29166,6 @@ /obj/machinery/door/firedoor/border_only, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/delivery) -"oWk" = ( -/obj/machinery/computer/shuttle_control/explore/securiship{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/securiship/general) "oWu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28801,17 +29373,26 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) -"pjb" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait{ - req_one_access = list(1,67) +"pjJ" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/securiship/engines) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/machinery/item_bank{ + dir = 8; + pixel_x = 28 + }, +/turf/simulated/floor/tiled, +/area/hallway/station/atrium) "plm" = ( /obj/machinery/camera/network/exploration{ dir = 1 @@ -28876,6 +29457,16 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) +"pnm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "pny" = ( /turf/simulated/wall/r_wall, /area/tether/exploration) @@ -28928,12 +29519,12 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"pqB" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" +"psE" = ( +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, -/turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/engines) "ptc" = ( /obj/machinery/smartfridge/sheets/persistent_lossy, @@ -28985,6 +29576,11 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/crew) +"pye" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/sign/dock/two, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "pyy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29073,23 +29669,17 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "pEg" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "secbus" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 4; + id = "securiship blast"; + name = "Shuttle Blast Doors" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 10 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/turf/simulated/floor/plating, +/area/shuttle/securiship/cockpit) "pFY" = ( /obj/structure/cable{ d1 = 1; @@ -29241,9 +29831,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/holoposter{ - pixel_y = -30 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -29279,6 +29866,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/atrium) +"pSO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "pSR" = ( /obj/structure/table/reinforced, /obj/item/device/assembly/signaler, @@ -29317,14 +29910,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"pYh" = ( -/obj/machinery/power/smes/buildable/point_of_interest, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qad" = ( /obj/structure/bed/chair/office/dark, /obj/structure/cable/green{ @@ -29348,6 +29933,16 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/cargo) +"qaA" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/danger{ + dir = 1 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled/monotile, +/area/tether/exploration) "qbk" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod{ frequency = 1380; @@ -29360,23 +29955,6 @@ }, /turf/simulated/floor/tiled, /area/shuttle/large_escape_pod1) -"qbm" = ( -/obj/structure/cable/cyan{ - d2 = 8; - icon_state = "0-8" - }, -/obj/structure/cable/cyan{ - d2 = 4; - icon_state = "0-4" - }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qcg" = ( /obj/machinery/camera/network/telecom, /obj/structure/cable/yellow{ @@ -29401,6 +29979,9 @@ name = "Emergency NanoMed"; pixel_y = 30 }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "lifeboat2" + }, /turf/simulated/floor/tiled, /area/shuttle/large_escape_pod1) "qdy" = ( @@ -29413,6 +29994,7 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 }, +/obj/effect/landmark/vines, /turf/simulated/floor/tiled, /area/hallway/station/atrium) "qdG" = ( @@ -29439,14 +30021,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"qfg" = ( -/obj/structure/cable/cyan{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qfA" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, @@ -29461,16 +30035,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/maintenance/cargo) -"qgB" = ( -/obj/structure/cable/green{ - dir = 1; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qgR" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -29484,25 +30048,20 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/tether/station/dock_two) -"qhy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qiw" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor, /area/maintenance/cargo) -"qiQ" = ( -/obj/machinery/atmospherics/portables_connector/fuel{ - dir = 8 +"qiZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 }, -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/outline/red, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "qjn" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -29536,6 +30095,9 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "qlt" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -29548,13 +30110,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qmD" = ( @@ -29759,12 +30314,6 @@ /obj/random/maintenance/cargo, /turf/simulated/floor, /area/maintenance/cargo) -"qrY" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/turf/simulated/floor/airless, -/area/shuttle/securiship/engines) "qsp" = ( /obj/structure/cable{ d1 = 1; @@ -29792,11 +30341,20 @@ }, /area/tcommsat/chamber) "qtf" = ( -/obj/machinery/body_scanconsole{ - dir = 4 +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "qum" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -29842,37 +30400,6 @@ /obj/item/device/radio/beacon, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"qvS" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable/green{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/table/standard, -/obj/item/weapon/tank/phoron, -/obj/structure/panic_button{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) -"qxn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) -"qyI" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/fuel_port{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qzo" = ( /obj/structure/table/rack, /obj/item/clothing/mask/breath, @@ -29882,16 +30409,6 @@ /obj/machinery/door/window/brigdoor, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"qAY" = ( -/obj/machinery/light, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/machinery/atmospherics/binary/pump/fuel, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qBP" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -30002,16 +30519,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) -"qFq" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -22 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor_grid, -/area/shuttle/securiship/engines) "qGn" = ( /obj/structure/table/rack{ dir = 8; @@ -30081,6 +30588,10 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/foyer) +"qKp" = ( +/obj/effect/landmark/vermin, +/turf/simulated/floor/tiled, +/area/engineering/gravity_gen) "qKr" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -30304,20 +30815,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/effect/floor_decal/borderfloorwhite/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qXe" = ( @@ -30346,11 +30852,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite/corner, -/obj/effect/floor_decal/corner/paleblue/bordercorner, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/machinery/holoposter{ + pixel_y = -30 + }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qYW" = ( @@ -30363,12 +30872,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "qZs" = ( @@ -30467,6 +30972,17 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"riB" = ( +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "medivac blast"; + name = "Shuttle Blast Doors" + }, +/turf/simulated/floor/plating, +/area/shuttle/medivac/general) "riO" = ( /obj/structure/cable/green{ d1 = 1; @@ -30499,6 +31015,14 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor, /area/storage/emergency_storage/emergency4) +"rkl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 4 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "rkH" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -30518,12 +31042,6 @@ /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, /area/quartermaster/office) -"rlP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 6 - }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) "rnM" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -30565,6 +31083,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_grid, /area/tether/station/dock_two) +"rqA" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "rqP" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -30579,12 +31108,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"rqZ" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{ - dir = 1 - }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) "rrk" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -30608,46 +31131,24 @@ /turf/simulated/floor/tiled, /area/quartermaster/foyer) "rsp" = ( -/obj/effect/floor_decal/borderfloorwhite{ +/obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 8 +/obj/machinery/computer/ship/helm, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 10 - }, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - dir = 4; - frequency = 1380; - id_tag = "medivac_bay"; - pixel_x = -28 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "rsL" = ( -/obj/effect/floor_decal/borderfloorwhite{ - dir = 4 +/obj/machinery/computer/shuttle_control/explore/securiship, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/floor_decal/corner/paleblue/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorwhite/corner2{ - dir = 5 - }, -/obj/effect/floor_decal/corner/paleblue/bordercorner2{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "rtP" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 10 @@ -30876,22 +31377,38 @@ /turf/simulated/floor/tiled/white, /area/tether/station/dock_two) "rIA" = ( -/obj/machinery/door/airlock/glass_external, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/light{ + dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/simple, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) +/obj/machinery/computer/ship/sensors, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "rJe" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/simple, -/turf/simulated/floor/tiled/white, -/area/tether/station/dock_two) +/obj/machinery/computer/ship/helm, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) +"rKa" = ( +/obj/structure/bed/chair/shuttle, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "rKK" = ( /obj/structure/bed/chair/shuttle{ dir = 1 @@ -30931,6 +31448,17 @@ "rMb" = ( /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) +"rOH" = ( +/obj/structure/bed/chair/shuttle, +/obj/structure/closet/emergsuit_wall{ + pixel_y = 32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "rOV" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -31081,7 +31609,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/angled_tgmc{ - req_one_access = list(67) + req_one_access = list(19,43,67) }, /obj/effect/floor_decal/fancy_shuttle{ fancy_shuttle_tag = "explo" @@ -31105,8 +31633,13 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "rWS" = ( -/turf/simulated/wall/rshull, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/obj/machinery/computer/shuttle_control/explore/medivac, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "rXf" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/light{ @@ -31123,9 +31656,16 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "rXo" = ( -/obj/structure/sign/redcross, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/engines) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + id = "securiship blast"; + name = "Shuttle Blast Doors" + }, +/turf/simulated/floor/plating, +/area/shuttle/securiship/cockpit) "rXp" = ( /obj/machinery/conveyor_switch/oneway{ id = "packageSort1" @@ -31170,20 +31710,16 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "rYx" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 5; - pixel_x = -28 +/obj/structure/table/standard, +/obj/machinery/recharger{ + pixel_y = 2 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/general) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "saf" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -31253,14 +31789,33 @@ }, /turf/simulated/floor/tiled, /area/engineering/hallway) +"sbe" = ( +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/medivac/engines) "scu" = ( /turf/simulated/wall/r_wall, /area/tether/exploration/crew) "scB" = ( -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/general) +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/structure/table/standard, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "securiship blast"; + name = "window blast shields"; + pixel_y = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "scE" = ( /obj/structure/disposalpipe/segment, /obj/structure/bed/chair/office/dark{ @@ -31268,12 +31823,6 @@ }, /turf/simulated/floor/wood, /area/quartermaster/qm) -"sdi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 8 - }, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) "seg" = ( /obj/machinery/firealarm{ dir = 1; @@ -31286,22 +31835,15 @@ /turf/simulated/floor/tiled, /area/tether/station/dock_one) "seP" = ( -/obj/structure/grille, -/obj/machinery/door/firedoor/glass, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced{ +/obj/structure/bed/chair/bay/comfy/blue{ dir = 1 }, -/obj/machinery/door/blast/regular{ - density = 0; - dir = 4; - icon_state = "pdoor0"; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - opacity = 0 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/turf/simulated/floor/plating/eris/under, -/area/shuttle/medivac/general) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "seR" = ( /turf/simulated/wall/r_wall, /area/quartermaster/belterdock) @@ -31395,6 +31937,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) +"smd" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common{ + name = "Engine Access"; + req_one_access = list(5,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "sme" = ( /obj/machinery/atmospherics/portables_connector{ dir = 4 @@ -31483,25 +32044,37 @@ /turf/simulated/floor/plating, /area/tether/station/dock_one) "suH" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/machinery/atmospherics/portables_connector{ - dir = 4 +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/obj/effect/floor_decal/industrial/outline/grey, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "svP" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 +/obj/machinery/power/apc{ + alarms_hidden = 1; + dir = 1; + name = "north bump"; + pixel_y = 28 }, +/obj/structure/table/standard, /obj/structure/cable{ - icon_state = "2-4" + d2 = 4; + icon_state = "0-4" }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "medivac blast"; + name = "window blast shields"; + pixel_y = 1; + req_access = null + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "svZ" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 @@ -31519,12 +32092,23 @@ /turf/simulated/floor, /area/maintenance/substation/cargo) "swH" = ( -/obj/machinery/power/smes/buildable/point_of_interest, -/obj/structure/cable{ - icon_state = "0-8" +/obj/structure/panic_button/small{ + pixel_x = 16; + pixel_y = -31 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/structure/bed/chair/bay/comfy/blue{ + dir = 1 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "sxj" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, @@ -31572,9 +32156,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) -"sDE" = ( -/turf/simulated/wall/rshull, -/area/shuttle/medivac/cockpit) "sDH" = ( /obj/machinery/light{ dir = 8 @@ -31617,30 +32198,20 @@ /turf/simulated/floor/tiled, /area/hallway/station/docks) "sFB" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume, -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - cycle_to_external_air = 1; - dir = 4; - frequency = 1380; - id_tag = "medivac_docker"; - pixel_x = -28 +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 }, -/obj/effect/shuttle_landmark{ - base_area = /area/mine/explored/upper_level; - base_turf = /turf/simulated/floor/airless; - docking_controller = "medivac_bay"; - landmark_tag = "tether_medivac_dock"; - name = "Medivac Bay" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 8 }, -/obj/effect/overmap/visitable/ship/landable/medivac, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "sFI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -31679,21 +32250,20 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "sHo" = ( -/obj/machinery/airlock_sensor{ - pixel_x = 28 +/obj/effect/floor_decal/borderfloor{ + dir = 4 }, -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1380; - id_tag = "medivac_docker_pump_out_internal" +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, -/turf/simulated/floor/tiled/eris/steel/gray_perforated, -/area/shuttle/medivac/general) -"sHX" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/fuel, -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "sIo" = ( /obj/structure/table/reinforced, /obj/item/clothing/head/welding, @@ -31740,20 +32310,31 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "sJw" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 +/obj/machinery/power/apc{ + name = "south bump"; + nightshift_setting = 2; + pixel_y = -28 }, -/obj/structure/closet/emergsuit_wall{ - pixel_y = 32 +/obj/structure/cable{ + icon_state = "0-4" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/machinery/light, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "sJM" = ( -/obj/machinery/sleep_console{ - dir = 4 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "sKm" = ( /obj/structure/cable{ d1 = 4; @@ -31792,11 +32373,20 @@ /turf/simulated/shuttle/floor/yellow/airless, /area/shuttle/belter) "sLs" = ( -/obj/machinery/sleeper{ - dir = 4 +/obj/structure/panic_button/small{ + pixel_x = 16; + pixel_y = -31 }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/structure/closet/emergsuit_wall{ + dir = 1; + pixel_y = -32 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "sLH" = ( /obj/structure/lattice, /obj/structure/disposalpipe/segment{ @@ -31861,6 +32451,14 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"sOn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 6 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "sPJ" = ( /obj/structure/table/reinforced, /obj/item/stack/material/plasteel{ @@ -31921,6 +32519,20 @@ /area/tcommsat/entrance{ name = "\improper Telecomms Entrance" }) +"sUt" = ( +/obj/effect/fancy_shuttle/medbus{ + dir = 1; + fancy_shuttle_tag = "medbus" + }, +/obj/effect/fancy_shuttle_floor_preview/medbus{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/medivac/engines) "sUY" = ( /turf/simulated/floor/reinforced, /area/tether/exploration) @@ -32023,23 +32635,15 @@ /turf/simulated/wall/r_wall, /area/ai_monitored/storage/eva) "tbT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) -"tbV" = ( -/obj/machinery/power/terminal{ +/obj/machinery/computer/ship/engines{ dir = 1 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/cockpit) "tcS" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -32050,15 +32654,9 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "tda" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/medivac/general) "tde" = ( /obj/structure/grille, @@ -32079,19 +32677,25 @@ /turf/simulated/floor/plating, /area/tether/station/dock_one) "tdt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/general) -"ter" = ( -/obj/structure/bed/chair/shuttle{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/eris/white, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) +"ter" = ( +/obj/machinery/door/window/brigdoor/northleft{ + dir = 4; + req_access = list(5) + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/medivac/general) "teI" = ( /obj/effect/floor_decal/industrial/warning/corner, @@ -32121,25 +32725,38 @@ /turf/simulated/floor/tiled, /area/tether/exploration/equipment) "tgl" = ( -/obj/structure/window/reinforced{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6 }, -/obj/machinery/power/apc{ - alarms_hidden = 1; - dir = 1; - name = "north bump"; - pixel_y = 28; - req_access = list(); - req_one_access = list(11,67) - }, -/obj/structure/table/glass, -/obj/machinery/recharger, /obj/structure/cable{ - d2 = 2; - icon_state = "0-2" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) +"tgr" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "tht" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -32177,9 +32794,26 @@ }, /area/shuttle/excursion/cargo) "tiN" = ( -/obj/machinery/computer/ship/engines, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) +"tjZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "tkb" = ( /obj/structure/cable/green{ d1 = 4; @@ -32356,6 +32990,13 @@ }, /turf/simulated/floor, /area/maintenance/cargo) +"tqu" = ( +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/securiship/general) "trn" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -32386,7 +33027,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "tts" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -32453,6 +33094,15 @@ /area/tether/outpost/solars_outside{ name = "\improper Telecomms Solar Field" }) +"txI" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/station/dock_two) "tyi" = ( /obj/structure/railing{ dir = 8 @@ -32469,11 +33119,36 @@ /turf/space, /area/space) "tAQ" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 4 +/obj/effect/shuttle_landmark{ + base_area = /area/mine/explored/upper_level; + base_turf = /turf/simulated/floor/airless; + docking_controller = "medivac_bay"; + landmark_tag = "tether_medivac_dock"; + name = "Medivac Bay" }, -/turf/simulated/floor/airless, -/area/shuttle/medivac/engines) +/obj/effect/overmap/visitable/ship/landable/medivac, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 8 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "medivac_docker"; + pixel_y = 27 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "tBl" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/borderfloor{ @@ -32495,35 +33170,31 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock) "tBt" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/engines) +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 5; + pixel_y = 28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "tBN" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 8; - name = "west bump"; - pixel_x = -30; - req_access = list(); - req_one_access = list(11,67) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/simple, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 10 - }, -/obj/item/weapon/tank/phoron, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "tCA" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -32555,21 +33226,30 @@ /turf/simulated/floor, /area/maintenance/station/eng_lower) "tCZ" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloorwhite/corner2{ dir = 4 }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/effect/floor_decal/corner/paleblue/bordercorner2{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 4; + frequency = 1380; + id_tag = "medivac_bay"; + pixel_x = -24; + pixel_y = 26 + }, +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "tFR" = ( /obj/random/junk, /obj/random/junk, @@ -32591,37 +33271,63 @@ }, /area/tcommsat/chamber) "tGs" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/effect/floor_decal/borderfloorwhite{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/border{ + dir = 1 }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "tGB" = ( +/obj/effect/floor_decal/borderfloorwhite/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/paleblue/bordercorner{ + dir = 1 + }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9 +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) +"tGO" = ( +/obj/machinery/power/apc{ + name = "south bump"; + pixel_y = -28; + req_access = list(); + req_one_access = list(11,67) }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tGV" = ( -/obj/machinery/airlock_sensor{ - pixel_x = 28; - pixel_y = 28 +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 5 +/obj/effect/floor_decal/corner/red/border{ + dir = 1 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "tHd" = ( /obj/structure/railing{ dir = 1 @@ -32648,11 +33354,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "tIb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/effect/map_helper/airlock/door/simple, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/machinery/door/airlock/glass_external, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "tIc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -32667,17 +33376,22 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "tIw" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/blue{ - dir = 4 +/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ + dir = 5; + pixel_y = 28 }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/sensor/ext_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tIJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, @@ -32698,32 +33412,48 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "tKI" = ( -/obj/effect/floor_decal/corner/blue{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/blue{ - dir = 1 +/obj/effect/shuttle_landmark{ + base_area = /area/space; + base_turf = /turf/space; + docking_controller = "securiship_bay"; + landmark_tag = "tether_securiship_dock"; + name = "Securiship Dock" }, -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/effect/overmap/visitable/ship/landable/securiship, +/obj/machinery/embedded_controller/radio/airlock/docking_port{ + cycle_to_external_air = 1; + frequency = 1380; + id_tag = "securiship_docker"; + pixel_y = 27 + }, +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tMt" = ( -/obj/machinery/door/window/brigdoor/westright{ - req_access = newlist(); - req_one_access = list(5,67) - }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/cable/green{ + icon_state = "4-8" }, +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tME" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled, @@ -32756,14 +33486,23 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "tOn" = ( -/obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 10 + dir = 8 }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tOp" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloor{ @@ -32775,14 +33514,23 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "tOr" = ( -/obj/machinery/computer/ship/helm{ - dir = 8 +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/obj/machinery/light{ - dir = 1 +/obj/structure/cable{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "tPj" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -32930,25 +33678,34 @@ dir = 8 }, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/monotile, /area/tether/station/dock_two) "tZQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 9 +/obj/structure/table/rack, +/obj/machinery/light{ + dir = 1 }, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/obj/item/weapon/handcuffs, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "uaC" = ( /obj/effect/floor_decal/rust, /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/station/cargo) "uaW" = ( -/obj/machinery/atmospherics/binary/pump{ - dir = 1 +/obj/structure/bed/padded, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "ucJ" = ( /obj/effect/floor_decal/rust, /obj/structure/cable{ @@ -32959,11 +33716,16 @@ /turf/simulated/floor, /area/storage/emergency_storage/emergency4) "ucL" = ( -/obj/structure/cable{ - icon_state = "1-4" +/obj/structure/bed/padded, +/obj/structure/window/reinforced{ + dir = 4 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "udq" = ( /obj/structure/closet, /obj/random/tool, @@ -32976,16 +33738,24 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "udG" = ( -/obj/machinery/door/airlock/multi_tile/metal/mait{ - dir = 2; - req_one_access = list(5,67) - }, -/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden, /obj/structure/cable{ - icon_state = "4-8" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/eris/techmaint_panels, -/area/shuttle/medivac/engines) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/obj/machinery/airlock_sensor{ + pixel_x = 28; + pixel_y = -28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "ueZ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -33036,26 +33806,19 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/landmark/vermin, /turf/simulated/floor/tiled, /area/engineering/foyer) -"uhN" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) "ujB" = ( /turf/simulated/wall, /area/storage/tools) "ujC" = ( -/obj/structure/cable{ - icon_state = "4-8" +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/area/shuttle/medivac/cockpit) "ujK" = ( /obj/structure/cable{ d1 = 1; @@ -33074,28 +33837,6 @@ /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) -"umD" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) -"umF" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, -/obj/effect/floor_decal/corner/blue{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) "uno" = ( /obj/machinery/status_display/supply_display, /turf/simulated/wall, @@ -33121,16 +33862,16 @@ /turf/simulated/floor/tiled/steel_grid, /area/tether/exploration/pathfinder_office) "unH" = ( -/obj/machinery/door/window/brigdoor/westleft{ - req_access = newlist(); - req_one_access = list(5,67) +/obj/structure/window/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/obj/structure/cable{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/machinery/door/firedoor/glass/hidden/shuttle, +/obj/machinery/door/blast/shuttle/open{ + dir = 4; + id = "medivac blast"; + name = "Shuttle Blast Doors" }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, +/turf/simulated/floor/plating, /area/shuttle/medivac/cockpit) "unR" = ( /obj/effect/floor_decal/industrial/warning{ @@ -33156,25 +33897,6 @@ }, /turf/simulated/floor, /area/maintenance/station/eng_lower) -"upT" = ( -/obj/structure/bed/chair/bay/chair/padded/blue{ - dir = 4 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "medivac blast"; - name = "Shuttle Blast Doors"; - pixel_x = -28; - pixel_y = -28; - req_access = list(67) - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/panic_button{ - pixel_x = 32; - pixel_y = -32 - }, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) "uqi" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -33199,11 +33921,12 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "uqU" = ( -/obj/machinery/computer/ship/sensors{ - dir = 8 +/obj/machinery/shipsensors/fancy_shuttle, +/turf/simulated/wall/fancy_shuttle/nondense{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, -/obj/machinery/light, -/turf/simulated/floor/tiled/eris/steel/cyancorner, /area/shuttle/medivac/cockpit) "usX" = ( /obj/structure/grille, @@ -33236,6 +33959,17 @@ "uuz" = ( /turf/simulated/shuttle/wall, /area/shuttle/belter) +"uvN" = ( +/obj/machinery/atmospherics/portables_connector{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/phoron, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "uxR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -33254,35 +33988,14 @@ /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "uym" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) -"uyn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/floor_decal/sign/dock/two, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/shuttle/medivac/general) "uyV" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -33372,27 +34085,24 @@ /obj/effect/floor_decal/borderfloor{ dir = 10 }, -/obj/effect/floor_decal/corner/red/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 9 - }, /obj/machinery/alarm{ dir = 4; pixel_x = -23 }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "uGl" = ( /obj/structure/table/rack{ dir = 8; @@ -33472,14 +34182,21 @@ /turf/simulated/floor/tiled/dark, /area/tcommsat/computer) "uKX" = ( -/obj/structure/fuel_port{ - pixel_x = -32 +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "medivac_docker_pump_out_internal" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ - dir = 8 +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/machinery/airlock_sensor{ + pixel_y = -27 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "uLo" = ( /obj/machinery/door/airlock/glass_mining{ id_tag = "cargodoor"; @@ -33491,13 +34208,14 @@ /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/office) "uLr" = ( -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, -/obj/machinery/portable_atmospherics/canister/phoron, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "uMo" = ( /obj/machinery/atmospherics/binary/passive_gate/on{ dir = 8 @@ -33545,22 +34263,23 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "uOm" = ( -/obj/machinery/door/window/brigdoor/northleft{ - req_access = list(5) - }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/simple, +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "uOz" = ( -/obj/structure/bed/padded, -/obj/structure/window/reinforced{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/effect/floor_decal/borderfloorwhite/corner2, +/obj/effect/floor_decal/corner/paleblue/bordercorner2, +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "uOQ" = ( -/obj/structure/sign/nosmoking_1, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/turf/simulated/floor/tiled/white, +/area/tether/station/dock_two) "uOS" = ( /obj/machinery/mineral/output, /obj/machinery/conveyor{ @@ -33569,33 +34288,16 @@ }, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) -"uPs" = ( -/obj/structure/bed/chair/shuttle{ +"uPt" = ( +/obj/machinery/computer/ship/sensors, +/obj/machinery/light{ dir = 4 }, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) -"uPt" = ( -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/table/glass, -/turf/simulated/floor/tiled/eris/steel/cyancorner, -/area/shuttle/medivac/cockpit) -"uQa" = ( -/obj/machinery/computer/shuttle_control/explore/medivac{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled/eris/steel/cyancorner, +/turf/simulated/floor/tiled, /area/shuttle/medivac/cockpit) "uRY" = ( /obj/effect/shuttle_landmark{ @@ -33608,23 +34310,13 @@ /turf/space, /area/space) "uSR" = ( -/obj/machinery/camera/network/tether{ - dir = 1 +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/sign/directions/medical{ + dir = 8; + pixel_y = -32 }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 9 - }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/white, /area/tether/station/dock_two) "uTq" = ( /obj/machinery/door/firedoor/glass, @@ -33690,10 +34382,6 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_one) -"uUL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "uVV" = ( /obj/machinery/power/apc{ dir = 4; @@ -33771,6 +34459,18 @@ /obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/storage) +"uXD" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "dock_d2l_pump" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "uYq" = ( /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -33810,15 +34510,8 @@ /turf/simulated/floor/tiled, /area/tether/exploration/pathfinder_office) "uZb" = ( -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "dock_d2l"; - name = "interior access button"; - pixel_x = 26; - pixel_y = -26; - req_one_access = list(13) - }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/red/bordercorner, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "uZA" = ( @@ -33828,6 +34521,14 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/station/dock_one) +"vas" = ( +/obj/machinery/door/airlock/glass_external, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 4 + }, +/obj/effect/map_helper/airlock/door/int_door, +/turf/simulated/floor/tiled/dark, +/area/tether/station/dock_two) "vaw" = ( /obj/structure/bed/chair/shuttle, /turf/simulated/shuttle/floor/yellow, @@ -33838,10 +34539,10 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "vbA" = ( -/obj/structure/table/standard, -/obj/random/medical, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "vcw" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -33876,42 +34577,70 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, -/obj/effect/floor_decal/corner/paleblue/border, /obj/machinery/alarm{ dir = 1; pixel_y = -25 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) "vdb" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ - dir = 5 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/red/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/floor_decal/corner/red/bordercorner2{ + dir = 9 + }, +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; + frequency = 1380; + id_tag = "securiship_bay"; + pixel_x = 24; + pixel_y = -26; + req_one_access = null + }, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "vdA" = ( -/obj/machinery/portable_atmospherics/canister/phoron, -/obj/effect/floor_decal/industrial/outline/red, -/obj/machinery/atmospherics/portables_connector{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/techfloor, -/area/shuttle/medivac/engines) +/obj/effect/map_helper/airlock/door/simple, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/airlock/glass_external, +/turf/simulated/floor/tiled, +/area/tether/station/dock_two) "vdW" = ( -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/medivac/general) +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "veh" = ( -/obj/structure/bed/padded, -/turf/simulated/floor/tiled/eris/dark/violetcorener, -/area/shuttle/medivac/general) +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + frequency = 1380; + id_tag = "securiship_docker_pump_out_internal" + }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/machinery/airlock_sensor{ + pixel_y = -27 + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "vez" = ( /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor, @@ -33933,11 +34662,17 @@ /turf/simulated/floor, /area/tether/station/dock_two) "vkg" = ( -/obj/machinery/bodyscanner{ - dir = 4 +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" }, -/turf/simulated/floor/tiled/eris/white, -/area/shuttle/medivac/general) +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/cockpit) "vll" = ( /turf/simulated/floor/tiled/asteroid_steel/airless, /area/quartermaster/belterdock) @@ -33996,8 +34731,17 @@ /turf/simulated/floor/tiled, /area/tether/exploration/crew) "vns" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/turf/simulated/wall/rshull, +/obj/machinery/computer/ship/engines{ + dir = 8 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, /area/shuttle/medivac/cockpit) "vow" = ( /obj/structure/table/standard, @@ -34028,12 +34772,6 @@ /obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) -"voP" = ( -/obj/machinery/door/airlock/glass_external, -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, -/turf/simulated/floor/tiled, -/area/tether/station/dock_two) "vrr" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -34062,6 +34800,12 @@ /obj/structure/catwalk, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"vsq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) "vsW" = ( /obj/structure/cable/green{ d1 = 4; @@ -34085,6 +34829,16 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"vtg" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 9 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "vtx" = ( /obj/machinery/sleep_console{ dir = 4 @@ -34134,29 +34888,20 @@ name = "\improper Telecomms Lobby" }) "vyd" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 1; - frequency = 1380; - id_tag = "medivac_docker_pump_out_external" +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" }, -/obj/effect/floor_decal/industrial/warning/full, -/obj/effect/map_helper/airlock/atmos/pump_out_external, -/turf/simulated/floor/airless, -/area/shuttle/medivac/general) +/area/shuttle/medivac/cockpit) "vyj" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - dir = 4; - frequency = 1380; - id_tag = "dock_d2l"; - pixel_x = -28 +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "vyI" = ( /obj/machinery/button/remote/driver{ @@ -34216,16 +34961,23 @@ /turf/simulated/floor/tiled, /area/engineering/foyer) "vAQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ +/obj/structure/extinguisher_cabinet{ + dir = 8; + pixel_x = 30 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, -/obj/machinery/light/small{ +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 +/obj/effect/floor_decal/corner/red/border{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled, /area/tether/station/dock_two) "vBG" = ( /obj/structure/closet/emcloset, @@ -34278,6 +35030,19 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"vFi" = ( +/obj/machinery/atmospherics/unary/vent_pump/high_volume{ + dir = 1; + frequency = 1380; + id_tag = "medivac_docker_pump_out_external" + }, +/obj/effect/map_helper/airlock/atmos/pump_out_external, +/turf/simulated/wall/fancy_shuttle/low{ + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 + }, +/area/shuttle/medivac/engines) "vFn" = ( /obj/structure/extinguisher_cabinet{ dir = 1; @@ -34475,6 +35240,14 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/airless, /area/quartermaster/belterdock) +"vVy" = ( +/obj/machinery/body_scanconsole, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "vVA" = ( /obj/structure/cable/green{ d1 = 1; @@ -34588,9 +35361,29 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) -"wbd" = ( -/turf/simulated/wall/rshull, -/area/shuttle/securiship/engines) +"vZG" = ( +/obj/machinery/airlock_sensor{ + pixel_x = -28; + pixel_y = -28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) +"waj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/engines) "wbf" = ( /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 4 @@ -34646,6 +35439,23 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) +"weP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/binary/pump{ + dir = 4 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "whg" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/hologram/holopad, @@ -34811,16 +35621,24 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 1 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"wwJ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 1 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/engines) "wwR" = ( /obj/structure/cable/green{ d1 = 1; @@ -34857,6 +35675,20 @@ }, /turf/simulated/floor/tiled, /area/tether/exploration/hallway) +"wAK" = ( +/obj/structure/table/standard, +/obj/machinery/recharger{ + pixel_y = 2 + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "wBw" = ( /turf/simulated/floor, /area/maintenance/cargo) @@ -34926,7 +35758,7 @@ pixel_x = 32 }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "wIR" = ( /obj/machinery/atmospherics/unary/vent_pump{ dir = 8; @@ -34991,6 +35823,23 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"wLR" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/glass_security, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) "wLS" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -35102,17 +35951,11 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 6 }, -/obj/effect/floor_decal/corner/red/border{ +/obj/effect/floor_decal/corner/lightgrey/border{ dir = 8 }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/red/bordercorner2{ - dir = 10 - }, /turf/simulated/floor/tiled, -/area/tether/station/dock_two) +/area/hallway/station/docks) "wQF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -35490,6 +36333,27 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/janitor) +"xoV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 10 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "medbus" + }, +/area/shuttle/medivac/general) +"xpa" = ( +/obj/machinery/sleeper{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/general) "xpA" = ( /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) @@ -35578,10 +36442,6 @@ }, /turf/simulated/floor/tiled, /area/gateway/prep_room) -"xwd" = ( -/obj/structure/sign/redcross, -/turf/simulated/wall/rshull, -/area/shuttle/medivac/general) "xwg" = ( /obj/machinery/door/blast/shutters{ dir = 8; @@ -35829,6 +36689,32 @@ }, /turf/simulated/floor/tiled, /area/hallway/station/docks) +"xMQ" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "xMZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -35878,6 +36764,18 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"xPa" = ( +/obj/structure/cable{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/smes/buildable/point_of_interest, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "medbus"; + name = "medbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/medivac/engines) "xPm" = ( /obj/effect/floor_decal/industrial/warning{ dir = 6 @@ -35970,6 +36868,13 @@ /obj/structure/railing, /turf/simulated/floor, /area/maintenance/station/eng_lower) +"xRE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/vines, +/turf/simulated/floor/tiled, +/area/tether/station/dock_one) "xSF" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -36054,6 +36959,25 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"xZE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/yellow{ + dir = 10 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + nightshift_setting = 2; + pixel_y = 28 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "xZW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -36116,6 +37040,30 @@ }, /turf/simulated/floor/tiled, /area/tether/station/dock_two) +"ybT" = ( +/obj/machinery/door/airlock/glass_external, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/general) +"ydq" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/binary/pump, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/obj/effect/floor_decal/fancy_shuttle{ + fancy_shuttle_tag = "secbus"; + name = "secbus" + }, +/turf/simulated/floor/tiled, +/area/shuttle/securiship/engines) "ydT" = ( /obj/machinery/access_button{ command = "cycle_interior"; @@ -36141,6 +37089,14 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/surface_mining_outpost_shuttle_hangar) +"yhn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 9 + }, +/turf/simulated/wall/fancy_shuttle{ + fancy_shuttle_tag = "secbus" + }, +/area/shuttle/securiship/general) "yif" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -39691,7 +40647,7 @@ gTz trn gTz gTz -gTz +xRE gTz gTz trn @@ -41955,20 +42911,20 @@ bVP pfh bgG aaa -kok -kyb -kyb -kyb -kIc -nTL -nTL -kIc -kIc -wbd -wbd -wbd -wbd -wbd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42097,20 +43053,20 @@ bVP pfh bgG aaa -kyb -kyb -mbN -myi -nio -nUp -ofa -omt -orK -wbd -pYh -qvS -rlP -qrY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42239,20 +43195,20 @@ bVP pfh bgG aaa -kzv -kPX -mgU -mCt -nst -nst -oiK -onE -owo -wbd -qbm -qxn -rqZ -qrY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42381,20 +43337,20 @@ aim kzY vCj aaa -kzv -ldE -mim -mFp -ntd -nUY -ojn -ntd -ntd -pjb -qfg -qyI -sdi -wbd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42523,20 +43479,20 @@ bVP hyl vCj aaa -kIc -let -mjc -mFw -nym -nWj -nst -oqg -olN -pqB -qgB -qAY -sHX -wbd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42665,20 +43621,20 @@ xQD qFi vCj aaa -kIc -kIc -kIc -kIc -kIc -nXm -nst -orh -owZ -wbd -qhy -qFq -rqZ -qrY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42803,24 +43759,24 @@ alt alt alv tMV -bVP +mBL pfh bgG aaa -kKj -liG -mnd -mIR -nBA -nYL -olN -orF -oWk -wbd -qiQ -qiQ -nOT -qrY +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -42949,20 +43905,20 @@ bXv sET vCj aaa -kKY -kIc -mnv -mNy -kIc -nZc -nZc -kIc -nZc -wbd -wbd -wbd -wbd -wbd +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -43090,12 +44046,12 @@ xMk isr fji vCj -fLT -fLT -voE -mou -mNU -voE +vCj +vCj +vCj +vCj +vCj +vCj tal tal tal @@ -43889,7 +44845,7 @@ aEk aXR bbb ahP -brX +qKp ank byy byy @@ -45179,7 +46135,7 @@ dyq fca hcW qHy -ack +gCZ fgA ach abC @@ -46634,7 +47590,7 @@ dPx adM kts vYJ -vYJ +pjJ aba abm abO @@ -46889,7 +47845,7 @@ fMv gnc gMr pPa -eWv +qaA ops pny acH @@ -47656,7 +48612,7 @@ aBW aBW aBW aBW -aDz +ohH aEc gcc awN @@ -48030,7 +48986,7 @@ pXr scu iiU ajj -ajj +kpK kfa alj vmt @@ -48358,8 +49314,8 @@ aaa aaa aaa ahW -aaa -aaa +ahW +ahW ayF ayN aAs @@ -48636,11 +49592,11 @@ fLT fLT fLT fLT -aaa -aaa -aaa -aaa -aaa +ahW +ahW +ahW +ahW +ahW ahW asG asG @@ -48770,7 +49726,7 @@ aaa aaa aaa fLT -wMe +cOV qSM vcG fLT @@ -48914,17 +49870,17 @@ jRT fLT kbq qSM -fQr -qBP +jGw +fLT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -rWS -rWS -rWS -tAQ -tAQ -rWS -rWS -rWS aaa asG asG @@ -49053,20 +50009,20 @@ hGr qqe hPw xIm -fLT +qBP wMe rQq wvQ qBP aaa -rWS -suH -rWS -tBt -tZQ -rWS -vbA -rWS +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa asG asG @@ -49195,20 +50151,20 @@ hHo qqe qvg xIm -fLT -cOV +qBP +wMe rQq -fQr +jGw qBP aaa -rXo -svP -tbT -tBN -uaW -uKX -vdb -rXo +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa asG asG @@ -49337,20 +50293,20 @@ qcz qqe qum fyi -fLT +qBP wMe rQq -lCQ -fLT +qYW +qBP +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa -rWS -swH -tbV -tCZ -ucL -uLr -vdA -rWS aaa asG asG @@ -49484,15 +50440,15 @@ qCV qOx cjl fLT -fLT -rWS -rWS -rWS -tGs -udG -rWS -rWS -rWS +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -49625,16 +50581,16 @@ tZN uEv kMY qWN -rsp -rIA -rYx -sFB -tda -tGB -uhN -uOm -vdW -gcw +fLT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa aaa aaa aaa @@ -49767,16 +50723,7 @@ auX uEv rQq qYR -rsL -rJe -scB -sHo -tdt -tGV -uhN -uOz -veh -gcw +fLT aaa aaa aaa @@ -49790,6 +50737,15 @@ aaa aaa aaa aaa +beU +beU +gio +ewT +ewT +ewT +ewT +sUt +aaa aaa aaa aaa @@ -49910,15 +50866,6 @@ klW rQq mzV fLT -fLT -gcw -gcw -gcw -tIb -uhN -uOQ -gcw -gcw aaa aaa aaa @@ -49932,6 +50879,14 @@ aaa aaa aaa aaa +gio +gio +gio +ewT +ewT +ewT +ewT +ewT aaa aaa aaa @@ -49971,6 +50926,7 @@ aaa aaa aaa aaa +aaa "} (98,1,1) = {" aaa @@ -50048,31 +51004,31 @@ qqe qum fyi qBP -kiB -etg +hSz +rQq lFA -fLT +qBP +aaa +aaa +aaa +aaa aaa -gcw -sJw -ter -tIb ujC -uPs +vyd amU -gcw -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +vyd +tda +tda +tda +tda +riB +riB +tda +hDi +hDi +hDi +sOn +btm aaa aaa aaa @@ -50193,28 +51149,28 @@ qBP wMe rQq qYW -fLT -aaa -seP -aoL -aoL -tIw -umD -aoL -aoL -eTQ -aaa -aaa -aaa -aaa -aaa -aaa -aaa +qBP aaa aaa aaa aaa aaa +vyd +vyd +svP +vyd +tdt +uaW +tda +xpa +kXu +kXu +hnk +hDi +nAx +uvN +lof +ewT aaa aaa aaa @@ -50335,28 +51291,28 @@ qBP wMe rQq pSg -fLT +qBP aaa -seP -sJM -aoL -tKI -umF -aoL +aaa +aaa +aaa +aaa +unH +rJe qtf -eTQ -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +vyd +ter +ucL +tda +afa +kXu +kXu +vVy +hDi +kiN +vtg +lof +ewT aaa aaa aaa @@ -50479,26 +51435,26 @@ rQq lAo fLT aaa -xwd -sLs -aoL -tIb -uhN -aoL +aaa +aaa +aaa +aaa +unH +rWS vkg -xwd -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaj +tgl +udG +bnG +kEt +kEt +kEt +gqN +smd +weP +nyq +orD +vFi aaa aaa aaa @@ -50572,7 +51528,7 @@ aie avO bYg bPX -bXn +ads cyf fck otm @@ -50621,26 +51577,26 @@ qOx llC fLT aaa -sDE -sDE -tgl -tMt +aaa +aaa +aaa +aaa unH uPt -sDE -gcw -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +swH +vyd +tiN +uym +tda +rKa +kXu +kXu +lJl +hDi +dRZ +doW +qiZ +ewT aaa aaa aaa @@ -50763,26 +51719,26 @@ qSM qZs fLT aaa -eUE -sDE -tiN -tOn -upT -uQa +aaa +aaa +aaa +aaa +vyd +vyd vns vyd -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tAQ +uKX +imp +rOH +kXu +kXu +lNb +hDi +xPa +gPV +cDU +ewT aaa aaa aaa @@ -50857,7 +51813,7 @@ avZ thI acu xTB -bpd +adN xTB otm vow @@ -50906,25 +51862,25 @@ saf fLT aaa aaa -sDE -sDE -tOr +aaa +aaa +aaa uqU -sDE -sDE -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +vyd +amU +vyd +tBt +uLr +xoV +vsq +jJE +jJE +vsq +lKA +lKA +lKA +waj +btm aaa aaa aaa @@ -51049,24 +52005,24 @@ fLT aaa aaa aaa -sDE -osM -osM -sDE -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa aaa aaa aaa aaa aaa +fLT +tBN +uOm +fLT aaa +gio +gio +gio +ewT +ewT +ewT +ewT +ewT aaa aaa aaa @@ -51196,19 +52152,19 @@ aaa aaa aaa aaa +eUE +tCZ +uOz +mnt aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +beU +beU +gio +ewT +ewT +ewT +ewT +sbe aaa aaa aaa @@ -51338,10 +52294,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +eUE +tGs +uOQ +mnt aaa aaa aaa @@ -51475,10 +52431,23 @@ fLT fLT qBP qBP +qBP +fLT +qBP +qBP +qBP +fLT +tGs +uSR +fLT +qBP +qBP +qBP fLT fLT qBP qBP +qBP voE aaa aaa @@ -51520,19 +52489,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (109,1,1) = {" aaa @@ -51577,7 +52533,7 @@ woq jxP acV xEG -dls +aai dTU ady dyt @@ -51614,30 +52570,30 @@ knX wub kkp dUf -mUp +mqR mqR mqR cDk iNZ -uym -uSR -voE -eyT +mqR +mqR +sFB eyT +tGB bbl -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +sFB +sFB +ijM +mqR +jLk +cuj +fpK +fpK +oRf +voE +txI +txI +dCt aaa aaa aaa @@ -51757,31 +52713,31 @@ kNR lWx lNF mUD -lWx -lWx -lWx +vyj +vyj +vyj jHc -uyn -uUL -voP +vyj +vyj +vyj vyj ngU nrh -aaa +pSO nvu +pnm +kuo +kuo +kuo +kuo +pye +kuo +eif +jBN +lvZ +mWA aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +hDI aaa aaa aaa @@ -51893,21 +52849,34 @@ ahW aaa aaa aaa -iZC +fLT wMe kOK vEF tZJ -pEg -hSz odW odW +odW +nfp qlt -mnt -uZb -mTK +odW +odW +sHo vAQ nhA +uZb +ivC +sHo +lRe +odW +lhv +odW +odW +odW +tgr +mTK +ijG +uXD nrQ aaa aaa @@ -51946,19 +52915,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (112,1,1) = {" aaa @@ -52032,38 +52988,38 @@ ahV ahV ahV ahV -aaa -aaa -aaa -iZC -iTF +ahW +ahW +ahW +fLT +kiB jFv lYR -iUV -nfp +fLT fLT qBP qBP +qBP fLT qBP qBP +qBP +fLT +ncX +ntt +fLT +qBP +qBP +qBP +fLT +fLT +qBP +qBP +qBP voE -ncX -ncX -ntt -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +hBR +hBR +mXh aaa aaa aaa @@ -52177,11 +53133,24 @@ aaa aaa aaa aaa -gVG -iUV -jGw +fLT iUV +kOK klo +fLT +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +eUE +ncX +vbA +mnt +aaa aaa aaa aaa @@ -52230,19 +53199,6 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa "} (114,1,1) = {" aaa @@ -52319,23 +53275,11 @@ aaa aaa aaa aaa -aaa -iZC -jHU -ieY -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +fLT +wMe +kOK +klo +fLT aaa aaa aaa @@ -52344,6 +53288,18 @@ aaa aaa aaa aaa +eUE +tGV +vdb +mnt +tqu +tqu +mRq +psE +psE +psE +psE +dDk aaa aaa aaa @@ -52461,10 +53417,11 @@ aaa aaa aaa aaa -aaa -jqN -jRG +fLT +wMe +kOK klo +fLT aaa aaa aaa @@ -52473,19 +53430,18 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +voE +tIb +vdA +voE +mRq +mRq +mRq +psE +psE +psE +eVl +cmX aaa aaa aaa @@ -52603,31 +53559,31 @@ aaa aaa aaa aaa +fLT +wMe +kOK +klo +fLT aaa aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +osM +rXo +rXo +osM +tIw +vdW +jOl +tjZ +tjZ +tjZ +kIc +kIc +kIc +rqA +cmX aaa aaa aaa @@ -52745,31 +53701,31 @@ aaa aaa aaa aaa -aaa -aaa -jqT -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +fLT +wMe +kOK +ipw +fLT aaa aaa aaa aaa aaa +osM +rYx +suH +osM +tKI +veh +yhn +cMD +oTR +lEm +kKj +dAx +cic +cbU +psE aaa aaa aaa @@ -52887,31 +53843,31 @@ aaa aaa aaa aaa +gVG +wMe +kOK +klo +gVG aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +osM +osM +scB +sJw +osM +tMt +ybT +kok +eSM +gvx +kTK +kKj +lCR +dYK +cbU +psE aaa aaa aaa @@ -53029,31 +53985,31 @@ aaa aaa aaa aaa +gVG +wMe +kOK +klo +gVG aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pEg +rsp +seP +sJM +abJ +tOn +vZG +kok +wAK +kzv +tGO +kKj +mIV +ydq +ncN +ntS aaa aaa aaa @@ -53170,32 +54126,32 @@ aaa aaa aaa aaa +etg +fLT +jHU +kOK +fDY +fLT aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pEg +rsL +suH +sLs +osM +tOr +iEn +wLR +iEn +iEn +iVi +fNX +xMQ +gbR +rkl +psE aaa aaa aaa @@ -53313,31 +54269,31 @@ aaa aaa aaa aaa +eUE +iTF +jjP +jRG +mnt aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +pEg +rIA +seP +tbT +osM +tZQ +lsw +kok +gbm +jcX +kKe +kKj +xZE +gbR +rkl +psE aaa aaa aaa @@ -53455,31 +54411,31 @@ aaa aaa aaa aaa +gmx +gVG +vas +gVG +mUp aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +osM +osM +rXo +rXo +osM +kok +kok +kok +kyb +kyb +kyb +kKj +kKj +kKj +wwJ +cmX aaa aaa aaa @@ -53598,6 +54554,9 @@ aaa aaa aaa aaa +eUE +jqN +mnt aaa aaa aaa @@ -53611,17 +54570,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +mRq +mRq +mRq +psE +psE +psE +nAr +cmX aaa aaa aaa @@ -53740,6 +54696,9 @@ aaa aaa aaa aaa +iZC +jqT +mUp aaa aaa aaa @@ -53753,17 +54712,14 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +tqu +tqu +mRq +psE +psE +psE +psE +kKY aaa aaa aaa @@ -54025,7 +54981,7 @@ aaa aaa aaa aaa -aaa +juV aaa aaa aaa diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index a8e7544390..7d8c998346 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -1460,6 +1460,9 @@ /area/shuttle/excursion/power name = "\improper Excursion Shuttle Power" +/* + * Tourbus + */ /area/shuttle/tourbus requires_power = 1 icon_state = "shuttle2" @@ -1471,6 +1474,9 @@ /area/shuttle/tourbus/cockpit name = "\improper Tour Bus Cockpit" +/* + * Medbus + */ /area/shuttle/medivac requires_power = 1 icon_state = "shuttle2" @@ -1484,6 +1490,9 @@ /area/shuttle/medivac/engines name = "\improper Medivac Engines" +/* + * Secbus + */ /area/shuttle/securiship requires_power = 1 icon_state = "shuttle2" @@ -1615,31 +1624,6 @@ /area/bigship/teleporter name = "Bigship Teleporter Room" -//////// Abductor Areas //////// -/area/unknown - requires_power = 0 - flags = RAD_SHIELDED - icon_state = "red2" - limit_mob_size = FALSE - -/area/unknown/dorm1 - name = "Unknown Dorm 1" - -/area/unknown/dorm2 - name = "Unknown Dorm 2" - -/area/unknown/dorm3 - name = "Unknown Dorm 3" - -/area/unknown/dorm4 - name = "Unknown Dorm 4" - -/area/unknown/dorm5 - name = "Unknown Dorm 5" - -/area/unknown/dorm6 - name = "Unknown Dorm 6" - // ERT/Deathsquad Shuttle /area/shuttle/specialops/centcom name = "Special Operations Shuttle - Centcom" diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 898df8a99c..ef8cc70e64 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -21,13 +21,11 @@ #define Z_LEVEL_DEBRISFIELD 19 #define Z_LEVEL_FUELDEPOT 20 #define Z_LEVEL_GATEWAY 21 +#define Z_LEVEL_OM_ADVENTURE 22 //Camera networks #define NETWORK_TETHER "Tether" -#define NETWORK_TCOMMS "Telecommunications" //Using different from Polaris one for better name #define NETWORK_OUTSIDE "Outside" -#define NETWORK_EXPLORATION "Exploration" -#define NETWORK_XENOBIO "Xenobiology" /datum/map/tether/New() ..() @@ -71,6 +69,7 @@ station_name = "NSB Adephagia" station_short = "Tether" + facility_type = "station" dock_name = "Virgo-3B Colony" dock_type = "surface" boss_name = "Central Command" @@ -164,7 +163,7 @@ list("Fuel Depot - Z1 Space") ) - lateload_single_pick = list( + lateload_gateway = list( list("Carp Farm"), list("Snow Field"), list("Listening Post"), @@ -175,6 +174,10 @@ list("Wild West") ) + lateload_overmap = list( + list("Grass Cave") + ) + ai_shell_restricted = TRUE ai_shell_allowed_levels = list( Z_LEVEL_SURFACE_LOW, @@ -196,8 +199,6 @@ mining_station_z = list(Z_LEVEL_SPACE_LOW) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) - lateload_single_pick = null //Nothing right now. - planet_datums_to_make = list(/datum/planet/virgo3b, /datum/planet/virgo4) @@ -247,7 +248,7 @@ [i]Transponder[/i]: Transmitting (CIV), NanoTrasen IFF [b]Notice[/b]: NanoTrasen Base, authorized personnel only"} base = 1 - + icon = 'icons/obj/overmap_vr.dmi' icon_state = "virgo3b" @@ -309,7 +310,7 @@ /obj/effect/overmap/visitable/sector/virgo3b/generate_skybox(zlevel) var/static/image/bigone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "large") var/static/image/smallone = image(icon = 'icons/skybox/virgo3b.dmi', icon_state = "small") - + if(zlevel == Z_LEVEL_TRANSIT) return bigone else @@ -362,6 +363,7 @@ name = "Asteroid 1" base_turf = /turf/space transit_chance = 33 + flags = MAP_LEVEL_STATION|MAP_LEVEL_CONTACT|MAP_LEVEL_PLAYER|MAP_LEVEL_CONSOLES|MAP_LEVEL_XENOARCH_EXEMPT|MAP_LEVEL_PERSIST|MAP_LEVEL_BELOW_BLOCKED holomap_offset_x = TETHER_HOLOMAP_MARGIN_X + TETHER_HOLOMAP_CENTER_GUTTER + TETHER_MAP_SIZE holomap_offset_y = TETHER_HOLOMAP_MARGIN_Y + TETHER_MAP_SIZE diff --git a/maps/tether/tether_jobs.dm b/maps/tether/tether_jobs.dm index 83027da7c1..5d9be113cf 100644 --- a/maps/tether/tether_jobs.dm +++ b/maps/tether/tether_jobs.dm @@ -132,6 +132,30 @@ /datum/alt_title/talon_security title = "Talon Security" +/datum/job/talon_miner + title = "Talon Miner" + flag = TALMIN + department_flag = TALON + job_description = "The miner's job is to excavate ores and refine them for the Talon's use, as well as for trading." + supervisors = "the ITV Talon's captain" + outfit_type = /decl/hierarchy/outfit/job/talon_miner + + offmap_spawn = TRUE + faction = "Station" //Required for SSjob to allow people to join as it + departments = list(DEPARTMENT_TALON) + total_positions = 1 + spawn_positions = 1 + selection_color = "#aaaaaa" + economic_modifier = 5 + minimal_player_age = 14 + pto_type = null + access = list(access_talon) + minimal_access = list(access_talon) + alt_titles = list("Talon Excavator" = /datum/alt_title/talon_excavator) + +/datum/alt_title/talon_excavator + title = "Talon Excavator" + //////////////////////TALON OUTFITS////////////////////// /decl/hierarchy/outfit/job/talon_captain @@ -233,3 +257,20 @@ satchel_one = /obj/item/weapon/storage/backpack/satchel/talon messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon +/decl/hierarchy/outfit/job/talon_miner + name = OUTFIT_JOB_NAME("Talon Miner") + hierarchy_type = /decl/hierarchy/outfit/job + + id_type = /obj/item/weapon/card/id/talon/miner + id_slot = slot_wear_id + pda_type = null + flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL + + l_ear = /obj/item/device/radio/headset/talon + shoes = /obj/item/clothing/shoes/boots/workboots + r_pocket = /obj/item/weapon/storage/bag/ore + l_pocket = /obj/item/weapon/tool/crowbar + uniform = /obj/item/clothing/under/rank/talon/basic + backpack = /obj/item/weapon/storage/backpack/talon + satchel_one = /obj/item/weapon/storage/backpack/satchel/talon + messenger_bag = /obj/item/weapon/storage/backpack/messenger/talon \ No newline at end of file diff --git a/maps/tether/tether_telecomms.dm b/maps/tether/tether_telecomms.dm index ac43e2d453..9adb24aed1 100644 --- a/maps/tether/tether_telecomms.dm +++ b/maps/tether/tether_telecomms.dm @@ -3,8 +3,9 @@ // #### Relays #### // Telecomms doesn't know about connected z-levels, so we need relays even for the other surface levels. -/obj/machinery/telecomms/relay/preset/tether +/obj/machinery/telecomms/relay/preset/station id = "Tether Relay" + listening_level = 9 autolinkers = list("tether_relay") // #### Hub #### diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index 1d6e9b8ed2..91f1435f05 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -135,28 +135,6 @@ /obj/effect/step_trigger/lost_in_space/tram deathmessage = "You fly down the tunnel of the tram at high speed for a few moments before impact kills you with sheer concussive force." - -// Invisible object that blocks z transfer to/from its turf and the turf above. -/obj/effect/ceiling - invisibility = 101 // nope cant see this - anchored = 1 - can_atmos_pass = ATMOS_PASS_PROC - -/obj/effect/ceiling/CanZASPass(turf/T, is_zone) - if(T == GetAbove(src)) - return FALSE // Keep your air up there, buddy - return TRUE - -/obj/effect/ceiling/CanPass(atom/movable/mover, turf/target) - if(target == GetAbove(src)) - return FALSE - return TRUE - -/obj/effect/ceiling/Uncross(atom/movable/mover, turf/target) - if(target == GetAbove(src)) - return FALSE - return TRUE - // // TRAM STATION // @@ -197,29 +175,6 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram/powered() return TRUE // Always be powered -//Chemistry 'chemavator' -/obj/machinery/smartfridge/chemistry/chemvator - name = "\improper Smart Chemavator - Upper" - desc = "A refrigerated storage unit for medicine and chemical storage. Now sporting a fancy system of pulleys to lift bottles up and down." - var/obj/machinery/smartfridge/chemistry/chemvator/attached - -/obj/machinery/smartfridge/chemistry/chemvator/down/Destroy() - attached = null - return ..() - -/obj/machinery/smartfridge/chemistry/chemvator/down - name = "\improper Smart Chemavator - Lower" - -/obj/machinery/smartfridge/chemistry/chemvator/down/Initialize() - . = ..() - var/obj/machinery/smartfridge/chemistry/chemvator/above = locate(/obj/machinery/smartfridge/chemistry/chemvator,get_zstep(src,UP)) - if(istype(above)) - above.attached = src - attached = above - item_records = attached.item_records - else - to_chat(world,"[src] at [x],[y],[z] cannot find the unit above it!") - // Tram departure cryo doors that turn into ordinary airlock doors at round end /obj/machinery/cryopod/robot/door/tram name = "\improper Tram Station" @@ -236,6 +191,7 @@ on_store_visible_message_2 = "to the colony" time_till_despawn = 10 SECONDS spawnpoint_type = /datum/spawnpoint/tram + /obj/machinery/cryopod/robot/door/tram/process() if(emergency_shuttle.online() || emergency_shuttle.returned()) // Transform into a door! But first despawn anyone inside @@ -260,27 +216,6 @@ var/mob/observer/dead/newghost = user.ghostize() newghost.timeofdeath = world.time despawn_occupant(user) - -// Tram arrival point landmarks and datum -var/global/list/latejoin_tram = list() - -/obj/effect/landmark/tram - name = "JoinLateTram" - delete_me = 1 - -/obj/effect/landmark/tram/New() - latejoin_tram += loc // Register this turf as tram latejoin. - latejoin += loc // Also register this turf as fallback latejoin, since we won't have any arrivals shuttle landmarks. - ..() - -/datum/spawnpoint/tram - display_name = "Tram Station" - msg = "has arrived on the tram" - -/datum/spawnpoint/tram/New() - ..() - turfs = latejoin_tram - // // Holodorms // @@ -329,30 +264,6 @@ var/global/list/latejoin_tram = list() /obj/machinery/power/supermatter/touch_map_edge() qdel(src) -//Airlock antitox vendor -/obj/machinery/vending/wallmed_airlock - name = "Airlock NanoMed" - desc = "Wall-mounted Medical Equipment dispenser. This limited-use version dispenses antitoxins with mild painkillers for surface EVAs." - icon_state = "wallmed" - density = 0 //It is wall-mounted, and thus, not dense. --Superxpdude - products = list(/obj/item/weapon/reagent_containers/pill/airlock = 20) - contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 2) - req_log_access = access_cmo - has_logs = 1 - -/obj/machinery/vending/wallmed1/public - products = list(/obj/item/stack/medical/bruise_pack = 8,/obj/item/stack/medical/ointment = 8,/obj/item/weapon/reagent_containers/hypospray/autoinjector = 16,/obj/item/device/healthanalyzer = 4) - -/obj/item/weapon/reagent_containers/pill/airlock - name = "\'Airlock\' Pill" - desc = "Neutralizes toxins and provides a mild analgesic effect." - icon_state = "pill2" - -/obj/item/weapon/reagent_containers/pill/airlock/New() - ..() - reagents.add_reagent("anti_toxin", 15) - reagents.add_reagent("paracetamol", 5) - //"Red" Armory Door /obj/machinery/door/airlock/security/armory name = "Red Armory" @@ -364,41 +275,12 @@ var/global/list/latejoin_tram = list() return ..(user) -// Used at centcomm for the elevator -/obj/machinery/cryopod/robot/door/dorms - spawnpoint_type = /datum/spawnpoint/tram - //Tether-unique network cameras /obj/machinery/camera/network/tether network = list(NETWORK_TETHER) -/obj/machinery/camera/network/tcomms - network = list(NETWORK_TCOMMS) - /obj/machinery/camera/network/outside network = list(NETWORK_OUTSIDE) - -/obj/machinery/camera/network/exploration - network = list(NETWORK_EXPLORATION) - -/obj/machinery/camera/network/research/xenobio - network = list(NETWORK_RESEARCH, NETWORK_XENOBIO) - -//Camera monitors -/obj/machinery/computer/security/xenobio - name = "xenobiology camera monitor" - desc = "Used to access the xenobiology cell cameras." - icon_keyboard = "mining_key" - icon_screen = "mining" - network = list(NETWORK_XENOBIO) - circuit = /obj/item/weapon/circuitboard/security/xenobio - light_color = "#F9BBFC" - -/obj/item/weapon/circuitboard/security/xenobio - name = T_BOARD("xenobiology camera monitor") - build_path = /obj/machinery/computer/security/xenobio - network = list(NETWORK_XENOBIO) - req_access = list() // // ### Wall Machines On Full Windows ### // To make sure wall-mounted machines placed on full-tile windows are clickable they must be above the window diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 9fc0487392..7fc7fca28f 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -38,6 +38,7 @@ var/list/all_maps = list() var/static/list/hidden_levels = list() // Z-levels who's contents are hidden, but not forbidden (gateways) var/static/list/empty_levels = list() // Empty Z-levels that may be used for various things var/static/list/mappable_levels = list()// List of levels where mapping or other similar devices might work fully + var/static/list/below_blocked_levels = list()// List of levels where mapping or other similar devices might work fully // End Static Lists // Z-levels available to various consoles, such as the crew monitor. Defaults to station_levels if unset. @@ -53,7 +54,8 @@ var/list/all_maps = list() var/list/lateload_z_levels = list() //Similar to above, but only pick ONE to load, useful for random away missions and whatnot - var/list/lateload_single_pick = list() + var/list/lateload_gateway = list() + var/list/lateload_overmap = list() //VOREStation Add - The same thing as gateway, but not var/list/allowed_jobs = list() //Job datums to use. //Works a lot better so if we get to a point where three-ish maps are used @@ -81,6 +83,7 @@ var/list/all_maps = list() var/station_name = "BAD Station" var/station_short = "Baddy" + var/facility_type = "facility" var/dock_name = "THE PirateBay" var/dock_type = "station" //VOREStation Edit - for a list of valid types see the switch block in air_traffic.dm at line 148 var/boss_name = "Captain Roger" @@ -318,6 +321,9 @@ var/list/all_maps = list() if(flags & MAP_LEVEL_CONSOLES) if (!map.map_levels) map.map_levels = list() map.map_levels += z + if(flags & MAP_LEVEL_BELOW_BLOCKED) + if (!map.below_blocked_levels) map.below_blocked_levels = list() + map.below_blocked_levels += z if(base_turf) map.base_turf_by_z["[z]"] = base_turf if(transit_chance) diff --git a/sound/effects/capture-crystal-in.ogg b/sound/effects/capture-crystal-in.ogg new file mode 100644 index 0000000000..b00d7be9c9 Binary files /dev/null and b/sound/effects/capture-crystal-in.ogg differ diff --git a/sound/effects/capture-crystal-negative.ogg b/sound/effects/capture-crystal-negative.ogg new file mode 100644 index 0000000000..a0d6de3395 Binary files /dev/null and b/sound/effects/capture-crystal-negative.ogg differ diff --git a/sound/effects/capture-crystal-out.ogg b/sound/effects/capture-crystal-out.ogg new file mode 100644 index 0000000000..363ad85c56 Binary files /dev/null and b/sound/effects/capture-crystal-out.ogg differ diff --git a/sound/effects/capture-crystal-problem.ogg b/sound/effects/capture-crystal-problem.ogg new file mode 100644 index 0000000000..3c0a7b343b Binary files /dev/null and b/sound/effects/capture-crystal-problem.ogg differ diff --git a/sound/effects/skeleton_walk.ogg b/sound/effects/skeleton_walk.ogg new file mode 100644 index 0000000000..d5791ec542 Binary files /dev/null and b/sound/effects/skeleton_walk.ogg differ diff --git a/sound/effects/weather/indoorrain_end.ogg b/sound/effects/weather/indoorrain_end.ogg new file mode 100644 index 0000000000..c82039d95b Binary files /dev/null and b/sound/effects/weather/indoorrain_end.ogg differ diff --git a/sound/effects/weather/indoorrain_mid.ogg b/sound/effects/weather/indoorrain_mid.ogg new file mode 100644 index 0000000000..60ab5f1624 Binary files /dev/null and b/sound/effects/weather/indoorrain_mid.ogg differ diff --git a/sound/effects/weather/indoorrain_start.ogg b/sound/effects/weather/indoorrain_start.ogg new file mode 100644 index 0000000000..23165836a1 Binary files /dev/null and b/sound/effects/weather/indoorrain_start.ogg differ diff --git a/sound/items/sonic_driver.ogg b/sound/items/sonic_driver.ogg new file mode 100644 index 0000000000..d02a2b6709 Binary files /dev/null and b/sound/items/sonic_driver.ogg differ diff --git a/sound/voice/prbt.ogg b/sound/voice/prbt.ogg new file mode 100644 index 0000000000..75a24e1207 Binary files /dev/null and b/sound/voice/prbt.ogg differ diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json index ecc42dd744..b8cbf39a61 100644 --- a/tgui/packages/tgui-dev-server/package.json +++ b/tgui/packages/tgui-dev-server/package.json @@ -3,7 +3,7 @@ "name": "tgui-dev-server", "version": "4.3.0", "dependencies": { - "axios": "^0.21.1", + "axios": "^0.21.2", "common": "workspace:*", "esm": "^3.2.25", "glob": "^7.1.6", diff --git a/tgui/packages/tgui/interfaces/CharacterDirectory.js b/tgui/packages/tgui/interfaces/CharacterDirectory.js index e75d7096de..7a31f1ac0a 100644 --- a/tgui/packages/tgui/interfaces/CharacterDirectory.js +++ b/tgui/packages/tgui/interfaces/CharacterDirectory.js @@ -10,12 +10,16 @@ const getTagColor = tag => { return "label"; case "Pred": return "red"; + case "Pred-Pref": + return "orange"; case "Prey": return "blue"; - case "Switch": - return "purple"; - case "Non-Vore": + case "Prey-Pref": return "green"; + case "Switch": + return "yellow"; + case "Non-Vore": + return "black"; } }; diff --git a/tgui/packages/tgui/interfaces/RIGSuit.js b/tgui/packages/tgui/interfaces/RIGSuit.js index 3b248a56a9..cc7ec9abe3 100644 --- a/tgui/packages/tgui/interfaces/RIGSuit.js +++ b/tgui/packages/tgui/interfaces/RIGSuit.js @@ -25,7 +25,7 @@ export const RIGSuit = (props, context) => { // Non-AI trying to control the hardsuit while it's AI control overridden override = -- HARDSUIT CONTROL OVERRIDDEN BY AI --; } - + return ( { const RIGSuitStatus = (props, context) => { const { act, data } = useBackend(context); - + const { // Power Bar chargestatus, @@ -57,6 +57,7 @@ const RIGSuitStatus = (props, context) => { // Suit Status sealing, sealed, + cooling, // Cover Locks emagged, securitycheck, @@ -77,6 +78,14 @@ const RIGSuitStatus = (props, context) => { onClick={() => act("toggle_seals")} /> ); + const CoolingButton = ( + + {Object.keys(possible_fullscreens).map(key => ( + + ))} + + + ); +}; + +const VoreSelectedBellyInteractions = (props, context) => { + const { act } = useBackend(context); + + const { belly } = props; + const { + escapable, + interacts, + } = belly; + + return ( +
act("set_attribute", { attribute: "b_escapable" })} + icon={escapable ? "toggle-on" : "toggle-off"} + selected={escapable} + content={escapable ? "Interactions On" : "Interactions Off"} /> + }> + {escapable ? ( + + +
+ ); +}; + const VoreContentsPanel = (props, context) => { const { act, data } = useBackend(context); const { @@ -568,115 +769,6 @@ const VoreContentsPanel = (props, context) => { ); }; -const VoreSelectedBellyInteractions = (props, context) => { - const { act } = useBackend(context); - - const { belly } = props; - const { - escapable, - interacts, - } = belly; - - return ( -
act("set_attribute", { attribute: "b_escapable" })} - icon={escapable ? "toggle-on" : "toggle-off"} - selected={escapable} - content={escapable ? "Interactions On" : "Interactions Off"} /> - }> - {escapable ? ( - - -
- ); -}; - -const VoreSelectedBellyStyles = (props, context) => { - const { act } = useBackend(context); - - const { belly } = props; - const { - belly_fullscreen, - possible_fullscreens, - disable_hud, - } = belly; - - return ( - -
- - -
-
- - {Object.keys(possible_fullscreens).map(key => ( - - ))} -
- - ); -}; - const VoreUserPreferences = (props, context) => { const { act, data } = useBackend(context); @@ -692,6 +784,7 @@ const VoreUserPreferences = (props, context) => { show_vore_fx, can_be_drop_prey, can_be_drop_pred, + allow_inbelly_spawning, allow_spontaneous_tf, step_mechanics_active, pickup_mechanics_active, @@ -810,6 +903,20 @@ const VoreUserPreferences = (props, context) => { disabled: "Spontaneous Pred Disabled", }, }, + inbelly_spawning: { + action: "toggle_allow_inbelly_spawning", + test: allow_inbelly_spawning, + tooltip: { + main: "This toggle is ghosts being able to spawn in one of your bellies." + + " You will have to confirm again when they attempt to.", + enable: "Click here to allow prey to spawn in you.", + disable: "Click here to prevent prey from spawning in you.", + }, + content: { + enabled: "Inbelly Spawning Allowed", + disabled: "Inbelly Spawning Forbidden", + }, + }, noisy: { action: "toggle_noisy", test: noisy, @@ -944,34 +1051,37 @@ const VoreUserPreferences = (props, context) => { - + - + + + + - + - + - +