diff --git a/code/__defines/dcs/signals.dm b/code/__defines/dcs/signals.dm index 26b1d2d44a..017c92c922 100644 --- a/code/__defines/dcs/signals.dm +++ b/code/__defines/dcs/signals.dm @@ -80,6 +80,8 @@ #define COMSIG_ATOM_UPDATED_ICON "atom_updated_icon" ///from base of atom/Entered(): (atom/movable/entering, /atom) #define COMSIG_ATOM_ENTERED "atom_entered" +/// Sent from the atom that just Entered src. From base of atom/Entered(): (/atom/entered_atom, /atom/oldLoc) +#define COMSIG_ATOM_ENTERING "atom_entering" ///from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc) #define COMSIG_ATOM_EXIT "atom_exit" #define COMPONENT_ATOM_BLOCK_EXIT (1<<0) diff --git a/code/__defines/misc_vr.dm b/code/__defines/misc_vr.dm index 7666707dae..4a477926c7 100644 --- a/code/__defines/misc_vr.dm +++ b/code/__defines/misc_vr.dm @@ -66,3 +66,18 @@ #define MAT_PLASTITANIUMHULL "plastitanium hull" #define MAT_PLASTITANIUMGLASS "plastitanium glass" #define MAT_GOLDHULL "gold hull" + +#define RESIZE_MINIMUM 0.25 +#define RESIZE_MAXIMUM 2 +#define RESIZE_MINIMUM_DORMS 0.01 +#define RESIZE_MAXIMUM_DORMS 6 + +#define RESIZE_HUGE 2 +#define RESIZE_BIG 1.5 +#define RESIZE_NORMAL 1 +#define RESIZE_SMALL 0.5 +#define RESIZE_TINY 0.25 +#define RESIZE_A_HUGEBIG (RESIZE_HUGE + RESIZE_BIG) / 2 +#define RESIZE_A_BIGNORMAL (RESIZE_BIG + RESIZE_NORMAL) / 2 +#define RESIZE_A_NORMALSMALL (RESIZE_NORMAL + RESIZE_SMALL) / 2 +#define RESIZE_A_SMALLTINY (RESIZE_SMALL + RESIZE_TINY) / 2 \ No newline at end of file diff --git a/code/__defines/subsystems.dm b/code/__defines/subsystems.dm index 801d11a4d7..326ae19397 100644 --- a/code/__defines/subsystems.dm +++ b/code/__defines/subsystems.dm @@ -58,7 +58,8 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G #define INIT_ORDER_SKYBOX 30 #define INIT_ORDER_MAPPING 25 #define INIT_ORDER_DECALS 20 -#define INIT_ORDER_PLANTS 18 // Must initialize before atoms. +#define INIT_ORDER_PLANTS 19 // Must initialize before atoms. +#define INIT_ORDER_PLANETS 18 #define INIT_ORDER_JOB 17 #define INIT_ORDER_ALARM 16 // Must initialize before atoms. #define INIT_ORDER_ATOMS 15 @@ -69,7 +70,6 @@ var/global/list/runlevel_flags = list(RUNLEVEL_LOBBY, RUNLEVEL_SETUP, RUNLEVEL_G #define INIT_ORDER_LIGHTING 0 #define INIT_ORDER_AIR -1 #define INIT_ORDER_ASSETS -3 -#define INIT_ORDER_PLANETS -4 #define INIT_ORDER_HOLOMAPS -5 #define INIT_ORDER_NIGHTSHIFT -6 #define INIT_ORDER_OVERLAY -7 diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 16bdfb5945..94bb61d61f 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -11,7 +11,7 @@ var/global/list/traits_costs = list() // Just path = cost list, saves time in c var/global/list/all_traits = list() // All of 'em at once (same instances) var/global/list/active_ghost_pods = list() -var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //TFF 5/8/19 - Suit Sensors global list +var/global/list/sensorpreflist = list("Off", "Binary", "Vitals", "Tracking", "No Preference") //stores numeric player size options indexed by name var/global/list/player_sizes_list = list( @@ -173,8 +173,8 @@ var/global/list/tf_vore_egg_types = list( "Spotted pink" = /obj/item/weapon/storage/vore_egg/pinkspots) var/global/list/edible_trash = list(/obj/item/broken_device, - /obj/item/clothing/accessory/collar, //TFF 10/7/19 - add option to nom collars, - /obj/item/device/communicator, //TFF 19/9/19 - add option to nom communicators and commwatches, + /obj/item/clothing/accessory/collar, + /obj/item/device/communicator, /obj/item/clothing/mask, /obj/item/clothing/glasses, /obj/item/clothing/gloves, diff --git a/code/controllers/subsystems/planets.dm b/code/controllers/subsystems/planets.dm index 5d1325bba5..4cf7222186 100644 --- a/code/controllers/subsystems/planets.dm +++ b/code/controllers/subsystems/planets.dm @@ -6,9 +6,6 @@ SUBSYSTEM_DEF(planets) flags = SS_BACKGROUND runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME - var/static/list/new_outdoor_turfs = list() - var/static/list/new_outdoor_walls = list() - var/static/list/planets = list() var/static/list/z_to_planet = list() @@ -20,7 +17,6 @@ SUBSYSTEM_DEF(planets) /datum/controller/subsystem/planets/Initialize(timeofday) admin_notice("Initializing planetary weather.", R_DEBUG) createPlanets() - allocateTurfs(TRUE) ..() /datum/controller/subsystem/planets/proc/createPlanets() @@ -36,64 +32,36 @@ SUBSYSTEM_DEF(planets) continue z_to_planet[Z] = NP -/datum/controller/subsystem/planets/proc/addTurf(var/turf/T,var/is_edge) - if(is_edge) - new_outdoor_walls |= T - else - new_outdoor_turfs |= T +// DO NOT CALL THIS DIRECTLY UNLESS IT'S IN INITIALIZE, +// USE turf/simulated/proc/make_indoors() and\ +// tyrf/simulated/proc/make_outdoors() +/datum/controller/subsystem/planets/proc/addTurf(var/turf/T) + if(z_to_planet.len >= T.z && z_to_planet[T.z]) + var/datum/planet/P = z_to_planet[T.z] + if(!istype(P)) + return + if(istype(T, /turf/unsimulated/wall/planetary)) + P.planet_walls += T + else if(istype(T, /turf/simulated) && T.outdoors) + P.planet_floors += T + T.vis_contents |= P.weather_holder.visuals + T.vis_contents |= P.weather_holder.special_visuals + /datum/controller/subsystem/planets/proc/removeTurf(var/turf/T,var/is_edge) - if(is_edge) - new_outdoor_walls -= T - else - new_outdoor_turfs -= T - if(z_to_planet.len >= T.z) var/datum/planet/P = z_to_planet[T.z] if(!P) return - if(is_edge) - P.planet_floors -= T - else + if(istype(T, /turf/unsimulated/wall/planetary)) P.planet_walls -= T - T.vis_contents -= P.weather_holder.visuals - T.vis_contents -= P.weather_holder.special_visuals - -/datum/controller/subsystem/planets/proc/allocateTurfs(var/initial = FALSE) - var/list/currentlist = new_outdoor_turfs - while(currentlist.len) - var/turf/simulated/OT = currentlist[currentlist.len] - currentlist.len-- - if(istype(OT) && OT.outdoors && z_to_planet.len >= OT.z && z_to_planet[OT.z]) - var/datum/planet/P = z_to_planet[OT.z] - P.planet_floors |= OT - OT.vis_contents |= P.weather_holder.visuals - OT.vis_contents |= P.weather_holder.special_visuals - if(!initial && MC_TICK_CHECK) - return - - currentlist = new_outdoor_walls - while(currentlist.len) - var/turf/unsimulated/wall/planetary/PW = currentlist[currentlist.len] - currentlist.len-- - if(istype(PW) && z_to_planet.len >= PW.z && z_to_planet[PW.z]) - var/datum/planet/P = z_to_planet[PW.z] - P.planet_walls |= PW - if(!initial && MC_TICK_CHECK) - return - -/datum/controller/subsystem/planets/proc/unallocateTurf(var/turf/simulated/T) - if(istype(T) && z_to_planet[T.z]) - var/datum/planet/P = z_to_planet[T.z] - P.planet_floors -= T - T.vis_contents -= P.weather_holder.visuals - T.vis_contents -= P.weather_holder.special_visuals + else + P.planet_floors -= T + T.vis_contents -= P.weather_holder.visuals + T.vis_contents -= P.weather_holder.special_visuals /datum/controller/subsystem/planets/fire(resumed = 0) - if(new_outdoor_turfs.len || new_outdoor_walls.len) - allocateTurfs() - if(!resumed) src.currentrun = planets.Copy() @@ -153,8 +121,7 @@ SUBSYSTEM_DEF(planets) var/lum_g = new_brightness * GetGreenPart(new_color) / 255 var/lum_b = new_brightness * GetBluePart (new_color) / 255 var/static/update_gen = -1 // Used to prevent double-processing corners. Otherwise would happen when looping over adjacent turfs. - for(var/I in P.planet_floors) - var/turf/simulated/T = I + for(var/turf/simulated/T as anything in P.planet_floors) if(!T.lighting_corners_initialised) T.generate_missing_corners() for(var/C in T.get_corners()) diff --git a/code/datums/autolathe/general.dm b/code/datums/autolathe/general.dm index 00151d6e75..4be460a17d 100644 --- a/code/datums/autolathe/general.dm +++ b/code/datums/autolathe/general.dm @@ -85,7 +85,6 @@ name = "welding mask" path =/obj/item/clothing/head/welding -//TFF 24/12/19 - Let people print more spray bottles if needed. /datum/category_item/autolathe/general/spraybottle name = "spray bottle" path = /obj/item/weapon/reagent_containers/spray diff --git a/code/datums/components/resize_guard.dm b/code/datums/components/resize_guard.dm new file mode 100644 index 0000000000..724d252443 --- /dev/null +++ b/code/datums/components/resize_guard.dm @@ -0,0 +1,19 @@ +/datum/component/resize_guard + +/datum/component/resize_guard/Initialize() + if(!isliving(parent)) + return COMPONENT_INCOMPATIBLE + +/datum/component/resize_guard/RegisterWithParent() + // When our parent mob enters any atom, we check resize + RegisterSignal(parent, COMSIG_ATOM_ENTERING, .proc/check_resize) + +/datum/component/resize_guard/UnregisterFromParent() + UnregisterSignal(parent, COMSIG_ATOM_ENTERING) + +/datum/component/resize_guard/proc/check_resize() + var/area/A = get_area(parent) + if(A?.limit_mob_size) + var/mob/living/L = parent + L.resize(L.size_multiplier) + qdel(src) \ No newline at end of file diff --git a/code/game/area/Space Station 13 areas_vr.dm b/code/game/area/Space Station 13 areas_vr.dm index cdc5ffe96c..9d7b722acc 100644 --- a/code/game/area/Space Station 13 areas_vr.dm +++ b/code/game/area/Space Station 13 areas_vr.dm @@ -1,4 +1,5 @@ -//TFF 28/8/19 - cleanup of areas placement - removes all but rogueminer_vr stuff. +/area + var/limit_mob_size = TRUE //If mob size is limited in the area. /area/shuttle/belter name = "Belter Shuttle" diff --git a/code/game/atoms.dm b/code/game/atoms.dm index c20c29be7b..e4ad20f5d4 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -638,6 +638,7 @@ . = ..() GLOB.moved_event.raise_event(AM, old_loc, AM.loc) SEND_SIGNAL(src, COMSIG_ATOM_ENTERED, AM, old_loc) + SEND_SIGNAL(AM, COMSIG_ATOM_ENTERING, src, old_loc) /atom/Exit(atom/movable/AM, atom/new_loc) . = ..() diff --git a/code/game/dna/dna2_helpers.dm b/code/game/dna/dna2_helpers.dm index d250c441ad..e94befcd8b 100644 --- a/code/game/dna/dna2_helpers.dm +++ b/code/game/dna/dna2_helpers.dm @@ -222,7 +222,7 @@ // Playerscale var/size = dna.GetUIValueRange(DNA_UI_PLAYERSCALE, player_sizes_list.len) if((0 < size) && (size <= player_sizes_list.len)) - H.resize(player_sizes_list[player_sizes_list[size]], FALSE) + H.resize(player_sizes_list[player_sizes_list[size]], TRUE, ignore_prefs = TRUE) // Tail/Taur Color H.r_tail = dna.GetUIValueRange(DNA_UI_TAIL_R, 255) @@ -243,7 +243,7 @@ H.custom_exclaim = dna.custom_exclaim H.species.blood_color = dna.blood_color var/datum/species/S = H.species - S.produceCopy(dna.base_species,dna.species_traits,src) + S.produceCopy(dna.species_traits,src) // VOREStation Edit End H.force_update_organs() //VOREStation Add - Gotta do this too diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 08e22f96e0..d172e0e8db 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -257,9 +257,17 @@ for(var/obj/thing in E.implants) var/implantSubData[0] var/obj/item/weapon/implant/I = thing - implantSubData["name"] = I.name - implantSubData["known"] = istype(I) && I.known_implant - implantData.Add(list(implantSubData)) + //VOREStation Block Edit Start + var/obj/item/device/nif/N = thing + if(istype(I)) + implantSubData["name"] = I.name + implantSubData["known"] = istype(I) && I.known_implant + implantData.Add(list(implantSubData)) + else + implantSubData["name"] = N.name + implantSubData["known"] = istype(N) && N.known_implant + implantData.Add(list(implantSubData)) + //VOREStation Block Edit End organData["implants"] = implantData organData["implants_len"] = implantData.len @@ -464,8 +472,11 @@ var/unknown_body = 0 for(var/thing in e.implants) var/obj/item/weapon/implant/I = thing + var/obj/item/device/nif/N = thing //VOREStation Add: NIFs if(istype(I) && I.known_implant) imp += "[I] implanted:" + if(istype(N) && N.known_implant) //VOREStation Add: NIFs + imp += "[N] implanted:" else unknown_body++ diff --git a/code/game/machinery/doorbell_vr.dm b/code/game/machinery/doorbell_vr.dm index 3c453682b7..3dd029631e 100644 --- a/code/game/machinery/doorbell_vr.dm +++ b/code/game/machinery/doorbell_vr.dm @@ -43,7 +43,6 @@ else icon_state = "dbchime-standby" -//TFF 3/6/19 - Port Cit RP fix of infinite frames. ToDo: Make it so that you can completely deconstruct it and reconstruct it. /obj/machinery/doorbell_chime/attackby(obj/item/W as obj, mob/user as mob) src.add_fingerprint(user) if(default_deconstruction_screwdriver(user, W)) diff --git a/code/game/machinery/exonet_node.dm b/code/game/machinery/exonet_node.dm index a8f6a38734..8fe0e3b5f0 100644 --- a/code/game/machinery/exonet_node.dm +++ b/code/game/machinery/exonet_node.dm @@ -16,7 +16,6 @@ var/list/logs = list() // Gets written to by exonet's send_message() function. -//TFF 3/6/19 - Port Cit RP fix for infinite frames circuit = /obj/item/weapon/circuitboard/telecomms/exonet_node // Proc: New() // Parameters: None diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index a96ef4ed0a..e410914bee 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -428,7 +428,7 @@ Class Procs: for(var/obj/I in contents) if(istype(I,/obj/item/weapon/card/id)) I.forceMove(src.loc) - //TFF 3/6/19 - port Cit RP fix of infinite frames. If it doesn't have a circuit board, don't create a frame. Return a smack instead. BONK! + if(!circuit) return 0 var/obj/structure/frame/A = new /obj/structure/frame(src.loc) diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index 7573e19a6a..ab22628de9 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -3207,7 +3207,6 @@ /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10) vend_delay = 15 -//TFF 19/12/19 - Brig version of a seed storage vendor /obj/machinery/seed_storage/brig name = "Prisoners' food seed storage" starting_seeds = list( diff --git a/code/game/machinery/wall_frames.dm b/code/game/machinery/wall_frames.dm index 764cd378e1..aabb65769a 100644 --- a/code/game/machinery/wall_frames.dm +++ b/code/game/machinery/wall_frames.dm @@ -105,7 +105,7 @@ desc = "Used for building lights." icon = 'icons/obj/lighting.dmi' icon_state = "tube-construct-item" - refund_amt = 2 //TFF 17/1/20 - Oversight fix for infinite steel produciton. + refund_amt = 2 build_machine_type = /obj/machinery/light_construct reverse = 1 diff --git a/code/game/objects/effects/decals/posters/polarisposters.dm b/code/game/objects/effects/decals/posters/polarisposters.dm index 45cfd8622d..8835d58242 100644 --- a/code/game/objects/effects/decals/posters/polarisposters.dm +++ b/code/game/objects/effects/decals/posters/polarisposters.dm @@ -291,7 +291,7 @@ The image seems important." listing_name = "Safety - Mech Operation" -//VOREStation Removal Start TFF 17/12/19 - lore not used in our station's own lore. +//VOREStation Removal Start /* /datum/poster/nanotrasen/nt_4 icon_state = "ntposter04" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index d35a7546b7..4d006f162f 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -294,7 +294,7 @@ icon_state = "lamp" force = 10 center_of_mass = list("x" = 13,"y" = 11) - brightness_on = 10 //TFF 27/11/19 - post refactor fix for intensity levels. + brightness_on = 10 w_class = ITEMSIZE_LARGE power_use = 0 on = 1 diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm index ce75684b0d..aa40fa2f17 100644 --- a/code/game/objects/items/toys/toys.dm +++ b/code/game/objects/items/toys/toys.dm @@ -950,7 +950,7 @@ /obj/item/toy/plushie/mouse name = "mouse plush" desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend." - icon_state = "mouseplushie" //TFF 12/11/19 - updated icon to show a sprite that doesn't replicate a dead mouse. Heck you for that! >:C + icon_state = "mouseplushie" pokephrase = "Squeak!" /obj/item/toy/plushie/kitten diff --git a/code/game/turfs/simulated/outdoors/outdoors.dm b/code/game/turfs/simulated/outdoors/outdoors.dm index 5f438f698f..8ca1659d1b 100644 --- a/code/game/turfs/simulated/outdoors/outdoors.dm +++ b/code/game/turfs/simulated/outdoors/outdoors.dm @@ -31,10 +31,14 @@ var/list/turf_edge_cache = list() return ..() /turf/simulated/proc/make_outdoors() + if(outdoors) + return outdoors = TRUE SSplanets.addTurf(src) /turf/simulated/proc/make_indoors() + if(!outdoors) + return outdoors = FALSE SSplanets.removeTurf(src) diff --git a/code/modules/admin/admin_verb_lists_vr.dm b/code/modules/admin/admin_verb_lists_vr.dm index bc6e620b7a..597c229478 100644 --- a/code/modules/admin/admin_verb_lists_vr.dm +++ b/code/modules/admin/admin_verb_lists_vr.dm @@ -155,6 +155,7 @@ var/list/admin_verbs_fun = list( /client/proc/smite, /client/proc/smite_vr, //VOREStation Add, /client/proc/admin_lightning_strike, + /client/proc/resize //VOREStation Add, ) var/list/admin_verbs_spawn = list( diff --git a/code/modules/admin/verbs/resize.dm b/code/modules/admin/verbs/resize.dm new file mode 100644 index 0000000000..661eea5fca --- /dev/null +++ b/code/modules/admin/verbs/resize.dm @@ -0,0 +1,24 @@ +/client/proc/resize(var/mob/living/L in mob_list) + set name = "Resize" + set desc = "Resizes any living mob without any restrictions on size." + set category = "Fun" + if(!check_rights(R_ADMIN, R_FUN)) + return + + var/size_multiplier = input(usr, "Input size multiplier.", "Resize", 1) as num|null + if(!size_multiplier) + return //cancelled + + size_multiplier = clamp(size_multiplier, 0.01, 1000) + var/can_be_big = L.has_large_resize_bounds() + var/very_big = is_extreme_size(size_multiplier) + + if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse + to_chat(src,"[L] will lose this size upon moving into an area where this size is not allowed.") + else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse + to_chat(src,"[L] will retain this normally unallowed size outside this area.") + + L.resize(size_multiplier, animate = TRUE, uncapped = TRUE, ignore_prefs = TRUE) + + log_and_message_admins("has changed [key_name(L)]'s size multiplier to [size_multiplier].") + feedback_add_details("admin_verb","RESIZE") \ No newline at end of file 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 b80bfdbe08..3fc3b31a5c 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -44,7 +44,6 @@ display_name = "collar, holo" path = /obj/item/clothing/accessory/collar/holo -//TFF 17/6/19 - public loadout addition: Indigestible Holocollar /datum/gear/collar/holo/indigestible display_name = "collar, holo (indigestible)" path = /obj/item/clothing/accessory/collar/holo/indigestible diff --git a/code/modules/client/preference_setup/vore/02_size.dm b/code/modules/client/preference_setup/vore/02_size.dm index a1149821d2..5af5db28b2 100644 --- a/code/modules/client/preference_setup/vore/02_size.dm +++ b/code/modules/client/preference_setup/vore/02_size.dm @@ -45,7 +45,7 @@ character.weight_gain = pref.weight_gain character.weight_loss = pref.weight_loss character.fuzzy = pref.fuzzy - character.resize(pref.size_multiplier, animate = FALSE) + character.resize(pref.size_multiplier, animate = FALSE, ignore_prefs = TRUE) /datum/category_item/player_setup_item/vore/size/content(var/mob/user) . += "
" diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 17147acb27..fdac138e4f 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -114,12 +114,7 @@ pref.dirty_synth = 0 var/datum/species/S = character.species - var/SB - if(S.selects_bodytype) - SB = pref.custom_base ? pref.custom_base : "Human" - else - SB = S.name - var/datum/species/new_S = S.produceCopy(SB, pref.pos_traits + pref.neu_traits + pref.neg_traits, character) + var/datum/species/new_S = S.produceCopy(pref.pos_traits + pref.neu_traits + pref.neg_traits, character, pref.custom_base) //Any additional non-trait settings can be applied here new_S.blood_color = pref.blood_color diff --git a/code/modules/client/preference_setup/vore/09_misc.dm b/code/modules/client/preference_setup/vore/09_misc.dm index 1214fd2c89..aef7c3dfc7 100644 --- a/code/modules/client/preference_setup/vore/09_misc.dm +++ b/code/modules/client/preference_setup/vore/09_misc.dm @@ -1,5 +1,3 @@ -//TFF 5/8/19 - moved /datum/preferences to preferences_vr.dm - /datum/category_item/player_setup_item/vore/misc name = "Misc Settings" sort_order = 9 @@ -9,16 +7,15 @@ S["directory_tag"] >> pref.directory_tag S["directory_erptag"] >> pref.directory_erptag S["directory_ad"] >> pref.directory_ad - S["sensorpref"] >> pref.sensorpref //TFF 5/8/19 - add sensor pref setting to load after saved + S["sensorpref"] >> pref.sensorpref /datum/category_item/player_setup_item/vore/misc/save_character(var/savefile/S) S["show_in_directory"] << pref.show_in_directory S["directory_tag"] << pref.directory_tag S["directory_erptag"] << pref.directory_erptag S["directory_ad"] << pref.directory_ad - S["sensorpref"] << pref.sensorpref //TFF 5/8/19 - add sensor pref setting to be saveable + S["sensorpref"] << pref.sensorpref -//TFF 5/8/19 - add new datum category to allow for setting multiple settings when this is selected in the loadout. /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 @@ -28,7 +25,7 @@ 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)) //TFF - 5/8/19 - add santisation for sensor prefs + pref.sensorpref = sanitize_integer(pref.sensorpref, 1, sensorpreflist.len, initial(pref.sensorpref)) /datum/category_item/player_setup_item/vore/misc/content(var/mob/user) . += "
" @@ -36,7 +33,7 @@ . += "Character Directory Vore Tag: [pref.directory_tag]
" . += "Character Directory ERP Tag: [pref.directory_erptag]
" . += "Character Directory Advertisement: Set Directory Ad
" - . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" //TFF 5/8/19 - Allow selection of sensor settings from off, binary, vitals, tracking, or random + . += "Suit Sensors Preference: [sensorpreflist[pref.sensorpref]]
" /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"]) @@ -58,7 +55,6 @@ var/msg = sanitize(input(user,"Write your advertisement here!", "Flavor Text", html_decode(pref.directory_ad)) as message, extra = 0) //VOREStation Edit: separating out OOC notes pref.directory_ad = msg return TOPIC_REFRESH - //TFF 5/8/19 - add new thing so you can choose the sensor setting your character can get. else if(href_list["toggle_sensor_setting"]) var/new_sensorpref = input(user, "Choose your character's sensor preferences:", "Character Preferences", sensorpreflist[pref.sensorpref]) as null|anything in sensorpreflist if (!isnull(new_sensorpref) && CanUseTopic(user)) diff --git a/code/modules/clothing/clothing_vr.dm b/code/modules/clothing/clothing_vr.dm index bf28eb5a36..43f7a7e0bb 100644 --- a/code/modules/clothing/clothing_vr.dm +++ b/code/modules/clothing/clothing_vr.dm @@ -154,7 +154,6 @@ SPECIES_VOX = 'icons/mob/species/vox/suit.dmi', SPECIES_WEREBEAST = 'icons/mob/species/werebeast/suit.dmi') -//TFF 5/8/19 - sets Vorestation /obj/item/clothing/under sensor setting default? /obj/item/clothing/under sensor_mode = 3 var/sensorpref = 5 @@ -165,7 +164,6 @@ SPECIES_GREY_YW = 'icons/mob/species/grey/uniform.dmi'/*ywedit*/ ) -//TFF 5/8/19 - define numbers and specifics for suit sensor settings /obj/item/clothing/under/New(var/mob/living/carbon/human/H) ..() sensorpref = isnull(H) ? 1 : (ishuman(H) ? H.sensorpref : 1) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 9638a414bd..b20524a136 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -30,8 +30,6 @@ icon_state = "grey" rolled_sleeves = 0 -//TFF 5/8/19 - add a non perma-set orange jumpsuit, splits prison into its own obj with override var settings. -//TFF 5/9/19 - add a different icon_state to both jumpsuits, orange and prison. Refactors orange and prison jumpsuit slightly. /obj/item/clothing/under/color/orange name = "orange jumpsuit" icon_state = "orange" diff --git a/code/modules/clothing/under/miscellaneous_vr.dm b/code/modules/clothing/under/miscellaneous_vr.dm index 075b3daece..4c581d728b 100644 --- a/code/modules/clothing/under/miscellaneous_vr.dm +++ b/code/modules/clothing/under/miscellaneous_vr.dm @@ -79,6 +79,8 @@ return var/new_size = input("Put the desired size (25-200%), or (1-600%) in dormitory areas.", "Set Size", 200) as num|null + if(!new_size) + return //cancelled //Check AGAIN because we accepted user input which is blocking. if (src != H.w_uniform) @@ -88,9 +90,9 @@ if (H.stat || H.restrained()) return - if (isnull(H.size_multiplier)) + if (isnull(H.size_multiplier)) // Why would this ever be the case? to_chat(H,"The uniform panics and corrects your apparently microscopic size.") - H.resize(RESIZE_NORMAL) + H.resize(RESIZE_NORMAL, ignore_prefs = TRUE) H.update_icons() //Just want the matrix transform return @@ -102,7 +104,7 @@ if(new_size != H.size_multiplier) if(!original_size) original_size = H.size_multiplier - H.resize(new_size/100) + H.resize(new_size/100, 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 @@ -111,7 +113,7 @@ . = ..() if(. && ishuman(M) && original_size) var/mob/living/carbon/human/H = M - H.resize(original_size) + H.resize(original_size, ignore_prefs = TRUE) 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!") diff --git a/code/modules/events/infestation.dm b/code/modules/events/infestation.dm index 125dc69773..eff20ca2a3 100644 --- a/code/modules/events/infestation.dm +++ b/code/modules/events/infestation.dm @@ -89,8 +89,8 @@ vermstring = "lizards" if(VERM_SPIDERS) spawn_types = list(/obj/effect/spider/spiderling) - min_number = 6 //CHOMP Add - max_number = 12 //CHOMP edit + min_number = 4 //CHOMP Add + max_number = 8 //CHOMP edit vermstring = "spiders" spawn(0) diff --git a/code/modules/events/rogue_drones.dm b/code/modules/events/rogue_drones.dm index 5f06681757..c0c55f1cc6 100644 --- a/code/modules/events/rogue_drones.dm +++ b/code/modules/events/rogue_drones.dm @@ -22,7 +22,7 @@ /datum/event/rogue_drone/announce() var/msg var/rng = rand(1,5) - //CHOMPStation Edit Start TFF 14/1/20 - Virgo 3b -> Sif + //CHOMPStation Edit Start switch(rng) if(1) msg = "A combat drone wing operating in close orbit above Sif has failed to return from a anti-piracy sweep. If any are sighted, \ diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm index 8a99178923..1168d2e643 100644 --- a/code/modules/events/spider_infestation.dm +++ b/code/modules/events/spider_infestation.dm @@ -7,7 +7,7 @@ /datum/event/spider_infestation/setup() announceWhen = rand(announceWhen, announceWhen + 60) - spawncount = rand(12 * severity, 18 * severity) //spiderlings only have a 50% chance to grow big and strong //CHOMP Edit: Tripled amount spawned + spawncount = rand(6 * severity, 12 * severity) //spiderlings only have a 50% chance to grow big and strong //CHOMP Edit: Tripled amount spawned sent_spiders_to_station = 0 /datum/event/spider_infestation/announce() diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index d28ea98bef..89bea23108 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -58,7 +58,7 @@ desc = "It's beef. It's roasted. It's been a staple of dining tradition for centuries." icon = 'icons/obj/food_vr.dmi' icon_state = "roastbeef" - trash = /obj/item/trash/plate //TFF 30/11/19 - Roast beef are put on plates, not waffle trays, you dunce~ + trash = /obj/item/trash/plate nutriment_amt = 8 nutriment_desc = list("cooked meat" = 5) diff --git a/code/modules/holomap/holomap_area.dm b/code/modules/holomap/holomap_area.dm index a9677c562e..71a762c7fc 100644 --- a/code/modules/holomap/holomap_area.dm +++ b/code/modules/holomap/holomap_area.dm @@ -33,7 +33,6 @@ /area/engineering holomap_color = HOLOMAP_AREACOLOR_ENGINEERING -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake holomap_color = null /area/maintenance/substation/engineering diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index bec4978201..66e7875e16 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -94,7 +94,6 @@ to_chat(user, "You load [W] into [src].") return -//TFF 3/6/19 - fix infinite frame creation, ported from Cit RP - also allow movement of hydroponic-related machines. if(default_deconstruction_screwdriver(user, W)) return if(W.is_wrench()) diff --git a/code/modules/mob/living/bot/farmbot.dm b/code/modules/mob/living/bot/farmbot.dm index 3172836d44..9334fbbcec 100644 --- a/code/modules/mob/living/bot/farmbot.dm +++ b/code/modules/mob/living/bot/farmbot.dm @@ -10,7 +10,7 @@ icon_state = "farmbot0" health = 50 maxHealth = 50 - req_one_access = list(access_robotics, access_hydroponics, access_xenobiology) //TFF 11/7/19 - adds Xenobio access on behalf of Nalarac + req_one_access = list(access_robotics, access_hydroponics, access_xenobiology) var/action = "" // Used to update icon var/waters_trays = 1 diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index 5eeda3a8e4..e8df964590 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -207,15 +207,6 @@ return FALSE -/mob/living/carbon/human/verb/toggle_resizing_immunity() - set name = "Toggle Resizing Immunity" - set desc = "Toggles your ability to resist resizing attempts" - set category = "IC" - - resizable = !resizable - to_chat(src, "You are now [resizable ? "susceptible" : "immune"] to being resized.") - - /mob/living/carbon/human/proc/handle_flip_vr() var/original_density = density var/original_passflags = pass_flags diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 50b3c9b053..04afa47243 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -492,6 +492,7 @@ This function restores all organs. switch(damagetype) if(BRUTE) damageoverlaytemp = 20 + if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} //CHOMPSTATION edit. Fixes NIF armour. damage = damage*species.brute_mod for(var/datum/modifier/M in modifiers) @@ -504,6 +505,7 @@ This function restores all organs. UpdateDamageIcon() if(BURN) damageoverlaytemp = 20 + if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){damage *= 0.7} //CHOMPSTATION edit. Fixes NIF armour. damage = damage*species.burn_mod for(var/datum/modifier/M in modifiers) diff --git a/code/modules/mob/living/carbon/human/human_defines_vr.dm b/code/modules/mob/living/carbon/human/human_defines_vr.dm index 0ac1b641d3..de940a81df 100644 --- a/code/modules/mob/living/carbon/human/human_defines_vr.dm +++ b/code/modules/mob/living/carbon/human/human_defines_vr.dm @@ -7,7 +7,6 @@ var/impersonate_bodytype //For impersonating a bodytype var/ability_flags = 0 //Shadekin abilities/potentially other species-based? var/sensorpref = 5 //Suit sensor loadout pref - var/unnaturally_resized = FALSE //If one became larger than 200%, or smaller than 25%. This flag is needed for the case when admins want someone to be very big or very small outside of dorms. var/wings_hidden = FALSE var/nutrition_hidden = FALSE // Chomp Edit diff --git a/code/modules/mob/living/carbon/human/human_movement.dm b/code/modules/mob/living/carbon/human/human_movement.dm index dc44f61d91..c04abed29f 100644 --- a/code/modules/mob/living/carbon/human/human_movement.dm +++ b/code/modules/mob/living/carbon/human/human_movement.dm @@ -97,6 +97,7 @@ var/their_slowdown = max(H.calculate_item_encumbrance(), 1) item_tally = max(item_tally, their_slowdown) // If our slowdown is less than theirs, then we become as slow as them (before species modifires). + item_tally /= 2 //VOREStation Add item_tally *= species.item_slowdown_mod . += item_tally diff --git a/code/modules/mob/living/carbon/human/human_organs.dm b/code/modules/mob/living/carbon/human/human_organs.dm index cc48565ff4..83710dacd3 100644 --- a/code/modules/mob/living/carbon/human/human_organs.dm +++ b/code/modules/mob/living/carbon/human/human_organs.dm @@ -104,7 +104,8 @@ else if (E.is_dislocated()) stance_damage += 0.5 - if(E) limb_pain = E.organ_can_feel_pain() + if(E && (!E.is_usable() || E.is_broken() || E.is_dislocated())) //VOREStation Edit + limb_pain = E.organ_can_feel_pain() // Canes and crutches help you stand (if the latter is ever added) // One cane mitigates a broken leg+foot, or a missing foot. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f1e6271fa1..484d3747a3 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -62,8 +62,6 @@ //No need to update all of these procs if the guy is dead. fall() //VORESTATION EDIT. Prevents people from floating - if(unnaturally_resized) //VORESTATION EDIT. - handle_unnatural_size() if(stat != DEAD && !stasis) //Updates the number of stored chemicals for powers handle_changeling() diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm index 2440a1ab74..c5248fc862 100644 --- a/code/modules/mob/living/carbon/human/life_vr.dm +++ b/code/modules/mob/living/carbon/human/life_vr.dm @@ -78,10 +78,3 @@ // Moving around increases germ_level faster if(germ_level < GERM_LEVEL_MOVE_CAP && prob(8)) germ_level++ - -/mob/living/carbon/human/proc/handle_unnatural_size() - if(!in_dorms()) - if(src.size_multiplier > 2) - src.resize(2) - else if (src.size_multiplier < 0.25) - src.resize(0.25) \ 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 385dd1b7d9..b125d6ad20 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -416,7 +416,6 @@ H.visible_message( \ "[H] shakes [target]'s hand.", \ "You shake [target]'s hand.", ) - //TFF 15/12/19 - Port nose booping from CHOMPStation else if(H.zone_sel.selecting == "mouth") H.visible_message( \ "[H] boops [target]'s nose.", \ diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index fb9beed574..06c9d2bdf3 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -42,16 +42,28 @@ nif.nifsofts = nifsofts else ..() -/datum/species/proc/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) - ASSERT(to_copy) +/datum/species/proc/produceCopy(var/list/traits,var/mob/living/carbon/human/H, var/custom_base) + var/datum/species/S + //If species allows custom base, and custom base is set, apply it, otherwise use default. + if(selects_bodytype && custom_base) + S = GLOB.all_species[custom_base] + else + S = GLOB.all_species[src.name] + ASSERT(S) ASSERT(istype(H)) + var/datum/species/new_copy = new S.type() - if(ispath(to_copy)) - to_copy = "[initial(to_copy.name)]" - if(istext(to_copy)) - to_copy = GLOB.all_species[to_copy] + for(var/i in S.vars) //Thorough copy of species. + if(new_copy.vars[i] != S.vars[i]) + //Skipping lists because they may contain more lists, copy those manually. + //Also ignoring type var since it's read-only and will runtime. + if(islist(vars[i])) + continue + new_copy.vars[i] = S.vars[i] - var/datum/species/new_copy = new to_copy.type() + for(var/organ in S.has_limbs) //Copy important organ data generated by species. + var/list/organ_data = S.has_limbs[organ] + new_copy.has_limbs[organ] = organ_data.Copy() new_copy.traits = traits @@ -59,12 +71,20 @@ if(new_copy.traits) for(var/trait in new_copy.traits) var/datum/trait/T = all_traits[trait] - T.apply(new_copy,H) + T.apply(new_copy, H) //Set up a mob H.species = new_copy + H.icon_state = new_copy.get_bodytype() + + if(new_copy.holder_type) + H.holder_type = new_copy.holder_type if(H.dna) H.dna.ready_dna(H) - return new_copy \ No newline at end of file + return new_copy + + +/datum/species/get_bodytype() + return base_species \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index 434fd8add6..99f3ad22e3 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -447,55 +447,6 @@ //End of fruit gland code. -/datum/species/alraune/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) - ASSERT(to_copy) - ASSERT(istype(H)) - - if(ispath(to_copy)) - to_copy = "[initial(to_copy.name)]" - if(istext(to_copy)) - to_copy = GLOB.all_species[to_copy] - - var/datum/species/alraune/new_copy = new() - - //Initials so it works with a simple path passed, or an instance - new_copy.base_species = to_copy.name - new_copy.icobase = to_copy.icobase - new_copy.deform = to_copy.deform - new_copy.tail = to_copy.tail - new_copy.tail_animation = to_copy.tail_animation - new_copy.icobase_tail = to_copy.icobase_tail - new_copy.color_mult = to_copy.color_mult - new_copy.primitive_form = to_copy.primitive_form - new_copy.appearance_flags = to_copy.appearance_flags - new_copy.flesh_color = to_copy.flesh_color - new_copy.base_color = to_copy.base_color - new_copy.blood_mask = to_copy.blood_mask - new_copy.damage_mask = to_copy.damage_mask - new_copy.damage_overlays = to_copy.damage_overlays - new_copy.traits = traits - - //If you had traits, apply them - if(new_copy.traits) - for(var/trait in new_copy.traits) - var/datum/trait/T = all_traits[trait] - T.apply(new_copy,H) - - //Set up a mob - H.species = new_copy - H.icon_state = lowertext(new_copy.get_bodytype()) - - if(new_copy.holder_type) - H.holder_type = new_copy.holder_type - - if(H.dna) - H.dna.ready_dna(H) - - return new_copy - -/datum/species/alraune/get_bodytype() - return base_species - /datum/species/alraune/get_race_key() var/datum/species/real = GLOB.all_species[base_species] return real.race_key diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index 9a418e271b..53c5bd9b5e 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -45,61 +45,14 @@ BP_R_FOOT = list("path" = /obj/item/organ/external/foot/right, "descriptor" = "right foot") ) -/datum/species/custom/get_bodytype() - return base_species - /datum/species/custom/get_race_key() var/datum/species/real = GLOB.all_species[base_species] return real.race_key -/datum/species/custom/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) - ASSERT(to_copy) - ASSERT(istype(H)) - - if(ispath(to_copy)) - to_copy = "[initial(to_copy.name)]" - if(istext(to_copy)) - to_copy = GLOB.all_species[to_copy] - - var/datum/species/custom/new_copy = new() - - //Initials so it works with a simple path passed, or an instance - new_copy.base_species = to_copy.name - new_copy.icobase = to_copy.icobase - new_copy.deform = to_copy.deform - new_copy.tail = to_copy.tail - new_copy.tail_animation = to_copy.tail_animation - new_copy.icobase_tail = to_copy.icobase_tail - new_copy.color_mult = to_copy.color_mult - new_copy.primitive_form = to_copy.primitive_form - new_copy.appearance_flags = to_copy.appearance_flags - new_copy.flesh_color = to_copy.flesh_color - new_copy.base_color = to_copy.base_color - new_copy.blood_mask = to_copy.blood_mask - new_copy.damage_mask = to_copy.damage_mask - new_copy.damage_overlays = to_copy.damage_overlays - new_copy.traits = traits - new_copy.move_trail = move_trail - new_copy.has_floating_eyes = has_floating_eyes - - //If you had traits, apply them - if(new_copy.traits) - for(var/trait in new_copy.traits) - var/datum/trait/T = all_traits[trait] - T.apply(new_copy,H) - - //Set up a mob - H.species = new_copy - H.maxHealth = new_copy.total_health - H.hunger_rate = new_copy.hunger_factor - - if(new_copy.holder_type) - H.holder_type = new_copy.holder_type - - if(H.dna) - H.dna.ready_dna(H) - - return new_copy +/datum/species/custom/produceCopy(var/list/traits,var/mob/living/carbon/human/H) + . = ..() + H.maxHealth = H.species.total_health + H.hunger_rate = H.species.hunger_factor // Stub species overrides for shoving trait abilities into 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 07d6d070f4..b797fe7c16 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 @@ -502,7 +502,7 @@ var/global/list/disallowed_protean_accessories = list( var/atom/reform_spot = blob.drop_location() //Size update - resize(blob.size_multiplier, FALSE) + resize(blob.size_multiplier, FALSE, ignore_prefs = TRUE) //Move them back where the blob was forceMove(reform_spot) diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index 4efff07b39..a27319b51b 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -396,14 +396,14 @@ //Sizing up if(cost > 0) if(refactory.use_stored_material(MAT_STEEL,cost)) - user.resize(size_factor) + user.resize(size_factor, ignore_prefs = TRUE) else to_chat(user,"That size change would cost [cost] steel, which you don't have.") //Sizing down (or not at all) else if(cost <= 0) cost = abs(cost) var/actually_added = refactory.add_stored_material(MAT_STEEL,cost) - user.resize(size_factor) + user.resize(size_factor, ignore_prefs = TRUE) if(actually_added != cost) to_chat(user,"Unfortunately, [cost-actually_added] steel was lost due to lack of storage space.") diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 31f6638e83..0bb05f1af9 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -294,56 +294,6 @@ // HUD update time update_xenochimera_hud(H, danger, feral_state) - -/datum/species/xenochimera/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) - ASSERT(to_copy) - ASSERT(istype(H)) - - if(ispath(to_copy)) - to_copy = "[initial(to_copy.name)]" - if(istext(to_copy)) - to_copy = GLOB.all_species[to_copy] - - var/datum/species/xenochimera/new_copy = new() - - //Initials so it works with a simple path passed, or an instance - new_copy.base_species = to_copy.name - new_copy.icobase = to_copy.icobase - new_copy.deform = to_copy.deform - new_copy.tail = to_copy.tail - new_copy.tail_animation = to_copy.tail_animation - new_copy.icobase_tail = to_copy.icobase_tail - new_copy.color_mult = to_copy.color_mult - new_copy.primitive_form = to_copy.primitive_form - new_copy.appearance_flags = to_copy.appearance_flags - new_copy.flesh_color = to_copy.flesh_color - new_copy.base_color = to_copy.base_color - new_copy.blood_mask = to_copy.blood_mask - new_copy.damage_mask = to_copy.damage_mask - new_copy.damage_overlays = to_copy.damage_overlays - new_copy.traits = traits - - //If you had traits, apply them - if(new_copy.traits) - for(var/trait in new_copy.traits) - var/datum/trait/T = all_traits[trait] - T.apply(new_copy,H) - - //Set up a mob - H.species = new_copy - H.icon_state = lowertext(new_copy.get_bodytype()) - - if(new_copy.holder_type) - H.holder_type = new_copy.holder_type - - if(H.dna) - H.dna.ready_dna(H) - - return new_copy - -/datum/species/xenochimera/get_bodytype() - return base_species - /datum/species/xenochimera/get_race_key() var/datum/species/real = GLOB.all_species[base_species] return real.race_key diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 057d17f7dd..7e901ccc0f 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -1120,13 +1120,13 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() return //If you are FBP with wing style and didn't set a custom one - if(synthetic && synthetic.includes_wing && !wing_style) + if(synthetic && synthetic.includes_wing && !wing_style && !wings_hidden) //VOREStation Edit var/icon/wing_s = new/icon("icon" = synthetic.icon, "icon_state" = "wing") //I dunno. If synths have some custom wing? wing_s.Blend(rgb(src.r_skin, src.g_skin, src.b_skin), species.color_mult ? ICON_MULTIPLY : ICON_ADD) return image(wing_s) //If you have custom wings selected - if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL)) + if(wing_style && !(wear_suit && wear_suit.flags_inv & HIDETAIL) && !wings_hidden) //VOREStation Edit var/icon/wing_s = new/icon("icon" = wing_style.icon, "icon_state" = flapping && wing_style.ani_state ? wing_style.ani_state : wing_style.icon_state) if(wing_style.do_colouration) wing_s.Blend(rgb(src.r_wing, src.g_wing, src.b_wing), wing_style.color_blend_mode) diff --git a/code/modules/mob/living/living_defines_vr.dm b/code/modules/mob/living/living_defines_vr.dm index 648ea8aa49..8dc2c2fe19 100644 --- a/code/modules/mob/living/living_defines_vr.dm +++ b/code/modules/mob/living/living_defines_vr.dm @@ -5,8 +5,6 @@ var/ooc_notes = null appearance_flags = TILE_BOUND|PIXEL_SCALE|KEEP_TOGETHER var/hunger_rate = DEFAULT_HUNGER_FACTOR - var/resizable = TRUE - //custom say verbs var/custom_say = null var/custom_ask = null @@ -16,4 +14,4 @@ //YW Add Start /mob var/wingdings = 0 -//Yw Add End +//Yw Add End \ No newline at end of file diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index bcbfebd05d..257b1204c9 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -8,7 +8,7 @@ var/list/department_radio_keys = list( ":n" = "Science", ".n" = "Science", ":m" = "Medical", ".m" = "Medical", ":e" = "Engineering", ".e" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", //TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such., + ":k" = "Response Team", ".k" = "Response Team", ":s" = "Security", ".s" = "Security", ":w" = "whisper", ".w" = "whisper", ":t" = "Mercenary", ".t" = "Mercenary", @@ -27,7 +27,7 @@ var/list/department_radio_keys = list( ":N" = "Science", ".N" = "Science", ":M" = "Medical", ".M" = "Medical", ":E" = "Engineering", ".E" = "Engineering", - ":k" = "Response Team", ".k" = "Response Team", //TFF 11/3/20 - Add Response Team to channels usable rather than resorting to :H or such., + ":k" = "Response Team", ".k" = "Response Team", ":S" = "Security", ".S" = "Security", ":W" = "whisper", ".W" = "whisper", ":T" = "Mercenary", ".T" = "Mercenary", diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index ba4eff8e10..59d8a69060 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -56,7 +56,7 @@ "Chirp" = list("chirps","chirrups","cheeps"), "Feline" = list("purrs","yowls","meows"), "Canine" = list("yaps","barks","woofs"), - "Rodent" = list("squeaks", "SQUEAKS", "sqiks") //VOREStation Edit - TFF 22/11/19 - CHOMPStation port of pAI additions, + "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 @@ -333,8 +333,7 @@ close_up() -//VOREStation Removal Start - TFF 22/11/19 - Refactored in pai_vr.dm -/* +/* //VOREStation Removal Start /mob/living/silicon/pai/proc/choose_chassis() set category = "pAI Commands" set name = "Choose Chassis" diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm index f44d39f460..b8eb228326 100644 --- a/code/modules/mob/living/silicon/pai/pai_vr.dm +++ b/code/modules/mob/living/silicon/pai/pai_vr.dm @@ -1,7 +1,6 @@ /mob/living/silicon/pai var/people_eaten = 0 icon = 'icons/mob/pai_vr.dmi' - //TFF 22/11/19 - CHOMPStation port of pAI additions. var/global/list/wide_chassis = list( "rat", "panther" @@ -36,7 +35,6 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" - //TFF 22/11/19 - CHOMPStation port of pAI additions. if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' pixel_x = -16 @@ -58,7 +56,6 @@ else if(people_eaten && resting) icon_state = "[chassis]_rest_full" - //TFF 22/11/19 - CHOMPStation port of pAI additions. if(chassis in wide_chassis) icon = 'icons/mob/pai_vr64x64.dmi' pixel_x = -16 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 7b2da46008..4a843eed80 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 @@ -121,7 +121,7 @@ else if(ismob(target)) var/mob/living/M = target - resize(M.size_multiplier) + resize(M.size_multiplier, ignore_prefs = TRUE) //Morphed is weaker melee_damage_lower = melee_damage_disguised @@ -165,7 +165,7 @@ maptext = null size_multiplier = our_size_multiplier - resize(size_multiplier) + resize(size_multiplier, ignore_prefs = TRUE) //Baseline stats melee_damage_lower = initial(melee_damage_lower) @@ -183,7 +183,7 @@ /mob/living/simple_mob/vore/hostile/morph/will_show_tooltip() return (!morphed) -/mob/living/simple_mob/vore/hostile/morph/resize(var/new_size, var/animate = TRUE) +/mob/living/simple_mob/vore/hostile/morph/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) if(morphed && !ismob(form)) return return ..() diff --git a/code/modules/mob/new_player/preferences_setup_vr.dm b/code/modules/mob/new_player/preferences_setup_vr.dm index dca0ff56ec..d15ec88af5 100644 --- a/code/modules/mob/new_player/preferences_setup_vr.dm +++ b/code/modules/mob/new_player/preferences_setup_vr.dm @@ -1,3 +1,2 @@ -//TFF 5/8/19 - add randomised sensor setting for random button clicking /datum/preferences/randomize_appearance_and_body_for(var/mob/living/carbon/human/H) sensorpref = rand(1,5) \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm index f69ec4a574..52d1d1923b 100644 --- a/code/modules/mob/new_player/sprite_accessories_extra_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_extra_vr.dm @@ -728,3 +728,9 @@ icon_state = "unathilongfrills" color_blend_mode = ICON_MULTIPLY body_parts = list(BP_HEAD) + +/datum/sprite_accessory/marking/vr/thunderthighs + name = "Boosted Thighs" + icon_state = "thunderthighs" + color_blend_mode = ICON_MULTIPLY + body_parts = list(BP_L_LEG,BP_R_LEG) \ No newline at end of file diff --git a/code/modules/mob/new_player/sprite_accessories_taur.dm b/code/modules/mob/new_player/sprite_accessories_taur.dm index 748a6904b4..db2394f84a 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur.dm @@ -146,7 +146,6 @@ suit_sprites = 'icons/mob/taursuits_wolf.dmi' icon_sprite_tag = "wolf" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" @@ -158,7 +157,6 @@ extra_overlay = "wolf_markings" //icon_sprite_tag = "wolf2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf dual-color (Taur)" icon_state = "fatwolf_s" @@ -245,7 +243,6 @@ suit_sprites = 'icons/mob/taursuits_feline.dmi' icon_sprite_tag = "feline" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" @@ -262,7 +259,6 @@ extra_overlay = "feline_markings" //icon_sprite_tag = "feline2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline dual-color (Taur)" icon_state = "fatfeline_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 c9e451c625..4bc79e1629 100644 --- a/code/modules/mob/new_player/sprite_accessories_taur_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_taur_vr.dm @@ -57,7 +57,6 @@ suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi' icon_sprite_tag = "wolf" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatwolf name = "Fat Wolf (Taur)" icon_state = "fatwolf_s" @@ -70,18 +69,6 @@ extra_overlay2 = "wolf_markings_2" //icon_sprite_tag = "wolf2c" -//MTosh 08/01/2020 - CHOMPstation Moved Synth Wolf up under wolf dual-color, and Fat Wolf below Synth Wolf, to better group original vorestation wolf taurs/differentiate from Chompstation Fat Taurs -/datum/sprite_accessory/tail/taur/wolf/synthwolf - name = "SynthWolf dual-color (Taur)" - icon_state = "synthwolf_s" - extra_overlay = "synthwolf_markings" - -//TFF 22/11/19 - CHOMPStation port of fat taur sprites -//Mtosh 08/01/2020 - CHOMPStation changed datum tree from "tail/taur/fatwolf" to "tail/taur/wolf/fatwolf" in order to fix bug involving taur duty vest. -/datum/sprite_accessory/tail/taur/wolf/fatwolf - name = "Fat Wolf (Taur)" - icon_state = "fatwolf_s" - /datum/sprite_accessory/tail/taur/wolf/fatwolf_2c name = "Fat Wolf 3-color (Taur)" icon_state = "fatwolf_s" @@ -287,7 +274,6 @@ suit_sprites = 'icons/mob/taursuits_feline_vr.dmi' icon_sprite_tag = "feline" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/fatfeline name = "Fat Feline (Taur)" icon_state = "fatfeline_s" @@ -305,7 +291,6 @@ extra_overlay2 = "feline_markings_2" //icon_sprite_tag = "feline2c" -//TFF 22/11/19 - CHOMPStation port of fat taur sprites /datum/sprite_accessory/tail/taur/feline/fatfeline_2c name = "Fat Feline 3-color (Taur)" icon_state = "fatfeline_s" diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index bd7c1d0d49..fc0c3bebdd 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -192,7 +192,7 @@ var/datum/preferences/B = O.client.prefs for(var/language in B.alternate_languages) O.add_language(language) - O.resize(B.size_multiplier, animate = TRUE) //VOREStation Addition: add size prefs to borgs + O.resize(B.size_multiplier, animate = TRUE, ignore_prefs = TRUE) //VOREStation Addition: add size prefs to borgs O.fuzzy = B.fuzzy //VOREStation Addition: add size prefs to borgs callHook("borgify", list(O)) diff --git a/code/modules/nifsoft/software/10_combat.dm b/code/modules/nifsoft/software/10_combat.dm index a63e323792..ea9810ad4c 100644 --- a/code/modules/nifsoft/software/10_combat.dm +++ b/code/modules/nifsoft/software/10_combat.dm @@ -7,7 +7,7 @@ illegal = TRUE wear = 3 access = 999 //Prevents anyone from buying it without an emag. - activates = FALSE //It's armor. + //CHOMPSTATION edit. Makes NIF armour toggleable. combat_flags = (NIF_C_BRUTEARMOR) // Default on when installed, clear when uninstalled /datum/nifsoft/burn_armor @@ -19,7 +19,7 @@ illegal = TRUE wear = 3 access = 999 //Prevents anyone from buying it without an emag. - activates = FALSE //It's armor. + //CHOMPSTATION edit. Makes NIF armour toggleable. combat_flags = (NIF_C_BURNARMOR) // Default on when installed, clear when uninstalled /datum/nifsoft/painkillers diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm index 2b173346ce..79592fa030 100644 --- a/code/modules/nifsoft/software/15_misc.dm +++ b/code/modules/nifsoft/software/15_misc.dm @@ -134,7 +134,7 @@ to_chat(nif.human,"The safety features of the NIF Program prevent you from choosing this size.") return else - if(nif.human.resize(new_size/100)) + if(nif.human.resize(new_size/100, uncapped=nif.human.has_large_resize_bounds(), ignore_prefs = TRUE)) to_chat(nif.human,"You set the size to [new_size]%") nif.human.visible_message("Swirling grey mist envelops [nif.human] as they change size!","Swirling streams of nanites wrap around you as you change size!") spawn(0) diff --git a/code/modules/planet/sif.dm b/code/modules/planet/sif.dm index e3f0b31810..b7c4f7f3b7 100644 --- a/code/modules/planet/sif.dm +++ b/code/modules/planet/sif.dm @@ -216,15 +216,17 @@ var/datum/planet/sif/planet_sif = null outdoor_sounds_type = /datum/looping_sound/weather/outside_snow indoor_sounds_type = /datum/looping_sound/weather/inside_snow +/* /datum/weather/sif/snow/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) T.chill() +*/ /datum/weather/sif/blizzard name = "blizzard" @@ -249,15 +251,17 @@ var/datum/planet/sif/planet_sif = null outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard +/* /datum/weather/sif/blizzard/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) T.chill() +*/ /datum/weather/sif/rain name = "rain" @@ -283,25 +287,21 @@ var/datum/planet/sif/planet_sif = null /datum/weather/sif/rain/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(1) if(show_message) @@ -340,24 +340,21 @@ var/datum/planet/sif/planet_sif = null /datum/weather/sif/storm/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. + // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain showers loudly onto your umbrella!") + continue L.water_act(2) @@ -401,20 +398,18 @@ var/datum/planet/sif/planet_sif = null /datum/weather/sif/hail/process_effects() ..() - for(var/humie in human_mob_list) - var/mob/living/carbon/human/H = humie + for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) if(!T.outdoors) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail - var/obj/item/weapon/melee/umbrella/U - if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) - U = H.get_active_hand() - else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = H.get_active_hand() + if(!istype(U) || !U.open) U = H.get_inactive_hand() - if(U && U.open) + + if(istype(U) && U.open) if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue diff --git a/code/modules/planet/virgo3b_better_vr.dm b/code/modules/planet/virgo3b_better_vr.dm index 80fbdc2a89..219788e3de 100644 --- a/code/modules/planet/virgo3b_better_vr.dm +++ b/code/modules/planet/virgo3b_better_vr.dm @@ -156,15 +156,17 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null outdoor_sounds_type = /datum/looping_sound/weather/outside_snow indoor_sounds_type = /datum/looping_sound/weather/inside_snow +/* /datum/weather/virgo3b_better/snow/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) T.chill() +*/ /datum/weather/virgo3b_better/blizzard name = "blizzard" @@ -189,15 +191,17 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard +/* /datum/weather/virgo3b_better/blizzard/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) T.chill() +*/ /datum/weather/virgo3b_better/rain name = "rain" @@ -220,25 +224,21 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null /datum/weather/virgo3b_better/rain/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(1) if(show_message) @@ -275,25 +275,21 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null /datum/weather/virgo3b_better/storm/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain showers loudly onto your umbrella!") + continue L.water_act(2) @@ -335,20 +331,18 @@ var/datum/planet/virgo3b_better/planet_virgo3b_better = null /datum/weather/virgo3b_better/hail/process_effects() ..() - for(var/humie in human_mob_list) - var/mob/living/carbon/human/H = humie + for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) if(!T.outdoors) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail - var/obj/item/weapon/melee/umbrella/U - if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) - U = H.get_active_hand() - else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = H.get_active_hand() + if(!istype(U) || !U.open) U = H.get_inactive_hand() - if(U && U.open) + + if(istype(U) && U.open) if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue diff --git a/code/modules/planet/virgo3b_vr.dm b/code/modules/planet/virgo3b_vr.dm index 710f2698c0..f9cc58ca0c 100644 --- a/code/modules/planet/virgo3b_vr.dm +++ b/code/modules/planet/virgo3b_vr.dm @@ -203,15 +203,17 @@ var/datum/planet/virgo3b/planet_virgo3b = null outdoor_sounds_type = /datum/looping_sound/weather/outside_snow indoor_sounds_type = /datum/looping_sound/weather/inside_snow +/* /datum/weather/virgo3b/snow/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) T.chill() +*/ /datum/weather/virgo3b/blizzard name = "blizzard" @@ -236,15 +238,17 @@ var/datum/planet/virgo3b/planet_virgo3b = null outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard +/* /datum/weather/virgo3b/blizzard/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) T.chill() +*/ /datum/weather/virgo3b/rain name = "rain" @@ -270,25 +274,21 @@ var/datum/planet/virgo3b/planet_virgo3b = null /datum/weather/virgo3b/rain/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(1) if(show_message) @@ -325,25 +325,21 @@ var/datum/planet/virgo3b/planet_virgo3b = null /datum/weather/virgo3b/storm/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(2) @@ -385,20 +381,18 @@ var/datum/planet/virgo3b/planet_virgo3b = null /datum/weather/virgo3b/hail/process_effects() ..() - for(var/humie in human_mob_list) - var/mob/living/carbon/human/H = humie + for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) if(!T.outdoors) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail - var/obj/item/weapon/melee/umbrella/U - if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) - U = H.get_active_hand() - else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = H.get_active_hand() + if(!istype(U) || !U.open) U = H.get_inactive_hand() - if(U && U.open) + + if(istype(U) && U.open) if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue diff --git a/code/modules/planet/virgo4_vr.dm b/code/modules/planet/virgo4_vr.dm index 50c0b8426e..3909b9e6cd 100644 --- a/code/modules/planet/virgo4_vr.dm +++ b/code/modules/planet/virgo4_vr.dm @@ -32,35 +32,35 @@ var/datum/planet/virgo4/planet_virgo4 = null var/min = 0 switch(sun_position) - if(0 to 0.30) // Night - low_brightness = 0.1 + if(0 to 0.20) // Night + low_brightness = 0.3 low_color = "#000066" - high_brightness = 0.2 + high_brightness = 0.5 high_color = "#66004D" min = 0 - if(0.30 to 0.40) // Twilight - low_brightness = 0.4 + if(0.20 to 0.30) // Twilight + low_brightness = 0.5 low_color = "#66004D" - high_brightness = 0.6 + high_brightness = 0.9 high_color = "#CC3300" min = 0.40 - if(0.40 to 0.50) // Sunrise/set - low_brightness = 0.7 + if(0.30 to 0.40) // Sunrise/set + low_brightness = 0.9 low_color = "#CC3300" - high_brightness = 0.9 + high_brightness = 3.0 high_color = "#FF9933" min = 0.50 - if(0.50 to 1.00) // Noon - low_brightness = 1 + if(0.40 to 1.00) // Noon + low_brightness = 3.0 low_color = "#DDDDDD" - high_brightness = 2 + high_brightness = 10.0 high_color = "#FFFFFF" min = 0.70 @@ -187,15 +187,17 @@ var/datum/planet/virgo4/planet_virgo4 = null outdoor_sounds_type = /datum/looping_sound/weather/outside_snow indoor_sounds_type = /datum/looping_sound/weather/inside_snow +/* /datum/weather/virgo4/snow/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(33)) T.chill() +*/ /datum/weather/virgo4/blizzard name = "blizzard" @@ -217,15 +219,17 @@ var/datum/planet/virgo4/planet_virgo4 = null outdoor_sounds_type = /datum/looping_sound/weather/outside_blizzard indoor_sounds_type = /datum/looping_sound/weather/inside_blizzard +/* /datum/weather/virgo4/blizzard/process_effects() ..() - for(var/turf/simulated/floor/outdoors/snow/S in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either + for(var/turf/simulated/floor/outdoors/snow/S as anything in SSplanets.new_outdoor_turfs) //This didn't make any sense before SSplanets, either if(S.z in holder.our_planet.expected_z_levels) for(var/dir_checked in cardinal) var/turf/simulated/floor/T = get_step(S, dir_checked) if(istype(T)) if(istype(T, /turf/simulated/floor/outdoors) && prob(50)) T.chill() +*/ /datum/weather/virgo4/rain name = "rain" @@ -248,25 +252,21 @@ var/datum/planet/virgo4/planet_virgo4 = null /datum/weather/virgo4/rain/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain patters softly onto your umbrella.") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain patters softly onto your umbrella.") + continue L.water_act(1) if(show_message) @@ -298,25 +298,21 @@ var/datum/planet/virgo4/planet_virgo4 = null /datum/weather/virgo4/storm/process_effects() ..() - for(var/mob/living/L in living_mob_list) + for(var/mob/living/L as anything in living_mob_list) if(L.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(L) if(!T.outdoors) continue // They're indoors, so no need to rain on them. // If they have an open umbrella, it'll guard from rain - if(istype(L.get_active_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue - else if(istype(L.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) - var/obj/item/weapon/melee/umbrella/U = L.get_inactive_hand() - if(U.open) - if(show_message) - to_chat(L, "Rain showers loudly onto your umbrella!") - continue + var/obj/item/weapon/melee/umbrella/U = L.get_active_hand() + if(!istype(U) || !U.open) + U = L.get_inactive_hand() + + if(istype(U) && U.open) + if(show_message) + to_chat(L, "Rain showers loudly onto your umbrella!") + continue L.water_act(2) @@ -355,20 +351,18 @@ var/datum/planet/virgo4/planet_virgo4 = null /datum/weather/virgo4/hail/process_effects() ..() - for(var/humie in human_mob_list) - var/mob/living/carbon/human/H = humie + for(var/mob/living/carbon/H as anything in human_mob_list) if(H.z in holder.our_planet.expected_z_levels) var/turf/T = get_turf(H) if(!T.outdoors) continue // They're indoors, so no need to pelt them with ice. // If they have an open umbrella, it'll guard from hail - var/obj/item/weapon/melee/umbrella/U - if(istype(H.get_active_hand(), /obj/item/weapon/melee/umbrella)) - U = H.get_active_hand() - else if(istype(H.get_inactive_hand(), /obj/item/weapon/melee/umbrella)) + var/obj/item/weapon/melee/umbrella/U = H.get_active_hand() + if(!istype(U) || !U.open) U = H.get_inactive_hand() - if(U && U.open) + + if(istype(U) && U.open) if(show_message) to_chat(H, "Hail patters onto your umbrella.") continue diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index 28835d7fdd..2657b34a0a 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -95,7 +95,6 @@ playsound(src, 'sound/effects/lightningshock.ogg', 100, 1, extrarange = 5) tesla_zap(src, 10, power/(coeff/2)) -//TFF 3/6/19 - Port Cit RP fix for infinite frames /obj/machinery/power/grounding_rod name = "grounding rod" desc = "Keep an area from being fried from Edison's Bane." diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 1a647ecd08..0fda973243 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1483,7 +1483,7 @@ /datum/reagent/qerr_quem name = "Qerr-quem" - id = "querr_quem" + id = "qerr_quem" description = "A potent stimulant and anti-anxiety medication, made for the Qerr-Katish." taste_description = "mint" reagent_state = LIQUID diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm index 02334afe15..920316fd5f 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm @@ -13,8 +13,7 @@ mrate_static = TRUE /datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.size_range_check(M.size_multiplier)) - M.resize(M.size_multiplier+0.01, FALSE)//Incrrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy. + M.resize(M.size_multiplier+0.01, animate = FALSE, uncapped = M.has_large_resize_bounds()) //Incrrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy. return /datum/reagent/microcillin @@ -27,8 +26,7 @@ mrate_static = TRUE /datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) - if(M.size_range_check(M.size_multiplier)) - M.resize(M.size_multiplier-0.01, FALSE) //Decrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy. + M.resize(M.size_multiplier-0.01, animate = FALSE, uncapped = M.has_large_resize_bounds()) //Decrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy. return diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index fe0a4c1381..1098c5e713 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -6,7 +6,6 @@ item_state = "cleaner" center_of_mass = list("x" = 16,"y" = 10) flags = OPENCONTAINER|NOBLUDGEON - //TFF 24/12/19 - Let people print more spray bottles if needed. matter = list("glass" = 300, DEFAULT_WALL_MATERIAL = 300) slot_flags = SLOT_BELT throwforce = 3 diff --git a/code/modules/turbolift/turbolift_console_vr.dm b/code/modules/turbolift/turbolift_console_vr.dm index a02730c08d..d244418693 100644 --- a/code/modules/turbolift/turbolift_console_vr.dm +++ b/code/modules/turbolift/turbolift_console_vr.dm @@ -1,5 +1,3 @@ -// TFF 6/10/20 - Just a little thing to prevent the button - // and console from being destroyed by explosions. /obj/structure/lift/button/ex_act() return diff --git a/code/modules/vehicles/Securitrain_vr.dm b/code/modules/vehicles/Securitrain_vr.dm index 0320721038..e8b1750691 100644 --- a/code/modules/vehicles/Securitrain_vr.dm +++ b/code/modules/vehicles/Securitrain_vr.dm @@ -23,7 +23,7 @@ var/car_limit = 0 //how many cars an engine can pull before performance degrades. This should be 0 to prevent trailers from unhitching. active_engines = 1 - var/obj/item/weapon/key/key //TFF 19/1/20 - Bugfix for key being prevented from getting used again + var/obj/item/weapon/key/key var/key_type = /obj/item/weapon/key/security var/siren = 0 //This is for eventually getting the siren sprite to work. @@ -62,7 +62,7 @@ /obj/vehicle/train/security/engine/New() ..() cell = new /obj/item/weapon/cell/high(src) - key = new key_type(src) //TFF 19/1/20 - Bugfix for key being prevented from getting used again + key = new key_type(src) var/image/I = new(icon = 'icons/obj/vehicles.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs overlays += I turn_off() //so engine verbs are correctly set @@ -91,7 +91,7 @@ ..() /obj/vehicle/train/security/engine/attackby(obj/item/weapon/W as obj, mob/user as mob) - if(istype(W, key_type)) //TFF 19/1/20 - Bugfix for key being prevented from getting used again + if(istype(W, key_type)) if(!key) user.drop_item() W.forceMove(src) diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm index 719aba151d..f4ea03a86f 100644 --- a/code/modules/vore/eating/living_vr.dm +++ b/code/modules/vore/eating/living_vr.dm @@ -3,7 +3,8 @@ var/digestable = TRUE // Can the mob be digested inside a belly? var/devourable = TRUE // Can the mob be devoured at all? var/feeding = TRUE // Can the mob be vorishly force fed or fed to others? - var/absorbable = TRUE // Are you allowed to absorb this person? TFF addition 14/12/19 + var/absorbable = TRUE // Are you allowed to absorb this person? + 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/showvoreprefs = TRUE // Determines if the mechanical vore preferences button will be displayed on the mob or not. @@ -208,12 +209,12 @@ return TRUE -/mob/living/proc/apply_vore_prefs() +/mob/living/proc/apply_vore_prefs(var/full_vorgans = FALSE) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization. if(!client || !client.prefs_vr) return FALSE if(!client.prefs_vr.load_vore()) return FALSE - if(!copy_from_prefs_vr()) + if(!copy_from_prefs_vr(full_vorgans = full_vorgans)) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization. return FALSE return TRUE @@ -228,7 +229,8 @@ P.digestable = src.digestable P.devourable = src.devourable P.feeding = src.feeding - P.absorbable = src.absorbable //TFF 14/12/19 - choose whether allowing absorbing + P.absorbable = src.absorbable + P.resizable = src.resizable P.digest_leave_remains = src.digest_leave_remains P.allowmobvore = src.allowmobvore P.vore_taste = src.vore_taste @@ -259,7 +261,7 @@ // // Proc for applying vore preferences, given bellies // -/mob/living/proc/copy_from_prefs_vr(var/bellies = TRUE) +/mob/living/proc/copy_from_prefs_vr(var/bellies = TRUE, var/full_vorgans = FALSE) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization. if(!client || !client.prefs_vr) to_chat(src,"You attempted to apply your vore prefs but somehow you're in this character without a client.prefs_vr variable. Tell a dev.") return FALSE @@ -269,7 +271,8 @@ digestable = P.digestable devourable = P.devourable feeding = P.feeding - absorbable = P.absorbable //TFF 14/12/19 - choose whether allowing absorbing + absorbable = P.absorbable + resizable = P.resizable digest_leave_remains = P.digest_leave_remains allowmobvore = P.allowmobvore vore_taste = P.vore_taste @@ -291,7 +294,8 @@ vore_organs.Cut() for(var/entry in P.belly_prefs) list_to_object(entry,src) - break //CHOMPedit: Belly load optimization. Only load first belly, save the rest for vorepanel. + if(!full_vorgans) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization. + break //CHOMPedit: Belly load optimization. Only load first belly, save the rest for vorepanel. return TRUE @@ -706,7 +710,6 @@ to_chat(src, "You can taste the flavor of garbage and leftovers. Delicious?") else to_chat(src, "You can taste the flavor of gluttonous waste of food.") - //TFF 10/7/19 - Add custom flavour for collars for trash can trait. 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]!") diff --git a/code/modules/vore/eating/vore_vr.dm b/code/modules/vore/eating/vore_vr.dm index 5a69bc9dc9..ba5938f336 100644 --- a/code/modules/vore/eating/vore_vr.dm +++ b/code/modules/vore/eating/vore_vr.dm @@ -45,26 +45,28 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE //Actual preferences var/digestable = TRUE var/devourable = TRUE + var/absorbable = TRUE var/feeding = TRUE - var/absorbable = TRUE //TFF 14/12/19 - choose whether allowing absorbing - var/digest_leave_remains = FALSE - var/allowmobvore = TRUE - var/list/belly_prefs = list() - var/vore_taste = "nothing in particular" - var/vore_smell = "nothing in particular" - var/permit_healbelly = TRUE - var/show_vore_fx = TRUE var/can_be_drop_prey = FALSE var/can_be_drop_pred = FALSE + var/digest_leave_remains = FALSE + var/allowmobvore = TRUE + var/permit_healbelly = TRUE + + var/resizable = TRUE + var/show_vore_fx = TRUE var/step_mechanics_pref = FALSE var/pickup_pref = TRUE - //CHOMP stuff var/receive_reagents = FALSE var/give_reagents = FALSE var/latejoin_vore = FALSE + //CHOMP stuff end + var/list/belly_prefs = list() + var/vore_taste = "nothing in particular" + var/vore_smell = "nothing in particular" //Mechanically required var/path @@ -129,8 +131,9 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE digestable = json_from_file["digestable"] devourable = json_from_file["devourable"] + resizable = json_from_file["resizable"] feeding = json_from_file["feeding"] - absorbable = json_from_file["absorbable"] //TFF 14/12/19 - choose whether allowing absorbing + absorbable = json_from_file["absorbable"] digest_leave_remains = json_from_file["digest_leave_remains"] allowmobvore = json_from_file["allowmobvore"] vore_taste = json_from_file["vore_taste"] @@ -155,6 +158,8 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE digestable = TRUE if(isnull(devourable)) devourable = TRUE + if(isnull(resizable)) + resizable = TRUE if(isnull(feeding)) feeding = TRUE if(isnull(absorbable)) @@ -197,6 +202,7 @@ V::::::V V::::::VO:::::::OOO:::::::ORR:::::R R:::::REE::::::EEEEEE "version" = version, "digestable" = digestable, "devourable" = devourable, + "resizable" = resizable, "absorbable" = absorbable, "feeding" = feeding, "digest_leave_remains" = digest_leave_remains, diff --git a/code/modules/vore/eating/vorepanel_vr.dm b/code/modules/vore/eating/vorepanel_vr.dm index 6a892c65d1..a5c40c867a 100644 --- a/code/modules/vore/eating/vorepanel_vr.dm +++ b/code/modules/vore/eating/vorepanel_vr.dm @@ -254,6 +254,7 @@ data["prefs"] = list( "digestable" = host.digestable, "devourable" = host.devourable, + "resizable" = host.resizable, "feeding" = host.feeding, "absorbable" = host.absorbable, "digest_leave_remains" = host.digest_leave_remains, @@ -355,7 +356,7 @@ var/alert = alert("Are you sure you want to reload character slot preferences? This will remove your current vore organs and eject their contents.","Confirmation","Reload","Cancel") if(alert != "Reload") return FALSE - if(!host.apply_vore_prefs()) + if(!host.apply_vore_prefs(TRUE)) //CHOMPedit: full_vorgans var to bypass 1-belly load optimization. alert("ERROR: Chomp-specific preferences failed to apply!","Error") else to_chat(usr,"Chomp-specific preferences applied from active slot!") @@ -415,6 +416,12 @@ host.client.prefs_vr.devourable = host.devourable unsaved_changes = TRUE return TRUE + if("toggle_resize") + host.resizable = !host.resizable + if(host.client.prefs_vr) + host.client.prefs_vr.resizable = host.resizable + unsaved_changes = TRUE + return TRUE if("toggle_feed") host.feeding = !host.feeding if(host.client.prefs_vr) diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index e0b7cc44fc..2b73c2e30d 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -340,7 +340,7 @@ name = "Mouse Plushie" desc = "A plushie of a delightful mouse! What was once considered a vile rodent is now your very best friend." slot_flags = SLOT_HEAD - icon_state = "mouse_brown" //TFF 12/11/19 - Change sprite to not look dead. Heck you for that choice! >:C + icon_state = "mouse_brown" item_state = "mouse_brown_head" icon = 'icons/vore/custom_items_vr.dmi' icon_override = 'icons/vore/custom_items_vr.dmi' diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm index 703706483f..04c3e47dba 100644 --- a/code/modules/vore/resizing/resize_vr.dm +++ b/code/modules/vore/resizing/resize_vr.dm @@ -1,17 +1,3 @@ - -//these aren't defines so they can stay in this file -var/const/RESIZE_HUGE = 2 -var/const/RESIZE_BIG = 1.5 -var/const/RESIZE_NORMAL = 1 -var/const/RESIZE_SMALL = 0.5 -var/const/RESIZE_TINY = 0.25 - -//average -var/const/RESIZE_A_HUGEBIG = (RESIZE_HUGE + RESIZE_BIG) / 2 -var/const/RESIZE_A_BIGNORMAL = (RESIZE_BIG + RESIZE_NORMAL) / 2 -var/const/RESIZE_A_NORMALSMALL = (RESIZE_NORMAL + RESIZE_SMALL) / 2 -var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 - // Adding needed defines to /mob/living // Note: Polaris had this on /mob/living/carbon/human We need it higher up for animals and stuff. /mob/living @@ -60,32 +46,45 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 /mob/living/get_effective_size() return size_multiplier +/atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that + var/area/A = get_area(src) //Get the atom's area to check for size limit. + if((A.limit_mob_size && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) + return FALSE + return TRUE + +/atom/movable/proc/has_large_resize_bounds() + var/area/A = get_area(src) //Get the atom's area to check for size limit. + return !A.limit_mob_size + +/proc/is_extreme_size(size) + return (size < RESIZE_MINIMUM || size > RESIZE_MAXIMUM) + + /** * Resizes the mob immediately to the desired mod, animating it growing/shrinking. * It can be used by anything that calls it. */ -/atom/movable/proc/in_dorms() - var/area/A = get_area(src) - return istype(A, /area/crew_quarters/sleep) -/atom/movable/proc/size_range_check(size_select) //both objects and mobs needs to have that - if((!in_dorms() && (size_select > 200 || size_select < 25)) || (size_select > 600 || size_select <1)) - return FALSE - return TRUE -/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/mark_unnatural_size = TRUE) +/mob/living/proc/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) + if(!uncapped) + new_size = clamp(new_size, RESIZE_MINIMUM, RESIZE_MAXIMUM) + var/datum/component/resize_guard/guard = GetComponent(/datum/component/resize_guard) + if(guard) + qdel(guard) + else if(has_large_resize_bounds()) + if(is_extreme_size(new_size)) + AddComponent(/datum/component/resize_guard) + else + var/datum/component/resize_guard/guard = GetComponent(/datum/component/resize_guard) + if(guard) + qdel(guard) + if(size_multiplier == new_size) return 1 size_multiplier = new_size //Change size_multiplier so that other items can interact with them - if(ishuman(src)) - var/mob/living/carbon/human/H = src - if(new_size > 2 || new_size < 0.25) - if(mark_unnatural_size) //Will target size be reverted to ordinary bounds when out of dorms or not? - H.unnaturally_resized = TRUE - else - H.unnaturally_resized = FALSE if(animate) var/change = new_size - size_multiplier var/duration = (abs(change)+0.25) SECONDS @@ -111,8 +110,8 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 else update_transform() //Lame way -/mob/living/carbon/human/resize(var/new_size, var/animate = TRUE) - if(!resizable) +/mob/living/carbon/human/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) + if(!resizable && !ignore_prefs) return 1 if(species) vis_height = species.icon_height @@ -125,7 +124,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2 apply_hud(index, HI) // Optimize mannequins - never a point to animating or doing HUDs on these. -/mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE) +/mob/living/carbon/human/dummy/mannequin/resize(var/new_size, var/animate = TRUE, var/uncapped = FALSE, var/ignore_prefs = FALSE) size_multiplier = new_size /** diff --git a/code/modules/vore/resizing/sizegun_vr.dm b/code/modules/vore/resizing/sizegun_vr.dm index e30c218fbb..41775af2a5 100644 --- a/code/modules/vore/resizing/sizegun_vr.dm +++ b/code/modules/vore/resizing/sizegun_vr.dm @@ -44,12 +44,15 @@ set category = "Object" set src in view(1) - var/size_select = input("Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num - if(!size_range_check(size_select)) - to_chat(usr, "Invalid size.") - return - size_set_to = (size_select/100) + var/size_select = input("Put the desired size (25-200%), (1-600%) in dormitory areas.", "Set Size", size_set_to * 100) as num|null + if(!size_select) + return //cancelled + //We do valid resize testing in actual firings because people move after setting these things. + //Just a basic clamp here to the valid ranges. + size_set_to = clamp((size_select/100), RESIZE_MINIMUM_DORMS, RESIZE_MAXIMUM_DORMS) to_chat(usr, "You set the size to [size_select]%") + 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/examine(mob/user) . = ..() @@ -66,8 +69,10 @@ set category = "Object" set src in view(1) - var/size_select = input("Put the desired size", "Set Size", size_set_to * 100) as num - size_set_to = max(1,size_select/100) //No negative numbers + var/size_select = input("Put the desired size (1-600%)", "Set Size", size_set_to * 100) as num|null + if(!size_select) + return //cancelled + size_set_to = clamp((size_select/100), 0, 1000) //eheh to_chat(usr, "You set the size to [size_select]%") // @@ -88,21 +93,30 @@ /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(!M.in_dorms() || !istype(M, /mob/living/carbon/human)) - if(!M.resize(clamp(set_size,0.25,2))) - to_chat(M, "The beam fires into your body, changing your size!") - else - if(!M.resize(clamp(set_size,0.01,6))) - to_chat(M, "The beam fires into your body, changing your size!") + 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() return return 1 /obj/item/projectile/beam/sizelaser/admin/on_hit(var/atom/target) var/mob/living/M = target + if(istype(M)) - M.resize(set_size, TRUE, FALSE) + + var/can_be_big = M.has_large_resize_bounds() + var/very_big = is_extreme_size(set_size) + + if(very_big && can_be_big) // made an extreme size in an area that allows it, don't assume adminbuse + to_chat(firer, "[M] will lose this size upon moving into an area where this size is not allowed.") + else if(very_big) // made an extreme size in an area that doesn't allow it, assume adminbuse + to_chat(firer, "[M] will retain this normally unallowed size outside this area.") + + M.resize(set_size, uncapped = TRUE, ignore_prefs = TRUE) // Always ignores prefs, caution is advisable + to_chat(M, "The beam fires into your body, changing your size!") M.updateicon() return diff --git a/code/modules/xenoarcheaology/finds/finds.dm b/code/modules/xenoarcheaology/finds/finds.dm index 4713ac0e76..aa620393dd 100644 --- a/code/modules/xenoarcheaology/finds/finds.dm +++ b/code/modules/xenoarcheaology/finds/finds.dm @@ -21,7 +21,7 @@ icon_state = "strange" var/datum/geosample/geologic_data origin_tech = list(TECH_MATERIAL = 5) - w_class = ITEMSIZE_SMALL //TFF 25/11/19 - fixes the strange rocks to be small size like before and not normal. + w_class = ITEMSIZE_SMALL /obj/item/weapon/strangerock/New(loc, var/inside_item_type = 0) pixel_x = rand(0,16)-8 diff --git a/icons/mob/human_races/markings_vr.dmi b/icons/mob/human_races/markings_vr.dmi index 175e5387c6..6a96c24689 100644 Binary files a/icons/mob/human_races/markings_vr.dmi and b/icons/mob/human_races/markings_vr.dmi differ diff --git a/maps/expedition_vr/space/_debrisfield.dm b/maps/expedition_vr/space/_debrisfield.dm index e8ffd87a0b..f1b36da15a 100644 --- a/maps/expedition_vr/space/_debrisfield.dm +++ b/maps/expedition_vr/space/_debrisfield.dm @@ -71,8 +71,6 @@ icon_state = "debrisexplored" forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') -//TFF 26/12/19 - Sub-areas for the APCs. - /area/submap/debrisfield/derelict/ai_access_port name = "POI - Abandoned Derelict AI Acess Port" diff --git a/maps/gateway_vr/listeningpost.dm b/maps/gateway_vr/listeningpost.dm index 59dc7ce1b4..07683dd19e 100644 --- a/maps/gateway_vr/listeningpost.dm +++ b/maps/gateway_vr/listeningpost.dm @@ -2,30 +2,29 @@ initial_generic_waypoints = list("tether_excursion_listeningpost") scanner_name = "Strange Asteroid" scanner_desc = @{"[i]Registration[/i]: UNKNOWN -[i]Class[/i]: Installation -[i]Transponder[/i]: None Detected -[b]Notice[/b]: Emitting encrypted radio-frequency traffic"} +[i]Class[/i]: Wreckage +[i]Transponder[/i]: None Detected"} -/obj/item/weapon/paper/listneningpost/mission +/obj/item/weapon/paper/listeningpost/mission name = "\improper Operation: Watchtower" info = {"Mission Details: You have been assigned to a newly constructed listening post - constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. + constructed within an asteroid in Nanotrasen space to monitor their phoron mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."} -/obj/item/weapon/paper/listneningpost/reciept +/obj/item/weapon/paper/listeningpost/reciept name = "\improper SpacEx reciept" info = {"1 x Stechtkin pistol plus ammo - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"} //////// 2558 //////// -/obj/item/weapon/paper/listneningpost/year2558/april +/obj/item/weapon/paper/listeningpost/year2558/april name = "\improper April 2558 report" info = {"A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."} -/obj/item/weapon/paper/listneningpost/year2558/may +/obj/item/weapon/paper/listeningpost/year2558/may name = "\improper May 2558 report" info = {"I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment. I also learned that @@ -33,34 +32,34 @@ attack in March. Ever since Townes got killed, we've lost our eyes on the inside at Nanotrasen. Hence my being here..."} -/obj/item/weapon/paper/listneningpost/year2558/june +/obj/item/weapon/paper/listeningpost/year2558/june name = "\improper June 2558 Report" info = {"Sounds like Nanotrasen stepped up their recruitment efforts. Virgo is no longer a secluded research station, and its scientists are no longer hand-picked. This could be a major oppertunity for us to start snooping around."} -/obj/item/weapon/paper/listneningpost/year2558/july +/obj/item/weapon/paper/listeningpost/year2558/july name = "\improper July 2558 Report" info = {"The crew has at least tripled in size since NT got rid of the application-based process of recruitment. We've managed to find a few people interested in aiding our cause. From atmospherics sabotoge to straight up bombing the place, we've got several people ready to go in posing as nothing but more grey tide. It's perfect."} -/obj/item/weapon/paper/listneningpost/year2558/august +/obj/item/weapon/paper/listeningpost/year2558/august name = "\improper August 2558 Report" info = {"Sounds like our agents have been successful in rattling things up. With their recuitment policies laxed, we've been able to carry out several attacks on the VORE. It sounds like we're the least of their problems, though. They've discovered a new technology. Something they're calling Redspace."} -/obj/item/weapon/paper/listneningpost/year2558/september +/obj/item/weapon/paper/listeningpost/year2558/september name = "\improper September 2558 Report" info = {"Something REALLY BAD is brewing at the VORE. This Redspace shit seems to have attracted the attention of the cult of Nar-Sie. I think Nanotrasen is trying to weaponize it. We need to put a stop to this before Nanotrasen can use these weapons against innocent people and rival companies."} -/obj/item/weapon/paper/listneningpost/year2558/october +/obj/item/weapon/paper/listeningpost/year2558/october name = "\improper October 2558 Report" info = {"Oh my god, if it weren't for the impending doom, I'd be laughing my ass off at all the hell VORE has put up with this month. Near mutiny over a retarded clown, @@ -71,7 +70,7 @@ in an army from another dimension. We have no time left. We have to strike while there's still something worth saving."} -/obj/item/weapon/paper/listneningpost/year2558/november +/obj/item/weapon/paper/listeningpost/year2558/november name = "\improper November 2558 Report" info = {"Maybe these VORE people aren't so bad after all. Mike says they actually HELPED during our (apparently failed) attack on the Citadel. Shame they work for an evil corporation @@ -80,7 +79,7 @@ crazy guy showed up on the station claiming he's from 1945. The crew seems to think it's legit though. Maybe he is. I don't think he is though. I'll keep monitoring the situation."} -/obj/item/weapon/paper/listneningpost/year2558/december +/obj/item/weapon/paper/listeningpost/year2558/december name = "\improper December 2558 Report" info = {"We hired a merc to capture their top Redspace scientist Kisuke Gema. Unfortunately, Colonel Morgan was a fucking idiot as usual and turned his back for half a second, and the nerd cut @@ -92,7 +91,7 @@ //////// 2559 //////// -/obj/item/weapon/paper/listneningpost/year2559/january +/obj/item/weapon/paper/listeningpost/year2559/january name = "\improper January 2559 Report" info = {"So, this guy from 1945 is legit. His name is Chase Monroe and he's a former Seargent in the USCM or something. Although I feel like the USCM didn't exist in 1945. Also a pirate @@ -101,7 +100,7 @@ blow several bombs on the station, and even steal the nuke. VORE's security forces are showing serious signs of weakness. Maybe we could exploit this."} -/obj/item/weapon/paper/listneningpost/year2559/february +/obj/item/weapon/paper/listeningpost/year2559/february name = "\improper February 2559 Report" info = {"Sounds like the World War 2 guy from Earth brought some unwanted friends along. Early in the month, a battlecruiser showed up out of nowhere and started shooting up the station @@ -110,7 +109,7 @@ the Soviets got a beef with these guys too. Sounds like they jacked one of the Soviet's ships. Makes sense, because a battleship like that doesn't just appear out of nowhere."} -/obj/item/weapon/paper/listneningpost/year2559/march +/obj/item/weapon/paper/listeningpost/year2559/march name = "\improper March 2559 Report" info = {"Hard to believe it's already been a year. NT's private navy has been running exercises more often than usual. They also replaced the Icarus with a new and more heavily armed cruiser called @@ -121,7 +120,7 @@ say about Nanotrasen. The Truth will set us free. The truth about all the atrocities Nanotrasen has done over the years."} -/obj/item/weapon/paper/listneningpost/year2559/april +/obj/item/weapon/paper/listeningpost/year2559/april name = "\improper April 2559 Report" info = {"We were approached today by a man calling himself the 'Werwolf', alleged to be part of that group that attacked Nanotrasen in early February. We never understood his motives WHY he attacked them. @@ -131,13 +130,13 @@ I think we're going to take the deal. When I get confirmation, I'll forward a line to Mike and Dave to make the trade."} -/obj/item/weapon/paper/listneningpost/year2559/may +/obj/item/weapon/paper/listeningpost/year2559/may name = "\improper May 2559 Report" info = {"V.O.R.E. found something. An abandoned space station with a weapon called a mind flayer. There's also rumor about some sort of a secret weapon NT was developing; a singularity bomb. Nothing of else of real interest to report."} -/obj/item/weapon/paper/listneningpost/year2559/june +/obj/item/weapon/paper/listeningpost/year2559/june name = "\improper June 2559 Report" info = {"The WW2 guy is dead. Went out in a blaze of glory killing Space Axis. Mike and Dave are pissed. They apparently broke protocol and went to help the V.O.R.E. crew in the attack, and they want to @@ -146,7 +145,7 @@ NanoTrasen to deal with. Curiously, NanoTrasen refuses to officially support helping to remove this threat. Possible collaberation?"} -/obj/item/weapon/paper/listneningpost/year2559/july +/obj/item/weapon/paper/listeningpost/year2559/july name = "\improper July 2559 Report" info = {"USDF ships have been spotted in the area. Admiral Glenn Pink is on board. This guy went MIA almost ten years ago, and now he's back? Why? Apparently he's got some kind of connection with V.O.R.E.'s @@ -154,7 +153,7 @@ plot. I don't know who this Admiral Pink is, but I guess Ace has at least a couple friends in high places."} -/obj/item/weapon/paper/listneningpost/year2559/august +/obj/item/weapon/paper/listeningpost/year2559/august name = "\improper August 2559 Report" info = {"So, the reason Admiral Pink showed up in the last report was because these Space Axis hijacked one of his vessels; the USDF Jormungandr or something. Well, the crazy bastards took it back. @@ -166,27 +165,27 @@ arm was destroyed, and with it, all of his genetic information to get around his cloning disorder. So he's finally out of our hair."} -/obj/item/weapon/paper/listneningpost/year2559/september +/obj/item/weapon/paper/listeningpost/year2559/september name = "\improper September 2559 Report" info = {"Of course it's not that simple. The nerd is back from the dead. Wonderful. I don't know how but he's back, or they have a fake Kisuke Gema, or whatever bullshit. In other news, the station has been slated for demolition. They're shipping a new Mark-3 Exodus-class station from Bay Shipyards all the way from the NanoTrasen branch in Nyx. The demolition keeps getting delayed."} -/obj/item/weapon/paper/listneningpost/year2559/october +/obj/item/weapon/paper/listeningpost/year2559/october name = "\improper October 2559 Report" info = {"Station was demolished and operations were put on pause for a whole week. In other news, captain Ace reportedly got a promotion to CentCom but something went wrong. The stronger loyalty implant had a negative effect on him and almost killed him. He was quickly demoted back to Captain. This could be useful information later. Recommend command investigate thoroughly."} -/obj/item/weapon/paper/listneningpost/year2559/november +/obj/item/weapon/paper/listeningpost/year2559/november name = "\improper November 2559 Report" info = {"A clown federation owned vessel called the Calypso was discovered in the Virgo system. It was a ghost ship. Allegedly everyone on board perished due to a joke so funny that everyone laughed themselves to madness, then death. NanoTrasen is trying to cover it up. No one knows why."} -/obj/item/weapon/paper/listneningpost/year2559/december +/obj/item/weapon/paper/listeningpost/year2559/december name = "\improper December 2559 Report" info = {"The V.O.R.E. discovered a new gateway location; a clown temple. We need to send someone to see this. Reportedly it's full of tunnel clowns and these mutants called cluwnes. A clown researcher @@ -199,25 +198,26 @@ and see if he wants a job. Ask our contacts on station. Surely one of them knows who's behind the heist."} -/obj/item/weapon/paper/listneningpost/year2560/january +/obj/item/weapon/paper/listeningpost/year2560/january name = "\improper January 2560 Report" info = {"A group of Akula pirates tried to kidnap Kisuke Gema. They succeded, but their leader died of his injuries soon after. The other pirates defected. I wonder why?"} -/obj/item/weapon/paper/listneningpost/year2560/february +/obj/item/weapon/paper/listeningpost/year2560/february name = "\improper February 2560 Report" info = {"There were a few incidents regarding a redspace anomaly in the chapel but the effects have long since subsided. Nothing of major interest otherwise."} -/obj/item/weapon/paper/listneningpost/year2560/march +/obj/item/weapon/paper/listeningpost/year2560/march name = "\improper March 2560 Report" info = {"Very quiet month. Nothing of interest to report. Perhaps the calm before the storm?"} -/obj/item/weapon/paper/listneningpost/year2560/april +/obj/item/weapon/paper/listeningpost/year2560/april name = "\improper April 2560 Report" info = {"A loud, painfully high pitched SSTV signal came across global comms. It seems to be a distress signal of some kind. To what, I have no idea. Efforts to trace the signal's origin have fallen inconclusive."} +<<<<<<< HEAD /obj/item/weapon/paper/listneningpost/oddreport name = "\improper Odd Report" info = {"I wonder how much longer they will accept my empty reports. They will cancel the case soon without @@ -227,3 +227,28 @@ will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"} +||||||| parent of a56a61c33d... Merge pull request #10110 from Heroman3003/Listening-Post +/obj/item/weapon/paper/listneningpost/oddreport + name = "\improper Odd Report" + info = {"I wonder how much longer they will accept my empty reports. They will cancel the case soon without + results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic + solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. + If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space + will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that + stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should + it ever rear it's ugly head again. -Donk Co. Operative #451"} +======= +/obj/item/weapon/paper/crumpled/listeningpost/fanfiction + name = "\improper Regarding Latest Report" + info = {"I swear to god, Dave, if you send us your stupid 'Futuristic version of VORE' fanfiction instead of actual + report again 'on accident' even one more time, I'm sending you there myself, and you know better than most + what they do there. Your writing is trash anyway, I bet even those freaks wouldn't like it."} + +/obj/item/weapon/paper/listeningpost/departure + name = "\improper Notice To All Facilities" + info = {"After recent developments and Nanotrasen deal, we're pulling back resources from the Virgo-Erigone system. + Any facility recieving this notice is to collect all valuable equipment and data, then fly to the closest general facility + for debrief and reassignment. And to those outdated trashy outposts specifically: all data must be digital. If it's not already, + make it so. Most importantly, remember: we're at a truce now. No shooting NT goons unless they start getting frisky with restricted areas. + And don't fucking forget to debrief Dave's listening post again."} +>>>>>>> a56a61c33d... Merge pull request #10110 from Heroman3003/Listening-Post diff --git a/maps/gateway_vr/listeningpost.dmm b/maps/gateway_vr/listeningpost.dmm index 930ef2e428..63084cda97 100644 --- a/maps/gateway_vr/listeningpost.dmm +++ b/maps/gateway_vr/listeningpost.dmm @@ -1,315 +1,287 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( +"aa" = ( /turf/space, /area/space) -"c" = ( +"ab" = ( +/turf/simulated/mineral, +/area/space) +"ac" = ( /turf/simulated/wall/r_wall, /area/awaymission/listeningpost) -"d" = ( -/obj/machinery/power/smes/buildable/point_of_interest{ - desc = "A high-capacity superconducting magnetic energy storage (SMES) unit."; - name = "power storage unit" - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"e" = ( -/obj/machinery/door/airlock/external, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"f" = ( -/obj/machinery/door/airlock, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"g" = ( +"ad" = ( +/turf/simulated/wall/rthull, +/area/space) +"ae" = ( +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"af" = ( +/obj/structure/shuttle/engine/heater, +/turf/simulated/wall/rthull, +/area/space) +"ag" = ( /turf/simulated/wall, /area/awaymission/listeningpost) -"h" = ( +"ah" = ( /turf/simulated/mineral, /area/mine/unexplored) -"i" = ( -/turf/simulated/floor, +"ai" = ( +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"aj" = ( +/obj/item/broken_device/random, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"j" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper/monitorkey, -/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/clothing/glasses/regular, -/turf/simulated/floor, +"ak" = ( +/obj/structure/frame, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"k" = ( -/obj/structure/table/standard, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"l" = ( +"al" = ( /turf/simulated/mineral/floor/vacuum, /area/mine/explored) -"m" = ( -/obj/machinery/computer/message_monitor{ - dir = 4 - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"n" = ( -/obj/structure/bed/chair{ - dir = 4 - }, -/mob/living/simple_mob/humanoid/merc{ - desc = "A weary looking syndicate operative."; - faction = "syndicate" - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"o" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "november report" - }, -/obj/item/weapon/pen, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"p" = ( -/obj/item/device/radio/intercom{ - desc = "Talk through this. Evilly"; - frequency = 1213; - name = "Syndicate Intercom"; - pixel_x = 32; - subspace_transmission = 1; - syndie = 1 - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"q" = ( -/obj/structure/table/rack, -/obj/item/clothing/suit/space/syndicate, -/obj/item/clothing/mask/gas, -/obj/item/clothing/head/helmet/space/syndicate, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"r" = ( +"am" = ( /obj/machinery/door/airlock, -/obj/item/weapon/paper{ - info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"; - name = "odd report" - }, -/obj/item/weapon/gun/projectile/pistol, -/obj/item/weapon/silencer, -/turf/simulated/floor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"s" = ( +"an" = ( +/obj/effect/decal/remains/human, +/obj/item/clothing/suit/space/void/merc, +/obj/item/clothing/head/helmet/space/void/merc, +/obj/item/clothing/glasses/regular, +/turf/simulated/mineral/floor/vacuum, +/area/space) +"ao" = ( +/obj/structure/table/standard, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"ap" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"aq" = ( +/obj/item/weapon/pen, +/obj/item/weapon/paper/listeningpost/departure, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"ar" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"as" = ( /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, /turf/simulated/mineral, /area/mine/unexplored) -"t" = ( +"at" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/mineral, /area/mine/unexplored) -"u" = ( -/obj/structure/disposaloutlet{ - dir = 4 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, +"au" = ( +/obj/machinery/door/airlock/external, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/airless, -/area) -"v" = ( -/obj/structure/bed, -/obj/item/weapon/bedsheet/brown, -/turf/simulated/floor, /area/awaymission/listeningpost) -"w" = ( -/obj/structure/table/standard, -/obj/item/device/flashlight/lamp, -/turf/simulated/floor, +"av" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/item/weapon/paper/listeningpost/year2558/april, +/obj/item/weapon/paper/listeningpost/year2558/may, +/obj/item/weapon/paper/listeningpost/year2558/june, +/obj/item/weapon/paper/listeningpost/year2558/july, +/obj/item/weapon/paper/listeningpost/year2558/august, +/obj/item/weapon/paper/listeningpost/year2558/september, +/obj/item/weapon/paper/listeningpost/year2558/october, +/obj/item/weapon/paper/listeningpost/year2558/november, +/obj/item/weapon/paper/listeningpost/year2558/december, +/obj/item/weapon/paper/listeningpost/year2559/january, +/obj/item/weapon/paper/listeningpost/year2559/february, +/obj/item/weapon/paper/listeningpost/year2559/march, +/obj/item/weapon/paper/listeningpost/year2559/april, +/obj/item/weapon/paper/listeningpost/year2559/may, +/obj/item/weapon/paper/listeningpost/year2559/june, +/obj/item/weapon/paper/listeningpost/year2559/july, +/obj/item/weapon/paper/listeningpost/year2559/august, +/obj/item/weapon/paper/listeningpost/year2559/september, +/obj/item/weapon/paper/listeningpost/year2559/october, +/obj/item/weapon/paper/listeningpost/year2559/november, +/obj/item/weapon/paper/listeningpost/year2559/december, +/obj/item/weapon/paper/listeningpost/year2560/january, +/obj/item/weapon/paper/listeningpost/year2560/february, +/obj/item/weapon/paper/listeningpost/year2560/march, +/obj/item/weapon/paper/listeningpost/year2560/april, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"aw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"x" = ( -/obj/machinery/vending/snack, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"y" = ( +"ax" = ( +/obj/structure/bed/chair/bay/comfy/red{ + dir = 1 + }, +/obj/item/weapon/tank/oxygen, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"ay" = ( /obj/structure/disposalpipe/segment, /turf/simulated/mineral, /area/mine/unexplored) -"z" = ( -/obj/machinery/vending/cola, -/turf/simulated/floor, +"az" = ( +/obj/structure/door_assembly/door_assembly_ext, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"A" = ( -/obj/structure/closet, -/obj/item/clothing/gloves/boxing, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"B" = ( -/obj/structure/filingcabinet, -/obj/item/weapon/paper{ - info = "A good start to the operation: intercepted Nanotrasen military communications. A convoy is scheduled to transfer nuclear warheads to a new military base. This is as good a chance as any to get our hands on some heavy weaponry, I suggest we take it."; - name = "april report" - }, -/obj/item/weapon/paper{ - info = "Nothing of real interest to report this month. I have intercepted faint transmissions from what appears to be some sort of pirate radio station. They do not appear to be relevant to my assignment."; - name = "may report" - }, -/obj/item/weapon/paper{ - info = "Nanotrasen communications have been noticably less frequent recently. The pirate radio station I found last month has been transmitting pro-Nanotrasen propaganda. I will continue to monitor it."; - name = "june report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "july report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "august report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "september report" - }, -/obj/item/weapon/paper{ - info = "Nothing of interest to report."; - name = "october report" - }, -/obj/item/weapon/paper{ - info = "1 x Stechtkin pistol - $600
1 x silencer - $200
shipping charge - $4360
total - $5160"; - name = "receipt" - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"C" = ( -/obj/structure/table/standard, -/obj/item/weapon/paper{ - info = "Mission Details: You have been assigned to a newly constructed listening post constructed within an asteroid in Nanotrasen space to monitor their plasma mining operations. Accurate intel is crucial to the success of our operatives onboard, do not fail us."; - name = "mission briefing" - }, -/turf/simulated/floor, -/area/awaymission/listeningpost) -"D" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ +"aA" = ( +/obj/structure/frame/computer{ dir = 4 }, -/turf/simulated/floor, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"E" = ( +"aB" = ( +/obj/item/weapon/gun/projectile/pistol, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"aC" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"aD" = ( +/obj/item/weapon/circuitboard/broken, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"aE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/wall/r_wall, /area/awaymission/listeningpost) -"F" = ( +"aF" = ( /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, /turf/simulated/mineral, /area/mine/unexplored) -"G" = ( -/obj/machinery/door/airlock{ - name = "Toilet" - }, -/turf/simulated/floor, +"aG" = ( +/obj/structure/table/standard, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"H" = ( -/turf/simulated/floor/tiled/freezer, +"aH" = ( +/obj/structure/salvageable/server, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"I" = ( -/obj/machinery/shower{ - icon_state = "shower"; - dir = 8 - }, -/turf/simulated/floor/tiled/freezer, +"aI" = ( +/obj/structure/table/rack, +/obj/item/weapon/paper/listeningpost/reciept, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"J" = ( -/obj/structure/toilet{ - icon_state = "toilet00"; - dir = 8 - }, -/turf/simulated/floor/tiled/freezer, +"aJ" = ( +/obj/machinery/door/airlock, +/obj/item/weapon/silencer, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, /area/awaymission/listeningpost) -"K" = ( +"aK" = ( /turf/simulated/mineral/floor, /area/mine/unexplored) -"L" = ( +"aL" = ( /turf/simulated/floor/greengrid, /area/mine/explored) -"M" = ( +"aM" = ( /turf/simulated/mineral/floor, /area/mine/explored) -"N" = ( +"aN" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 9 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"O" = ( +"aO" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 1 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"P" = ( +"aP" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 5 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"Q" = ( +"aQ" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 8 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"R" = ( +"aR" = ( /obj/machinery/gateway/centeraway, /turf/simulated/floor/greengrid, /area/mine/explored) -"S" = ( +"aS" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 4 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"T" = ( +"aT" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 10 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"U" = ( +"aU" = ( /obj/machinery/gateway, /turf/simulated/floor/greengrid, /area/mine/explored) -"V" = ( +"aV" = ( /obj/machinery/gateway{ icon_state = "off"; dir = 6 }, /turf/simulated/floor/greengrid, /area/mine/explored) -"W" = ( +"aW" = ( /obj/effect/overmap/visitable/sector/tether_gateway/listeningpost, /turf/space, /area/space) -"Y" = ( +"aX" = ( +/obj/structure/frame/computer, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"aY" = ( /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; @@ -319,19884 +291,20016 @@ }, /turf/space, /area/space) +"aZ" = ( +/obj/structure/disposalpipe/broken{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area) +"ba" = ( +/obj/structure/bed, +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bb" = ( +/obj/structure/table, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bc" = ( +/obj/item/weapon/card/emag_broken, +/turf/space, +/area/space) +"bd" = ( +/obj/structure/salvageable/implant_container_os, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"be" = ( +/obj/structure/salvageable/data, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"bf" = ( +/obj/structure/salvageable/machine, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"bg" = ( +/obj/structure/door_assembly/door_assembly_ext, +/turf/simulated/shuttle/floor/red/airless, +/area/space) +"bh" = ( +/obj/item/broken_device/random, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bi" = ( +/obj/structure/salvageable/data, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bj" = ( +/obj/item/broken_device/random, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bk" = ( +/obj/machinery/door/airlock, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bl" = ( +/obj/structure/salvageable/machine, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bm" = ( +/obj/structure/closet, +/obj/item/weapon/paper/listeningpost/mission, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bn" = ( +/obj/structure/filingcabinet, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bo" = ( +/obj/structure/salvageable/computer, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bp" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bq" = ( +/obj/structure/door_assembly, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"br" = ( +/obj/effect/decal/cleanable/vomit, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bs" = ( +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 4 + }, +/obj/item/weapon/broken_bottle, +/obj/effect/decal/cleanable/cobweb2, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bt" = ( +/obj/effect/floor_decal/techfloor/hole/right, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) +"bu" = ( +/obj/structure/toilet{ + icon_state = "toilet00"; + dir = 8 + }, +/obj/item/weapon/tool/crowbar, +/obj/item/weapon/paper/crumpled/listeningpost/fanfiction, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/airless, +/area/awaymission/listeningpost) (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +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) = {" -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -W -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aW +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (9,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (10,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (11,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (12,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (13,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (14,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (15,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (16,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (17,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (18,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (19,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (20,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (21,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (22,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 -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (23,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 -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (26,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (27,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (28,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (29,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (31,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (32,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (33,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (34,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -l -l -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (39,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 -h -h -h -h -h -h -h -h -h -h -h -h -l -l -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (42,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (43,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 -h -h -h -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (44,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 -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (45,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 -h -h -h -h -h -h -h -h -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (46,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (47,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (48,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (49,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 -h -h -h -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -l -l -l -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +al +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (50,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (51,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -K -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aK +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (52,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -L -M -h -h -h -h -M -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aL +aM +ah +ah +ah +ah +aM +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (53,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -L -L -L -h -L -M -M -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aL +aL +aL +ah +aL +aM +aM +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (54,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -L -L -N -Q -T -L -L -K -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aL +aL +aN +aQ +aT +aL +aL +aK +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (55,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -L -L -O -R -U -L -L -K -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aL +aL +aO +aR +aU +aL +aL +aK +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (56,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -M -L -P -S -V -L -L -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aM +aL +aP +aS +aV +aL +aL +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (57,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -M -L -L -L -L -L -M -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aM +aL +aL +aL +aL +aL +aM +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (58,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -M -M -L -M -M -M -M -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aM +aM +aL +aM +aM +aM +aM +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (59,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -K -K -K -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aK +aK +aK +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (60,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 -h -h -h -a -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (61,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 -h -h -h -h -a -a -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (62,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 -h -h -h -h -h -a -a -h -h -h -h -a -a -a -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +aa +aa +ah +ah +ah +ah +aa +aa +aa +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (63,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 -h -h -h -h -h -h -h -h -h -h -h -h -l -l -l -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +al +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (64,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (65,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (66,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (67,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (68,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (69,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -l -l -l -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +al +al +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (70,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -l -l -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +al +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (71,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -a -a -a -a -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (72,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -a -a -a -h -h -h -h -h -h -h -h -h -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (73,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -h -h -h -h -h -h -h -h -h -l -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (74,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -h -h -h -h -h -h -h -h -h -h -l -a -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (75,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -l -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +al +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (76,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -l -a -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +al +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (77,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (78,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (79,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (80,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -c -c -c -c -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ac +ac +ac +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (81,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -c -v -i -A -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ba +ar +bm +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (82,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 -h -h -h -h -h -h -h -h -h -h -c -c -c -h -c -w -i -B -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ac +ac +ah +ac +bb +bj +bn +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (83,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 -h -h -h -h -h -h -h -h -h -c -c -m -c -c -c -g -f -g -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ac +aA +ac +ac +ac +ag +bk +ag +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (84,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 -h -h -h -h -h -h -h -h -h -c -j -n -p -i -r -i -i -C -c -c -c -c -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ac +ao +aC +aD +aw +aJ +aw +ar +bo +ac +ac +ac +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (85,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 -h -h -h -h -h -h -h -c -c -c -k -o -k -i -g -i -i -i -G -H -H -c -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ac +ac +ac +ap +ap +aG +aw +ag +bh +aw +ar +bq +br +bt +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (86,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 -h -h -h -h -h -h -h -c -i -f -i -i -i -i -g -i -i -D -g -I -J -c -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ac +aj +am +aq +aw +ar +ar +ag +ar +aw +bp +ag +bs +bu +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (87,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 -h -h -h -h -h -h -h -c -d -g -i -i -i -q -g -x -z -E -c -c -c -c -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ac +ak +ag +ar +aw +aH +aI +ag +bi +bl +aE +ac +ac +ac +ac +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (88,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 -h -h -h -h -h -h -h -c -c -c -e -e -c -c -c -c -c -E -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ac +ac +ac +au +az +ac +ac +ac +ac +ac +aE +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (89,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 -h -h -h -h -h -h -h -h -c -i -i -c -h -h -h -h -t -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ac +aw +ar +ac +ah +ah +ah +ah +at +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (90,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 -h -h -h -h -h -h -h -h -c -i -i -c -h -s -y -y -F -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ac +ar +aw +ac +ah +as +ay +ay +aF +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (91,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 -h -h -h -h -h -h -c -e -e -c -h -t -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ac +az +au +ac +ah +at +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (92,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 -h -h -h -h -a -a -a -a -h -t -h -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +aa +aa +aa +aa +ah +at +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (93,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 -h -h -h -a -a -a -a -a -u -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +aa +aa +aa +aa +aa +aZ +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (94,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +bc +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (95,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 -h -h -h -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (96,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 -h -h -a -h -h -h -h -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +aa +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (97,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 -h -a -a -a -h -h -h -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +aa +aa +aa +ah +ah +ah +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (98,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 -h -h -h -h -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ah +ah +ah +ah +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (99,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (100,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (101,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +an +av +bd +bf +af +ai +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (102,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ax +aB +ae +ae +bg +ae +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (103,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ad +aX +ae +be +be +be +af +ai +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (104,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (105,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 +aa +aa +aa +aa +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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (106,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (107,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +ab +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (108,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ab +ab +ab +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (109,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (110,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (111,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (112,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (113,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 -Y -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aY +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (114,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (115,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (116,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (117,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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a -a +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (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 +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +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/submaps/admin_use_vr/ert.dmm b/maps/submaps/admin_use_vr/ert.dmm index b91742808b..50fa7c5f9d 100644 --- a/maps/submaps/admin_use_vr/ert.dmm +++ b/maps/submaps/admin_use_vr/ert.dmm @@ -88,12 +88,27 @@ /area/ship/ert/barracks) "ao" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -188,12 +203,27 @@ "br" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/tank/jetpack/carbondioxide{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bt" = ( @@ -227,16 +257,43 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/device/suit_cooling_unit{ + pixel_x = -10; + pixel_y = -10 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, -/obj/item/device/suit_cooling_unit, +/obj/item/device/suit_cooling_unit{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/device/suit_cooling_unit{ + pixel_x = 8; + pixel_y = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "bJ" = ( @@ -401,22 +458,52 @@ "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, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas, -/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{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, -/obj/item/weapon/rig/ert/assetprotection, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/rig/ert/assetprotection{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -455,35 +542,75 @@ /area/ship/ert/hangar) "dB" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/suit/armor/swat{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/suit/armor/swat, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, -/obj/item/clothing/mask/gas/commando, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/suit/armor/swat{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/mask/gas/commando, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas/commando{ + pixel_x = 6; + pixel_y = 6 + }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/head/helmet/space/deathsquad{ + name = "swat helmet"; + pixel_x = -2; + pixel_y = -2 }, /obj/item/clothing/head/helmet/space/deathsquad{ name = "swat helmet" }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 2; + pixel_y = 2 }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 4; + pixel_y = 4 }, /obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" - }, -/obj/item/clothing/head/helmet/space/deathsquad{ - name = "swat helmet" + name = "swat helmet"; + pixel_x = 6; + pixel_y = 6 }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, @@ -505,12 +632,27 @@ /area/shuttle/ert_ship_boat) "dV" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/thermal{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -548,12 +690,27 @@ /area/ship/ert/dock_port) "ef" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/night{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, @@ -562,12 +719,27 @@ /area/ship/ert/barracks) "eg" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/night{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/night{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/atm{ pixel_y = 26 }, @@ -640,6 +812,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) +"eL" = ( +/mob/living/simple_mob/animal/passive/mimepet, +/turf/simulated/floor/wood, +/area/ship/ert/commander) "eO" = ( /obj/effect/map_helper/airlock/atmos/chamber_pump, /obj/effect/map_helper/airlock/sensor/chamber_sensor, @@ -660,15 +836,27 @@ "eP" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/item/weapon/storage/box/cdeathalarm_kit, -/obj/item/weapon/storage/box/cdeathalarm_kit, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/cdeathalarm_kit{ + pixel_x = 1; + pixel_y = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "eX" = ( /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/item/weapon/storage/box/backup_kit, -/obj/item/weapon/storage/box/backup_kit, +/obj/item/weapon/storage/box/backup_kit{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/backup_kit{ + pixel_x = 1; + pixel_y = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "ff" = ( @@ -702,7 +890,6 @@ /area/ship/ert/dock_star) "fx" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/sprinter, /obj/machinery/light/no_nightshift{ dir = 8 }, @@ -713,17 +900,38 @@ dir = 4; pixel_x = -23 }, -/obj/item/rig_module/sprinter, -/obj/item/rig_module/rescue_pharm, +/obj/item/rig_module/sprinter{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/rig_module/sprinter{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/rig_module/rescue_pharm{ + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fE" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/mounted, -/obj/item/rig_module/mounted/egun, -/obj/item/rig_module/mounted/egun, -/obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/mounted/egun{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/rig_module/mounted/egun, +/obj/item/rig_module/mounted/egun{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/mounted/egun{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fP" = ( @@ -740,22 +948,50 @@ /area/ship/ert/mech_bay) "fU" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/device/rcd, -/obj/item/rig_module/device/plasmacutter, -/obj/item/rig_module/device/plasmacutter, +/obj/item/rig_module/device/rcd{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/device/rcd{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/rig_module/device/plasmacutter{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/device/plasmacutter{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "fZ" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/device/drill, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, -/obj/item/rig_module/maneuvering_jets, +/obj/item/rig_module/device/drill{ + pixel_y = -4 + }, +/obj/item/rig_module/device/drill{ + pixel_y = 4 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = -5 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = -2 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 1 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 4 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 7 + }, +/obj/item/rig_module/maneuvering_jets{ + pixel_x = 10 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ga" = ( @@ -805,14 +1041,30 @@ /area/ship/ert/atmos) "gx" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/melee/baton, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot, +/obj/item/weapon/melee/baton{ + pixel_x = -6 + }, +/obj/item/weapon/melee/baton{ + pixel_x = -2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 2 + }, +/obj/item/weapon/melee/baton{ + pixel_x = 6 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -6 + }, +/obj/item/weapon/shield/riot{ + pixel_x = -2 + }, +/obj/item/weapon/shield/riot{ + pixel_x = 2 + }, +/obj/item/weapon/shield/riot{ + pixel_x = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/recharger/wallcharger{ pixel_x = -23; @@ -881,8 +1133,14 @@ /area/ship/ert/gunnery) "gX" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/emps, -/obj/item/weapon/storage/box/emps, +/obj/item/weapon/storage/box/emps{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/emps{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -1038,12 +1296,27 @@ /area/ship/ert/dock_star) "ia" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, -/obj/item/clothing/accessory/holster/leg, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/holster/leg{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -1100,9 +1373,15 @@ /turf/simulated/wall/shull, /area/ship/ert/dock_port) "iC" = ( +/obj/item/device/healthanalyzer/advanced{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced{ + pixel_x = -2; + pixel_y = -2 + }, /obj/structure/table/rack/steel, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -1182,24 +1461,56 @@ /area/ship/ert/mech_bay) "kf" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = 2 + }, /obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/weapon/gun/projectile/automatic/pdw, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, -/obj/item/ammo_magazine/m9mml, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/pdw{ + pixel_y = -4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 10 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = 2 + }, /obj/item/ammo_magazine/m9mml, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -10 + }, +/obj/item/ammo_magazine/m9mml{ + pixel_x = -12 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -1438,18 +1749,48 @@ /area/ship/ert/engine) "mb" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/weapon/storage/belt/security/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, -/obj/item/clothing/glasses/sunglasses/sechud/tactical, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/security/tactical{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/sunglasses/sechud/tactical, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/sunglasses/sechud/tactical{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -1658,8 +1999,12 @@ /area/ship/ert/dock_star) "nb" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/weapon/gun/energy/xray{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/xray{ + pixel_y = 3 + }, /obj/machinery/light/no_nightshift, /obj/machinery/firealarm/alarms_hidden{ dir = 1; @@ -1832,9 +2177,12 @@ /obj/item/weapon/hand_tele, /obj/item/device/perfect_tele, /obj/item/device/binoculars, -/obj/item/device/survivalcapsule, -/obj/item/device/survivalcapsule, -/mob/living/simple_mob/animal/passive/mimepet, +/obj/item/device/survivalcapsule{ + pixel_x = 3 + }, +/obj/item/device/survivalcapsule{ + pixel_x = -3 + }, /turf/simulated/floor/wood, /area/ship/ert/commander) "og" = ( @@ -1943,12 +2291,27 @@ /area/ship/ert/dock_port) "oW" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -1962,37 +2325,77 @@ "oX" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/gloves/yellow{ + pixel_y = -3 + }, /obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/weapon/storage/backpack/ert/engineer, -/obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/clothing/gloves/yellow{ + pixel_y = 3 + }, +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = -3 + }, /obj/item/weapon/storage/backpack/ert/engineer, +/obj/item/weapon/storage/backpack/ert/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/engineer{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/suit/space/void/responseteam/engineer, -/obj/item/clothing/head/helmet/ert/engineer, -/obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/suit/space/void/responseteam/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/head/helmet/ert/engineer{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/engineer, +/obj/item/clothing/head/helmet/ert/engineer{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/engineer{ + pixel_y = -3 + }, /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{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pa" = ( /obj/structure/table/steel_reinforced, +/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, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/weapon/storage/belt/medical/emt, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, -/obj/item/clothing/accessory/storage/white_vest, +/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/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 @@ -2010,20 +2413,36 @@ /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, -/obj/item/weapon/storage/backpack/ert/medical, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = -3 + }, /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/machinery/light/no_nightshift, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/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{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = 3 + }, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pf" = ( @@ -2044,19 +2463,35 @@ /area/ship/ert/med) "pn" = ( /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, -/obj/item/weapon/storage/backpack/ert/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, -/obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/weapon/storage/backpack/ert/medical{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/medical, +/obj/item/clothing/suit/space/void/responseteam/medical{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/ert/medical, -/obj/item/clothing/head/helmet/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{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/medical, +/obj/item/clothing/suit/armor/vest/ert/medical{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "po" = ( @@ -2079,12 +2514,27 @@ /area/ship/ert/med_surg) "pq" = ( /obj/structure/table/steel_reinforced, +/obj/item/bodybag/cryobag{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, -/obj/item/bodybag/cryobag, +/obj/item/bodybag/cryobag{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/bodybag/cryobag{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "pr" = ( @@ -2101,14 +2551,26 @@ /area/ship/ert/gunnery) "pt" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = -2 + }, /obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/clothing/suit/space/void/responseteam/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, -/obj/item/weapon/storage/belt/janitor, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = 2 + }, +/obj/item/clothing/suit/space/void/responseteam/janitor{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/janitor, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/janitor{ + pixel_y = 4 + }, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -2153,35 +2615,79 @@ /obj/structure/closet{ name = "custodial" }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/mop, -/obj/item/weapon/mop, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -6 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = -2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/spray/cleaner{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = 2 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = -2 + }, +/obj/item/weapon/reagent_containers/glass/bucket{ + pixel_x = -6 + }, +/obj/item/weapon/mop{ + pixel_x = 6 + }, +/obj/item/weapon/mop{ + pixel_x = 2 + }, +/obj/item/weapon/mop{ + pixel_x = -2 + }, +/obj/item/weapon/mop{ + pixel_x = -6 + }, /obj/item/weapon/rig/ert/janitor, -/obj/item/device/lightreplacer, -/obj/item/device/lightreplacer, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/device/lightreplacer{ + pixel_y = -2 + }, +/obj/item/device/lightreplacer{ + pixel_y = 2 + }, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/weapon/storage/box/lights/mixed{ + pixel_x = 1; + pixel_y = 1 + }, /obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "pI" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, -/obj/item/weapon/gun/energy/pulse_rifle, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/pulse_rifle{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "pK" = ( @@ -2192,8 +2698,14 @@ /area/ship/ert/mech_bay) "pM" = ( /obj/structure/table/steel_reinforced, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, +/obj/item/rig_module/mounted/taser{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/rig_module/mounted/taser, /obj/machinery/light/no_nightshift{ dir = 8 @@ -2202,9 +2714,18 @@ dir = 1; pixel_y = -26 }, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, -/obj/item/rig_module/mounted/taser, +/obj/item/rig_module/mounted/taser{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/rig_module/mounted/taser{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "pN" = ( @@ -2234,8 +2755,12 @@ /area/ship/ert/atmos) "pW" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/plasmastun, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -2261,18 +2786,36 @@ /area/ship/ert/mech_bay) "qa" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/security{ + pixel_x = -2; + pixel_y = -2 + }, /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{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/security{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qd" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/engineer{ + pixel_x = -2; + pixel_y = -2 + }, /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{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/engineer{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "ql" = ( @@ -2288,10 +2831,19 @@ /area/ship/ert/med) "qo" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/rig/ert/medical{ + pixel_x = -2; + pixel_y = -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{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rig/ert/medical{ + pixel_x = 4; + pixel_y = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/mech_bay) "qt" = ( @@ -2361,6 +2913,35 @@ }, /turf/simulated/floor/reinforced/airless, /area/ship/ert/eng_storage) +"qJ" = ( +/obj/structure/table/rack/steel, +/obj/effect/floor_decal/industrial/outline/grey, +/obj/item/ammo_magazine/m545{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -5 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 1 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 7 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/armoury_st) "qP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -2487,26 +3068,42 @@ /area/ship/ert/med) "sf" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/machinery/chemical_dispenser/ert, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "so" = ( /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, -/obj/item/weapon/storage/backpack/ert/security, -/obj/item/clothing/suit/space/void/responseteam/security, -/obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/space/void/responseteam/security, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = 3 + }, /obj/machinery/light/no_nightshift, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/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{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "sp" = ( @@ -2575,10 +3172,19 @@ /area/ship/ert/dock_star) "sF" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/glasses/graviton{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, -/obj/item/clothing/glasses/graviton, +/obj/item/clothing/glasses/graviton{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/graviton{ + pixel_x = 4; + pixel_y = 4 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) @@ -2594,12 +3200,27 @@ /area/ship/ert/bridge) "sJ" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_x = 6; + pixel_y = 6 + }, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 @@ -2753,9 +3374,15 @@ /turf/simulated/floor/airless, /area/ship/ert/gunnery) "ug" = ( +/obj/item/device/healthanalyzer/advanced{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, -/obj/item/device/healthanalyzer/advanced, +/obj/item/device/healthanalyzer/advanced{ + pixel_x = -2; + pixel_y = -2 + }, /obj/structure/table/rack/steel, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -2980,12 +3607,22 @@ /area/ship/ert/hallways) "wl" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -4 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -3013,13 +3650,22 @@ /area/ship/ert/atmos) "wt" = ( /obj/structure/table/steel_reinforced, -/obj/item/weapon/storage/firstaid/bonemed, -/obj/item/weapon/storage/firstaid/clotting, +/obj/item/weapon/storage/firstaid/bonemed{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/clotting{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/corner/yellow{ dir = 1 }, /obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = -2; + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "wO" = ( @@ -3069,12 +3715,22 @@ "xg" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, -/obj/item/weapon/gun/energy/gun/nuclear, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/gun/nuclear{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xh" = ( @@ -3083,37 +3739,85 @@ pixel_y = 23 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -12 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -10 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mm/large/preban{ + pixel_x = 10 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = 2 + }, /obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/weapon/gun/projectile/p92x/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, -/obj/item/ammo_magazine/m9mm/large/preban, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -4 + }, +/obj/item/weapon/gun/projectile/p92x/large/preban{ + pixel_y = -6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xi" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, -/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545{ + pixel_x = 7 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = 1 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -5 + }, +/obj/item/ammo_magazine/m545{ + pixel_x = -8 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "xt" = ( @@ -3137,10 +3841,16 @@ /area/ship/ert/armoury_st) "xv" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/gun/energy/ionrifle/pistol{ + pixel_y = 4 + }, /obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle/pistol, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/weapon/gun/energy/ionrifle{ + pixel_y = -4 + }, +/obj/item/weapon/gun/energy/ionrifle{ + pixel_y = -8 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -3162,31 +3872,75 @@ /obj/structure/closet/medical_wall{ pixel_x = 32 }, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/storage/firstaid/fire{ + pixel_x = 2; + pixel_y = 2 + }, /obj/item/weapon/storage/firstaid/o2, /obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/firstaid/toxin{ + pixel_x = -2; + pixel_y = -2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "xA" = ( /obj/structure/table/rack/steel, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = -2; + pixel_y = -2 + }, /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, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/shoes/magboots/adv{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "xC" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/rcd/advanced/loaded{ + desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; + name = "emergency rapid construction device"; + pixel_y = 3; + ranged = 0 + }, +/obj/item/weapon/rcd/advanced/loaded{ + desc = "A device used to rapidly build and deconstruct. This version works faster, and has a much larger capacity than a standard model, but doesn't work at range. Reload with compressed matter cartridges."; + name = "emergency rapid construction device"; + pixel_y = -3; + ranged = 0 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "xG" = ( @@ -3228,8 +3982,12 @@ /area/ship/ert/med_surg) "xZ" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/launcher/grenade, -/obj/item/weapon/gun/launcher/grenade, +/obj/item/weapon/gun/launcher/grenade{ + pixel_y = 3 + }, +/obj/item/weapon/gun/launcher/grenade{ + pixel_y = -3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -3300,15 +4058,18 @@ "yp" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/fire{ - pixel_x = 2; - pixel_y = 2 + pixel_x = 4; + pixel_y = 4 }, /obj/item/weapon/storage/firstaid/fire{ pixel_x = 2; pixel_y = 2 }, /obj/item/weapon/storage/firstaid/adv, -/obj/item/weapon/storage/firstaid/adv, +/obj/item/weapon/storage/firstaid/adv{ + pixel_x = -2; + pixel_y = -2 + }, /obj/effect/floor_decal/corner/yellow{ dir = 8 }, @@ -3374,8 +4135,8 @@ "yJ" = ( /obj/structure/table/steel_reinforced, /obj/machinery/chemical_dispenser/biochemistry/full, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/machinery/light/no_nightshift, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "yR" = ( @@ -3646,6 +4407,7 @@ "AL" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/box/pillbottles, +/obj/item/weapon/storage/box/pillbottles, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "AS" = ( @@ -3736,8 +4498,12 @@ /area/ship/ert/barracks) "Bp" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = -3 + }, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, /obj/item/ammo_magazine/m762, @@ -3777,6 +4543,10 @@ "Br" = ( /turf/simulated/floor/tiled/techmaint, /area/ship/ert/eng_storage) +"Bx" = ( +/obj/structure/bed/chair/bay/chair/padded/blue, +/turf/simulated/floor/tiled/techfloor, +/area/ship/ert/med) "BE" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -4100,23 +4870,35 @@ /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, -/obj/item/weapon/storage/backpack/ert/security, +/obj/item/weapon/storage/backpack/ert/security{ + pixel_y = 3 + }, +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = -3 + }, /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/machinery/firealarm/alarms_hidden{ - dir = 1; - pixel_y = -26 +/obj/item/clothing/suit/space/void/responseteam/security{ + pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/clothing/head/helmet/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/ert/security, -/obj/item/clothing/head/helmet/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{ + pixel_y = 3 + }, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = -3 + }, /obj/item/clothing/suit/armor/vest/ert/security, +/obj/item/clothing/suit/armor/vest/ert/security{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/barracks) "Ed" = ( @@ -4285,8 +5067,14 @@ /area/ship/ert/engineering) "Fq" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, +/obj/item/weapon/storage/box/frags{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/frags{ + pixel_x = 2; + pixel_y = 2 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; dir = 4; @@ -4412,36 +5200,134 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2 + }, /obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techmaint, /area/ship/ert/armoury_st) "FY" = ( @@ -4462,10 +5348,25 @@ /area/ship/ert/armoury_st) "Gl" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/heavysniper, -/obj/item/weapon/storage/box/sniperammo, -/obj/item/weapon/storage/box/sniperammo, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/automatic/z8{ + pixel_y = 3 + }, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, +/obj/item/ammo_magazine/m762/ap, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Gr" = ( @@ -4615,10 +5516,18 @@ /area/shuttle/ert_ship_boat) "HB" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/gun/burst, -/obj/item/weapon/gun/energy/lasershotgun, -/obj/item/weapon/gun/energy/lasershotgun, +/obj/item/weapon/gun/energy/gun/burst{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun/burst{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/lasershotgun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/lasershotgun{ + pixel_y = 3 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/recharger/wallcharger{ pixel_x = -23; @@ -4817,6 +5726,7 @@ "IF" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/industrial/outline, +/obj/item/weapon/hand_labeler, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "IK" = ( @@ -4876,15 +5786,18 @@ "Jc" = ( /obj/structure/table/steel_reinforced, /obj/item/weapon/storage/firstaid/toxin{ - pixel_x = 2; - pixel_y = 2 + pixel_x = 4; + pixel_y = 4 }, /obj/item/weapon/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 2 }, /obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/weapon/storage/firstaid/o2{ + pixel_x = -2; + pixel_y = -2 + }, /obj/machinery/light/no_nightshift{ dir = 1 }, @@ -4952,8 +5865,14 @@ /area/ship/ert/hallways) "Jw" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/handcuffs{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/corner/red{ dir = 4 }, @@ -5049,26 +5968,15 @@ /area/ship/ert/engine) "JZ" = ( /obj/structure/table/rack/steel, -/obj/machinery/light/no_nightshift, +/obj/item/weapon/gun/projectile/heavysniper, +/obj/item/weapon/storage/box/sniperammo, +/obj/item/weapon/storage/box/sniperammo, +/obj/effect/floor_decal/industrial/outline/grey, /obj/machinery/alarm/alarms_hidden{ dir = 1; pixel_y = -26 }, -/obj/effect/floor_decal/industrial/outline/grey, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/weapon/gun/projectile/automatic/z8, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, -/obj/item/ammo_magazine/m762/ap, +/obj/machinery/light/no_nightshift, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Kb" = ( @@ -5164,25 +6072,37 @@ /area/ship/ert/eng_storage) "KG" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/storage/toolbox/mechanical{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/weapon/storage/toolbox/electrical{ + pixel_x = -4; + pixel_y = 6 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = -6 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = -2 }, /obj/item/weapon/storage/briefcase/inflatable{ - pixel_x = 3; - pixel_y = 3 + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/weapon/storage/briefcase/inflatable{ + pixel_x = 4; + pixel_y = 6 }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, @@ -5265,10 +6185,22 @@ /area/ship/ert/bridge) "Lg" = ( /obj/structure/table/rack/steel, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, -/obj/item/taperoll/engineering, +/obj/item/taperoll/engineering{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/taperoll/engineering{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/taperoll/engineering{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/taperoll/engineering{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) @@ -5288,12 +6220,24 @@ /area/ship/ert/med) "Lk" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -7 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -4 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -1 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 2 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 5 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 8 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) @@ -5322,12 +6266,36 @@ battery_lock = 0 }, /obj/effect/floor_decal/industrial/outline/grey, +<<<<<<< HEAD +||||||| parent of d41e3bb7a8... Merge pull request #10091 from KillianKirilenko/kk-adminships +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +======= +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 4 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = 2 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked{ + pixel_y = -4 + }, +>>>>>>> d41e3bb7a8... Merge pull request #10091 from KillianKirilenko/kk-adminships /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LA" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, @@ -5338,6 +6306,12 @@ /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/stunshells/large, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LB" = ( @@ -5362,13 +6336,23 @@ /obj/machinery/firealarm/alarms_hidden{ pixel_y = 26 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 4 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 2 + }, /obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "LH" = ( @@ -5422,17 +6406,23 @@ /area/ship/ert/med_surg) "Md" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, -/obj/item/weapon/gun/energy/taser, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = 1 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = -1 + }, +/obj/item/weapon/gun/energy/taser{ + pixel_y = -3 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) "Me" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/as24, -/obj/item/weapon/gun/projectile/automatic/as24, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, @@ -5443,6 +6433,12 @@ /obj/item/weapon/storage/box/beanbags/large, /obj/item/weapon/storage/box/stunshells/large, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/as24{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Mm" = ( @@ -5453,10 +6449,13 @@ /area/ship/ert/teleporter) "Mt" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = -4 + }, /obj/effect/floor_decal/industrial/outline/grey, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = 6 }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_st) @@ -5549,18 +6548,38 @@ /area/shuttle/ert_ship_boat) "MX" = ( /obj/structure/table/steel_reinforced, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = -2 + }, /obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/clothing/accessory/storage/brown_vest, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, -/obj/item/weapon/storage/belt/utility/chief/full, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 4 + }, +/obj/item/clothing/accessory/storage/brown_vest{ + pixel_y = 6 + }, +/obj/item/weapon/storage/belt/utility/chief/full{ + pixel_y = -4 + }, +/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) "MZ" = ( @@ -5932,10 +6951,12 @@ "OO" = ( /obj/structure/table/rack/steel, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = -3 }, /obj/item/weapon/gun/energy/sniperrifle{ - battery_lock = 0 + battery_lock = 0; + pixel_y = 3 }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, @@ -6027,21 +7048,41 @@ /area/space) "OZ" = ( /obj/structure/table/standard, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/soap, -/obj/item/weapon/towel{ - color = "#0000FF" +/obj/item/weapon/soap{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/soap{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/soap{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/soap{ + pixel_x = 6; + pixel_y = 6 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = -6; + pixel_y = -6 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = -2; + pixel_y = -2 }, /obj/item/weapon/towel{ - color = "#0000FF" + color = "#0000FF"; + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/towel{ + color = "#0000FF"; + pixel_x = 6; + pixel_y = 6 }, /obj/effect/floor_decal/corner/white, /obj/machinery/light/no_nightshift{ @@ -6225,8 +7266,12 @@ /obj/structure/table/steel_reinforced, /obj/item/weapon/smes_coil, /obj/item/weapon/smes_coil, -/obj/item/device/t_scanner/advanced, -/obj/item/device/t_scanner/advanced, +/obj/item/device/t_scanner/advanced{ + pixel_x = -3 + }, +/obj/item/device/t_scanner/advanced{ + pixel_x = 3 + }, /obj/machinery/power/apc/hyper{ alarms_hidden = 1; name = "VB APC - South"; @@ -6467,44 +7512,101 @@ /area/ship/ert/barracks) "St" = ( /obj/structure/table/rack/steel, +/obj/item/device/flash{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/flash{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, -/obj/item/device/flash, +/obj/item/device/flash{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/flash{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/flash{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) "Sx" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/weapon/gun/projectile/automatic/p90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, -/obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 12 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 10 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 8 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 4 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = 2 + }, /obj/item/ammo_magazine/m9mmp90, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -4 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -6 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -8 + }, +/obj/item/ammo_magazine/m9mmp90{ + pixel_x = -10 + }, /obj/effect/floor_decal/industrial/outline/grey, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = -6 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = 2 + }, +/obj/item/weapon/gun/projectile/automatic/p90{ + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) "Sy" = ( /obj/structure/table/rack/steel, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/weapon/gun/projectile/automatic/l6_saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, -/obj/item/ammo_magazine/m545saw, +/obj/item/weapon/gun/projectile/automatic/l6_saw{ + pixel_y = 3 + }, +/obj/item/weapon/gun/projectile/automatic/l6_saw{ + pixel_y = -3 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = 6 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = 2 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = -2 + }, +/obj/item/ammo_magazine/m545saw{ + pixel_x = -6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/armoury_dl) @@ -6537,9 +7639,13 @@ /area/ship/ert/med_surg) "SD" = ( /obj/structure/table/rack, +/obj/item/ammo_magazine/m44{ + pixel_x = -3 + }, +/obj/item/ammo_magazine/m44{ + pixel_x = 3 + }, /obj/item/weapon/gun/projectile/deagle, -/obj/item/ammo_magazine/m44, -/obj/item/ammo_magazine/m44, /turf/simulated/floor/wood, /area/ship/ert/commander) "SE" = ( @@ -6571,9 +7677,37 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "SI" = ( -/obj/machinery/portable_atmospherics/powered/scrubber, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/industrial/outline/blue, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/rcd_ammo/large, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/rcd_ammo/large{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/eng_storage) "SJ" = ( @@ -6593,16 +7727,26 @@ /area/ship/ert/gunnery) "SV" = ( /obj/structure/table/rack/steel, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 6 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 3 + }, /obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -3 + }, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, /obj/effect/floor_decal/industrial/outline, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -6 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -9 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "SZ" = ( @@ -6866,12 +8010,27 @@ "VQ" = ( /obj/structure/table/rack/steel, /obj/effect/floor_decal/corner/red, +/obj/item/device/radio/off{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio/off{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, +/obj/item/device/radio/off{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/radio/off{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/device/radio/off{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/industrial/outline/grey, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/hallways) @@ -6904,8 +8063,12 @@ /obj/machinery/light/no_nightshift{ dir = 1 }, -/obj/item/device/defib_kit/compact/combat/loaded, -/obj/item/device/defib_kit/compact/combat/loaded, +/obj/item/device/defib_kit/compact/combat/loaded{ + pixel_y = -3 + }, +/obj/item/device/defib_kit/compact/combat/loaded{ + pixel_y = 3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/med) "Wq" = ( @@ -15108,7 +16271,7 @@ iB Na JB Wa -Iv +eL zT Ez IK @@ -18374,7 +19537,7 @@ ip mV pa tH -xi +qJ BU GK FR @@ -18390,7 +19553,7 @@ SV DJ QT jn -Pq +Bx sf kx TU diff --git a/maps/submaps/admin_use_vr/guttersite.dm b/maps/submaps/admin_use_vr/guttersite.dm index 23c54af980..3d99c8ef0b 100644 --- a/maps/submaps/admin_use_vr/guttersite.dm +++ b/maps/submaps/admin_use_vr/guttersite.dm @@ -47,7 +47,6 @@ icon_state = "debrisexplored" forced_ambience = list('sound/ambience/tension/tension.ogg', 'sound/ambience/tension/horror.ogg') -//TFF 26/12/19 - Sub-areas for the APCs. /area/tether_away/guttersite/engines name = "Gutter - Gutter Engineering" diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm index a5a215cf4a..362023e72c 100644 --- a/maps/submaps/admin_use_vr/kk_mercship.dmm +++ b/maps/submaps/admin_use_vr/kk_mercship.dmm @@ -186,25 +186,135 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "aS" = ( -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /obj/structure/table/steel_reinforced, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2 + }, +/obj/item/weapon/cell/device/weapon, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -12; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -10; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 2; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 8; + pixel_y = 6 + }, +/obj/item/weapon/cell/device/weapon{ + pixel_x = 10; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "aU" = ( @@ -241,17 +351,21 @@ /area/ship/manta/armoury_st) "aZ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, -/obj/item/weapon/gun/energy/sizegun, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = 6 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = 2 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = -2 + }, +/obj/item/weapon/gun/energy/sizegun{ + pixel_y = -6 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bc" = ( @@ -459,10 +573,22 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, -/obj/item/device/binoculars, +/obj/item/device/binoculars{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/device/binoculars{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/device/binoculars{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/binoculars{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bL" = ( @@ -476,12 +602,27 @@ /obj/machinery/light_switch{ pixel_y = 23 }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, -/obj/item/clothing/glasses/thermal, +/obj/item/clothing/glasses/thermal{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/glasses/thermal{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "bP" = ( @@ -578,16 +719,24 @@ /turf/space, /area/space) "cn" = ( -/obj/structure/table/rack, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/item/weapon/material/knife/tacknife/combatknife, -/obj/machinery/recharger/wallcharger{ - pixel_x = 5; - pixel_y = -32 +/obj/structure/table/rack/steel, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -7 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -4 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = -1 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 2 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 5 + }, +/obj/item/weapon/material/knife/tacknife/combatknife{ + pixel_x = 8 }, /obj/effect/floor_decal/techfloor, /turf/simulated/floor/tiled/techfloor, @@ -617,11 +766,23 @@ /area/ship/manta/med) "ct" = ( /obj/structure/table/rack, +/obj/item/device/radio{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/device/radio{ + pixel_x = -2; + pixel_y = -2 + }, /obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/device/radio{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/device/radio{ + pixel_x = 4; + pixel_y = 4 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -691,12 +852,22 @@ /area/ship/manta/holding) "cP" = ( /obj/structure/table/rack, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = -4 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = -2 + }, /obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 2 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 4 + }, +/obj/item/weapon/storage/belt/utility/full{ + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -714,17 +885,35 @@ /area/ship/manta/armoury_st) "cQ" = ( /obj/structure/table/rack, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = -4 + }, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 2 + }, /obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/weapon/tool/crowbar/red, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, -/obj/item/device/flashlight/maglight, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 2 + }, +/obj/item/weapon/tool/crowbar/red{ + pixel_x = 4 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 6 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 4 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = 2 + }, /obj/item/device/flashlight/maglight, +/obj/item/device/flashlight/maglight{ + pixel_y = -2 + }, +/obj/item/device/flashlight/maglight{ + pixel_y = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -898,6 +1087,15 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"dM" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, +/obj/item/mecha_parts/mecha_equipment/runningboard/limited, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/mech_bay) "dO" = ( /obj/machinery/shipsensors{ dir = 1 @@ -1020,10 +1218,10 @@ "ep" = ( /obj/machinery/chemical_dispenser/full, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "er" = ( @@ -1049,22 +1247,22 @@ "eB" = ( /obj/machinery/chemical_dispenser/ert, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 1 }, /obj/machinery/light/no_nightshift{ dir = 1 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "eF" = ( /obj/machinery/chemical_dispenser/biochemistry/full, /obj/structure/table/steel_reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, /obj/effect/floor_decal/techfloor{ dir = 5 }, +/obj/item/weapon/reagent_containers/glass/beaker/large, /turf/simulated/floor/tiled/white, /area/ship/manta/med) "eG" = ( @@ -1383,6 +1581,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/recreation) +"gu" = ( +/obj/effect/floor_decal/techfloor, +/obj/structure/table/steel_reinforced, +/obj/item/weapon/storage/belt/utility/full, +/obj/item/device/multitool, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/engineering) "gB" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/orange{ @@ -1702,7 +1907,9 @@ /area/ship/manta/hallways_aft) "hU" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = 4 + }, /obj/item/weapon/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -1714,7 +1921,9 @@ /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = -4 + }, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /turf/simulated/floor/tiled/techfloor, @@ -1770,8 +1979,12 @@ /obj/effect/floor_decal/techfloor{ dir = 5 }, -/obj/item/weapon/gun/projectile/sec/wood, -/obj/item/weapon/gun/projectile/sec/wood, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "ik" = ( @@ -2409,7 +2622,6 @@ /turf/simulated/floor/plating, /area/ship/manta/hallways_port) "kT" = ( -/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, /turf/simulated/floor/plating, /area/ship/manta/hallways_port) "kW" = ( @@ -2484,7 +2696,9 @@ /area/ship/manta/hallways_aft) "lj" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = 4 + }, /obj/item/weapon/gun/projectile/automatic/c20r, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, @@ -2493,7 +2707,9 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/gun/projectile/automatic/c20r, +/obj/item/weapon/gun/projectile/automatic/c20r{ + pixel_y = -4 + }, /obj/item/ammo_magazine/m10mm, /obj/item/ammo_magazine/m10mm, /turf/simulated/floor/tiled/techfloor, @@ -2506,8 +2722,12 @@ dir = 4 }, /obj/structure/table/rack, -/obj/item/weapon/gun/projectile/automatic/sts35, -/obj/item/weapon/gun/projectile/automatic/sts35, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -3 + }, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 3 + }, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, /obj/item/ammo_magazine/m545, @@ -2752,14 +2972,13 @@ /area/ship/manta/hallways_aft) "mp" = ( /obj/structure/table/rack, -/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/mortar, /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/item/mecha_parts/mecha_equipment/cloak, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "ms" = ( @@ -3174,6 +3393,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) +"ou" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray, +/turf/simulated/floor/tiled/techfloor, +/area/ship/manta/mech_bay) "ov" = ( /obj/machinery/power/apc/hyper{ alarms_hidden = 1; @@ -3202,46 +3429,47 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/tool/passenger{ + pixel_x = -4 + }, +/obj/item/mecha_parts/mecha_equipment/tool/passenger{ + pixel_x = 4 + }, +/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "oD" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/weapon/gun/energy/laser{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/laser{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "oE" = ( -/obj/structure/cable/orange{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/orange{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 +/obj/structure/table/rack, +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = 3 }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 10 - }, -/obj/effect/floor_decal/techfloor/corner{ - dir = 9 +/obj/item/weapon/gun/projectile/automatic/sts35{ + pixel_y = -3 }, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545, +/obj/item/ammo_magazine/m545/ap, /turf/simulated/floor/tiled/techfloor, -/area/ship/manta/engineering) +/area/ship/manta/armoury_st) "oF" = ( /obj/effect/floor_decal/techfloor{ dir = 4 @@ -3271,8 +3499,12 @@ dir = 8; pixel_x = 26 }, -/obj/item/weapon/gun/projectile/sec/wood, -/obj/item/weapon/gun/projectile/sec/wood, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/sec/wood{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "oP" = ( @@ -3301,11 +3533,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/recreation) "oT" = ( -/obj/mecha/combat/gygax/dark, -/obj/machinery/mech_recharger, /obj/effect/floor_decal/techfloor{ dir = 1 }, +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/mech_recharger, +/obj/mecha/combat/gygax/dark{ + desc = "A lightweight combat exosuit, based off the standard Gygax chassis but no doubt thoroughly customized and upgraded." + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "oU" = ( @@ -3371,6 +3606,13 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/clusterbang{ + pixel_y = 4 + }, +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/concussion{ + pixel_y = -4 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "py" = ( @@ -3402,8 +3644,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "pE" = ( -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/machinery/atmospherics/binary/pump/on{ + dir = 1 + }, /turf/simulated/floor/plating, /area/ship/manta/atmos) "pH" = ( @@ -3452,13 +3695,7 @@ /turf/simulated/floor/plating, /area/ship/manta/atmos) "pW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/catwalk, +/obj/machinery/atmospherics/binary/pump/on, /turf/simulated/floor/plating, /area/ship/manta/atmos) "pX" = ( @@ -3714,12 +3951,13 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, +/obj/structure/table/rack, +/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/mech_bay) "ry" = ( /obj/structure/table/rack, /obj/item/mecha_parts/mecha_equipment/tool/jetpack, -/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/xray, /obj/effect/floor_decal/techfloor{ dir = 6 }, @@ -3768,9 +4006,6 @@ /turf/simulated/floor/tiled/white, /area/ship/manta/med) "rH" = ( -/obj/structure/railing{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -4141,6 +4376,7 @@ /obj/effect/floor_decal/techfloor{ dir = 10 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "tN" = ( @@ -4405,6 +4641,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "uV" = ( @@ -4521,6 +4758,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium, +/obj/structure/window/titanium{ + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "vH" = ( @@ -4802,11 +5043,21 @@ /area/ship/manta/engineering) "ww" = ( /obj/structure/table/rack, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = -4; + pixel_y = -4 + }, /obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/storage/firstaid/combat, -/obj/item/weapon/reagent_containers/hypospray, -/obj/item/weapon/reagent_containers/hypospray, +/obj/item/weapon/storage/firstaid/combat{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/hypospray{ + pixel_x = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -5064,7 +5315,6 @@ /turf/simulated/floor/plating, /area/ship/manta/dock_star) "xE" = ( -/obj/structure/catwalk, /obj/machinery/light_switch{ pixel_y = 23 }, @@ -5155,26 +5405,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "xQ" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/glass_engineeringatmos{ - req_one_access = list(150) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/orange{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/floor_decal/techfloor, -/obj/effect/floor_decal/techfloor{ - dir = 1 - }, -/turf/simulated/floor/tiled/techfloor, +/obj/structure/catwalk, +/obj/structure/railing, +/turf/simulated/floor/plating, /area/ship/manta/atmos) "xT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/fuel, @@ -5186,6 +5419,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, /turf/simulated/floor/plating, /area/ship/manta/engine) "xW" = ( @@ -5230,8 +5467,26 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "yh" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/airlock/glass_engineeringatmos{ + req_one_access = list(150) + }, +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/structure/cable/orange{ + 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/ship/manta/atmos) "yj" = ( /obj/machinery/power/port_gen/pacman/super/potato, @@ -5371,6 +5626,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yy" = ( @@ -5419,6 +5675,7 @@ /obj/effect/floor_decal/techfloor{ dir = 9 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yO" = ( @@ -5482,12 +5739,14 @@ /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "yW" = ( -/obj/structure/railing{ +/obj/structure/railing, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/catwalk, -/obj/structure/railing, /turf/simulated/floor/plating, /area/ship/manta/atmos) "yY" = ( @@ -5601,12 +5860,12 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/gun/energy/netgun, -/obj/item/weapon/gun/energy/netgun, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/netgun{ + pixel_y = 3 + }, /obj/item/weapon/gun/energy/plasmastun, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) @@ -5623,22 +5882,42 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "zy" = ( /obj/structure/table/rack, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, -/obj/item/weapon/tank/jetpack/oxygen, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = -6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = -2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 2 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/weapon/tank/jetpack/oxygen{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -5706,7 +5985,7 @@ /turf/simulated/floor/plating, /area/ship/manta/engine) "zR" = ( -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "zS" = ( /obj/structure/bed/chair/comfy/black{ @@ -5766,6 +6045,11 @@ }, /turf/simulated/floor/reinforced/airless, /area/ship/manta/gunnery) +"Ah" = ( +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "Aj" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/orange{ @@ -6010,6 +6294,9 @@ /obj/effect/floor_decal/techfloor{ dir = 6 }, +/obj/structure/table/steel_reinforced, +/obj/item/clothing/suit/space/void/refurb/engineering, +/obj/item/clothing/head/helmet/space/void/refurb/engineering, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "BN" = ( @@ -6178,8 +6465,12 @@ /area/ship/manta/recreation) "CT" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/plasmastun, -/obj/item/weapon/gun/energy/plasmastun, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = -3 + }, +/obj/item/weapon/gun/energy/plasmastun{ + pixel_y = 3 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -6194,6 +6485,11 @@ }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) +"Da" = ( +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/obj/effect/floor_decal/industrial/outline/red, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "Db" = ( /obj/structure/table/standard, /obj/item/device/radio/headset/syndicate, @@ -6248,8 +6544,14 @@ /area/ship/manta/dock_port) "Dg" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/box/frags, -/obj/item/weapon/storage/box/frags, +/obj/item/weapon/storage/box/frags{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/frags{ + pixel_x = 2; + pixel_y = 2 + }, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -6361,10 +6663,22 @@ /area/ship/manta/bridge) "Dy" = ( /obj/structure/table/steel_reinforced, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, -/obj/item/clothing/suit/storage/vest/heavy/merc, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/suit/storage/vest/heavy/merc{ + pixel_x = -6; + pixel_y = -6 + }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -6387,10 +6701,6 @@ dir = 4; pixel_x = 26 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "DB" = ( @@ -6580,14 +6890,38 @@ /area/ship/manta/hallways_aft) "EE" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/med, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, -/obj/item/weapon/storage/backpack/dufflebag/syndie, +/obj/item/weapon/storage/backpack/dufflebag/syndie/med{ + pixel_x = -4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/med{ + pixel_x = 4; + pixel_y = -6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/weapon/storage/backpack/dufflebag/syndie{ + pixel_x = -4; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -6732,9 +7066,15 @@ "Fx" = ( /obj/structure/table/rack, /obj/item/weapon/gun/launcher/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, -/obj/item/ammo_casing/rocket, +/obj/item/ammo_casing/rocket{ + pixel_y = -3 + }, +/obj/item/ammo_casing/rocket{ + pixel_y = -6 + }, +/obj/item/ammo_casing/rocket{ + pixel_y = -9 + }, /obj/effect/floor_decal/techfloor{ dir = 6 }, @@ -6875,8 +7215,11 @@ /turf/simulated/floor/wood, /area/ship/manta/barracks) "Gr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -6976,15 +7319,22 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 +/obj/effect/floor_decal/techfloor/corner{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/effect/floor_decal/techfloor/corner{ + dir = 9 }, /obj/effect/floor_decal/techfloor{ dir = 8 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "GY" = ( @@ -7104,12 +7454,28 @@ /area/ship/manta/bridge) "HS" = ( /obj/structure/table/rack, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, -/obj/item/weapon/pinpointer/nukeop, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6; + pixel_y = -4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6; + pixel_y = -4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/weapon/pinpointer/nukeop{ + pixel_x = 6; + pixel_y = 4 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -7212,8 +7578,12 @@ /area/ship/manta/teleporter) "Iq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/xray, -/obj/item/weapon/gun/energy/xray, +/obj/item/weapon/gun/energy/xray{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/xray{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -7274,13 +7644,15 @@ /area/ship/manta/engine) "IJ" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "IK" = ( @@ -7333,8 +7705,6 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Jd" = ( @@ -7444,10 +7814,22 @@ /area/ship/manta/bridge) "Jt" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -7656,21 +8038,21 @@ /area/ship/manta/dock_star) "KA" = ( /obj/structure/table/rack/shelf/steel, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/under/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/armor/helmcover/saare, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, -/obj/item/clothing/accessory/storage/pouches/large/green, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/under/saare/service, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/armor/helmcover/saare, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, +/obj/item/clothing/accessory/storage/pouches/large/green, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/barracks) "KE" = ( @@ -7801,6 +8183,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Le" = ( @@ -7872,13 +8255,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hangar) "LH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/catwalk, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/ship/manta/atmos) "LI" = ( @@ -7917,6 +8294,7 @@ /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 }, +/obj/machinery/meter, /turf/simulated/floor/plating, /area/ship/manta/atmos) "LT" = ( @@ -7998,10 +8376,13 @@ /area/ship/manta/hallways_aft) "Mg" = ( /obj/structure/sign/nosmoking_1, -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "Mh" = ( /obj/effect/floor_decal/techfloor, +/obj/structure/table/steel_reinforced, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/glasses/meson/aviator, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/engineering) "Mk" = ( @@ -8089,6 +8470,11 @@ }, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) +"Mz" = ( +/obj/effect/floor_decal/industrial/outline/red, +/obj/machinery/portable_atmospherics/canister/phoron/engine_setup, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "ME" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -8152,35 +8538,64 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "Nb" = ( /obj/structure/table/rack, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, -/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -7 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = -1 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/storage/black_vest{ + pixel_y = 8 + }, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 }, /obj/effect/floor_decal/techfloor, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, -/obj/item/clothing/accessory/holster/armpit, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -7 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -4 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = -1 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 2 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 5 + }, +/obj/item/clothing/accessory/holster/armpit{ + pixel_y = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "Nc" = ( /obj/structure/table/rack, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunammo/large, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, -/obj/item/weapon/gun/projectile/shotgun/pump/combat, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = 4 + }, +/obj/item/weapon/gun/projectile/shotgun/pump/combat{ + pixel_y = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -8224,8 +8639,12 @@ /area/ship/manta/barracks) "Nq" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/sniperrifle, -/obj/item/weapon/gun/energy/sniperrifle, +/obj/item/weapon/gun/energy/sniperrifle{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/sniperrifle{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 4 }, @@ -8266,16 +8685,18 @@ /area/ship/manta/dock_port) "Ny" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/gun, -/obj/item/weapon/gun/energy/gun, +/obj/item/weapon/gun/energy/gun{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/gun{ + pixel_y = -3 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, /obj/machinery/light/no_nightshift{ dir = 8 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NA" = ( @@ -8302,16 +8723,26 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, -/obj/item/weapon/cell/device/weapon, -/obj/item/weapon/cell/device/weapon, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NH" = ( /obj/structure/table/rack, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, -/obj/item/clothing/shoes/magboots, +/obj/item/clothing/shoes/magboots{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/shoes/magboots{ + pixel_x = 6; + pixel_y = 6 + }, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -8363,9 +8794,18 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "NV" = ( -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 23 +/obj/structure/railing, +/obj/structure/catwalk, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/plating, /area/ship/manta/atmos) @@ -8515,7 +8955,7 @@ /area/ship/manta/holding) "OO" = ( /obj/structure/sign/warning/radioactive, -/turf/simulated/wall/shull, +/turf/simulated/wall/rshull, /area/ship/manta/engineering) "OQ" = ( /obj/machinery/recharge_station, @@ -8971,8 +9411,12 @@ /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, /obj/item/ammo_magazine/m9mm, -/obj/item/weapon/gun/projectile/luger, -/obj/item/weapon/gun/projectile/luger/brown, +/obj/item/weapon/gun/projectile/luger{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/luger/brown{ + pixel_y = -6 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9051,8 +9495,12 @@ /area/ship/manta/holding) "RM" = ( /obj/structure/table/rack, -/obj/item/weapon/gun/energy/lasercannon, -/obj/item/weapon/gun/energy/lasercannon, +/obj/item/weapon/gun/energy/lasercannon{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/lasercannon{ + pixel_y = -3 + }, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, /obj/item/weapon/cell/device/weapon, @@ -9111,14 +9559,35 @@ dir = 1; pixel_y = -23 }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -8; + pixel_y = -8 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -6; + pixel_y = -6 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = -2; + pixel_y = -2 + }, /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, -/obj/item/clothing/mask/gas/half, -/obj/item/clothing/mask/gas/half, +/obj/item/clothing/mask/gas/half{ + pixel_x = 2; + pixel_y = 2 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/clothing/mask/gas/half{ + pixel_x = 6; + pixel_y = 6 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "RY" = ( @@ -9148,6 +9617,10 @@ /obj/machinery/door/firedoor/border_only, /obj/structure/grille, /obj/structure/window/titanium/full, +/obj/structure/window/titanium{ + dir = 1 + }, +/obj/structure/window/titanium, /turf/simulated/floor/plating, /area/ship/manta/engine) "Sb" = ( @@ -9197,9 +9670,10 @@ /obj/machinery/alarm/alarms_hidden{ pixel_y = 26 }, -/obj/structure/catwalk, /obj/structure/railing, -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, /turf/simulated/floor/plating, /area/ship/manta/magazine) "Sq" = ( @@ -9502,6 +9976,12 @@ }, /turf/simulated/floor/wood, /area/ship/manta/barracks/bed_2) +"TD" = ( +/obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/plating, +/area/ship/manta/atmos) "TH" = ( /obj/structure/ship_munition/disperser_charge/emp, /obj/structure/railing{ @@ -9515,12 +9995,28 @@ /area/ship/manta/hallways_port) "TM" = ( /obj/structure/table/rack, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4; + pixel_y = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4; + pixel_y = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/item/weapon/storage/toolbox/syndicate{ + pixel_x = 4; + pixel_y = 4 + }, /obj/effect/floor_decal/techfloor{ dir = 8 }, @@ -9813,8 +10309,12 @@ /obj/effect/floor_decal/techfloor{ dir = 8 }, -/obj/item/weapon/gun/energy/darkmatter, -/obj/item/weapon/gun/energy/darkmatter, +/obj/item/weapon/gun/energy/darkmatter{ + pixel_y = 3 + }, +/obj/item/weapon/gun/energy/darkmatter{ + pixel_y = -3 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_as) "Vk" = ( @@ -9836,10 +10336,18 @@ /obj/effect/floor_decal/techfloor{ dir = 4 }, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, -/obj/item/weapon/gun/projectile/automatic/bullpup, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = 6 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = 2 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = -2 + }, +/obj/item/weapon/gun/projectile/automatic/bullpup{ + pixel_y = -6 + }, /obj/item/ammo_magazine/m762m, /obj/item/ammo_magazine/m762m, /obj/item/ammo_magazine/m762m, @@ -9880,12 +10388,22 @@ /area/ship/manta/engineering) "VA" = ( /obj/structure/table/rack, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 6 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 4 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = 2 + }, /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/tank/emergency/oxygen/double, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = -2 + }, +/obj/item/weapon/tank/emergency/oxygen/double{ + pixel_x = -4 + }, /obj/effect/floor_decal/techfloor{ dir = 9 }, @@ -9911,17 +10429,41 @@ /area/ship/manta/bridge) "VF" = ( /obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/shield/energy, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, -/obj/item/weapon/melee/energy/sword/red, +/obj/item/weapon/shield/energy{ + pixel_x = -8; + pixel_y = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = -8 + }, +/obj/item/weapon/shield/energy{ + pixel_y = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = 8 + }, +/obj/item/weapon/shield/energy{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 18 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 15 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 12 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 9 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 6 + }, +/obj/item/weapon/melee/energy/sword/red{ + pixel_x = 3 + }, /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -9960,6 +10502,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/weapon/storage/firstaid/fire, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "VM" = ( @@ -10021,6 +10564,7 @@ /area/ship/manta/armoury_st) "Wi" = ( /obj/machinery/light/small, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/plating, /area/ship/manta/atmos) "Wn" = ( @@ -10213,19 +10757,16 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/bridge) "Xp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 23 }, +/obj/structure/catwalk, /obj/structure/cable/orange{ d1 = 1; - d2 = 4; - icon_state = "1-4" + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/catwalk, /turf/simulated/floor/plating, /area/ship/manta/atmos) "Xq" = ( @@ -10279,13 +10820,6 @@ /area/ship/manta/barracks) "XB" = ( /obj/structure/table/rack, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, -/obj/item/device/flashlight/flare, /obj/machinery/recharger/wallcharger{ pixel_x = 5; pixel_y = -32 @@ -10296,6 +10830,14 @@ /obj/machinery/light/no_nightshift{ dir = 4 }, +/obj/item/weapon/storage/box/flare{ + pixel_x = -2; + pixel_y = -2 + }, +/obj/item/weapon/storage/box/flare{ + pixel_x = 2; + pixel_y = 2 + }, /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_st) "XC" = ( @@ -10506,6 +11048,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/table/steel, /turf/simulated/floor/tiled/dark, /area/ship/manta/holding) "YA" = ( @@ -10672,7 +11215,6 @@ /area/ship/manta/holding) "Zn" = ( /obj/structure/table/rack, -/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/grenade/frag, /obj/effect/floor_decal/techfloor{ dir = 10 @@ -18580,7 +19122,7 @@ Aw zo lm mp -Oq +ou rs PW PW @@ -18724,7 +19266,7 @@ lm RS JL ZS -Oq +dM zr PW PW @@ -19125,7 +19667,7 @@ ZT ih lo oO -lo +oE by wp zx @@ -19861,11 +20403,11 @@ AC ZU VG VG +qM +qM +xQ SI -yh -SI -SI -SI +LH ZU Va vB @@ -20149,7 +20691,7 @@ qM qM rK SI -SI +Da ZU UH vM @@ -20287,11 +20829,11 @@ VP ZU AA Dn -BU pW +BU Gr SI -SI +Mz ZU Oi vO @@ -20430,10 +20972,10 @@ ZU bw Qb qM -LH +qM yW HD -Wi +TD ZU Ni RK @@ -20575,7 +21117,7 @@ pV Xp NV SI -SI +Ah ZU Ni LU @@ -20714,8 +21256,8 @@ ZU ZU ZU ZU -xQ ZU +yh ZU ZU ZU @@ -20856,7 +21398,7 @@ WN Xa LM LM -oE +LM GS UR xp @@ -21853,7 +22395,7 @@ qw Vz wM Gk -Mh +gu Mg Va vK diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index 64ee2a8a44..fbd399c98b 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -293,14 +293,14 @@ /datum/map_z_level/tether_lateload/gateway_destination name = "Gateway Destination" z = Z_LEVEL_GATEWAY - +/* // Removed due to heavy merc presence #include "../../gateway_vr/snow_outpost.dm" /datum/map_template/tether_lateload/gateway/snow_outpost name = "Snow Outpost" desc = "Big snowy area with various outposts." mappath = 'maps/gateway_vr/snow_outpost.dmm' associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination - +*/ #include "../../gateway_vr/zoo.dm" /datum/map_template/tether_lateload/gateway/zoo name = "Zoo" diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm index fdcd07c847..1b3d4dd1cc 100644 --- a/maps/tether/tether-07-station3.dmm +++ b/maps/tether/tether-07-station3.dmm @@ -3380,11 +3380,14 @@ /turf/simulated/floor/bluegrid, /area/ai) "afV" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 9 }, -/turf/space, -/turf/simulated/shuttle/plating/airless/carry, +/obj/machinery/atmospherics/pipe/simple/hidden{ + dir = 6; + icon_state = "intact" + }, +/turf/simulated/wall/rshull, /area/shuttle/excursion/general) "afW" = ( /obj/effect/floor_decal/borderfloorblack, @@ -3468,20 +3471,23 @@ /turf/simulated/open, /area/security/brig) "agc" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8; - icon_state = "propulsion_l" +/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ + dir = 5; + icon_state = "intact-fuel" }, -/turf/simulated/floor/tiled/asteroid_steel/airless, -/turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/obj/machinery/atmospherics/pipe/manifold/hidden{ + dir = 4; + icon_state = "map" + }, +/turf/simulated/wall/rshull, +/area/shuttle/excursion/general) "agd" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/machinery/atmospherics/unary/engine{ + dir = 1 }, -/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/space, /turf/simulated/shuttle/plating/airless/carry, -/area/shuttle/mining_outpost/shuttle) +/area/shuttle/excursion/general) "age" = ( /obj/structure/window/reinforced{ dir = 8 @@ -3506,7 +3512,7 @@ "agf" = ( /obj/structure/shuttle/engine/propulsion{ dir = 8; - icon_state = "propulsion_r" + icon_state = "propulsion_l" }, /turf/simulated/floor/tiled/asteroid_steel/airless, /turf/simulated/shuttle/plating/airless/carry, @@ -3514,6 +3520,21 @@ "agg" = ( /turf/simulated/floor/airless, /area/space) +"agh" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8 + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) +"agi" = ( +/obj/structure/shuttle/engine/propulsion{ + dir = 8; + icon_state = "propulsion_r" + }, +/turf/simulated/floor/tiled/asteroid_steel/airless, +/turf/simulated/shuttle/plating/airless/carry, +/area/shuttle/mining_outpost/shuttle) "agj" = ( /obj/machinery/access_button{ command = "cycle_exterior"; @@ -21220,17 +21241,6 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock/refinery) -"aXC" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 5; - icon_state = "intact-fuel" - }, -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 9; - icon_state = "intact" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "aXD" = ( /obj/structure/bed/chair/shuttle{ dir = 8 @@ -21669,12 +21679,6 @@ /obj/machinery/mineral/input, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) -"aZD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/fuel{ - dir = 9 - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "aZH" = ( /obj/machinery/conveyor{ dir = 8; @@ -22688,13 +22692,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/monotile, /area/tether/exploration) -"esH" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden{ - dir = 1; - icon_state = "map" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "esK" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 1 @@ -22881,13 +22878,6 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /turf/simulated/floor/tiled, /area/hallway/station/upper) -"fmc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden{ - dir = 6; - icon_state = "intact" - }, -/turf/simulated/wall/rshull, -/area/shuttle/excursion/general) "fox" = ( /obj/structure/cable{ icon_state = "1-2" @@ -36877,7 +36867,7 @@ aUJ aXb afT aez -afV +agd ams aXq abe @@ -37019,7 +37009,7 @@ wRt eug afT aeG -afV +agd ams aXq abe @@ -37160,8 +37150,8 @@ wOI afO wOI aiX -aZD -acK +afV +vJd ams aXq abe @@ -37302,8 +37292,8 @@ hNx kTn ckU aiY -fmc -vJd +xiw +acK ams ghy abe @@ -37870,8 +37860,8 @@ aXS rLd opv uVS -esH -vJd +xiw +acK ams eof abe @@ -38012,8 +38002,8 @@ uGF wPw xvO aRv -aXC -acK +agc +vJd ams amq abe @@ -38155,7 +38145,7 @@ ikk efQ wPF aeG -afV +agd ams aSx krj @@ -38297,7 +38287,7 @@ iEV tEV xiw aeH -afV +agd ams eAm abe @@ -40335,6 +40325,7 @@ avt adD aZS <<<<<<< HEAD +<<<<<<< HEAD aes aet aet @@ -40351,8 +40342,23 @@ agc agd agd agd +||||||| parent of d800c77374... Merge pull request #10098 from Novacat/nova-ert +agc +agd +agd +agd +======= +>>>>>>> d800c77374... Merge pull request #10098 from Novacat/nova-ert agf +<<<<<<< HEAD >>>>>>> 8844a0cb02... Merge pull request #10032 from Novacat/nova-ert +||||||| parent of d800c77374... Merge pull request #10098 from Novacat/nova-ert +======= +agh +agh +agh +agi +>>>>>>> d800c77374... Merge pull request #10098 from Novacat/nova-ert baB adD avt diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index d6e4727b5e..58aa3400ab 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -250,7 +250,6 @@ name = "\improper Vacant Prep Area" /area/vacant/vacant_site/gateway/lower name = "\improper Lower Vacant Prep Area" -//TFF 5/4/20 - Mining Ops move TODO Change all Vacant areas to construction_site per vermin event location announcement. /area/construction/vacant_mining_ops name = "\improper Vacant Mining Operations" @@ -267,7 +266,6 @@ /area/tether/surfacebase/emergency_storage/atrium name = "\improper Atrium Emergency Storage" -//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed. // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions /area/tether/surfacebase/cargo name = "Surface Cargo Foyer" @@ -650,7 +648,6 @@ name = "Atmospherics Gas Storage" icon_state = "atmos" -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake name = "\improper Atmospherics Intake" icon_state = "atmos" @@ -776,7 +773,6 @@ /area/rnd/robotics/resleeving name = "\improper Robotics Resleeving" -//TFF 28/8/19 - cleanup of areas placement /area/rnd/research/testingrange name = "\improper Weapons Testing Range" icon_state = "firingrange" @@ -787,7 +783,6 @@ //Outpost areas -//TFF 28/8/19 - cleanup of areas placement /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" @@ -939,7 +934,6 @@ name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR -//TFF 28/8/19 - cleanup of areas placement /area/chapel/observation name = "\improper Chapel Observation" icon_state = "chapel" @@ -979,6 +973,9 @@ icon_state = "recreation_area_restroom" sound_env = SMALL_ENCLOSED +/area/crew_quarters/sleep + limit_mob_size = FALSE + /area/crew_quarters/sleep/maintDorm1 name = "\improper Construction Dorm 1" icon_state = "Sleep" @@ -1003,7 +1000,6 @@ flags = RAD_SHIELDED soundproofed = TRUE -//TFF 28/8/19 - cleanup of areas placement /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE @@ -1141,6 +1137,9 @@ flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE +/area/holodeck/holodorm + limit_mob_size = FALSE + /area/holodeck/holodorm/source_basic name = "\improper Holodeck Source" flags = RAD_SHIELDED | BLUE_SHIELDED @@ -1412,7 +1411,6 @@ /area/shuttle/securiship/engines name = "\improper Securiship Engines" -//TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock name = "\improper Cargo Belter Access" @@ -1463,7 +1461,6 @@ area/shuttle/mining_outpost/shuttle name = "\improper Ninjacraft" icon_state = "shuttle2" -//TFF 28/8/19 - cleanup of areas placement /area/teleporter/departing name = "\improper Long-Range Teleporter" icon_state = "teleporter" @@ -1537,6 +1534,7 @@ area/shuttle/mining_outpost/shuttle requires_power = 0 flags = RAD_SHIELDED icon_state = "red2" + limit_mob_size = FALSE /area/unknown/dorm1 name = "Unknown Dorm 1" diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 58ba65aee2..48d007802a 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -143,7 +143,6 @@ /area/rnd/miscellaneous_lab ) -//TFF 5/4/20 - Mining Ops move, airlock path change unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, /area/rnd/external, // Outside, @@ -165,7 +164,6 @@ ) lateload_single_pick = list( - list("Snow Outpost"), list("Carp Farm"), list("Snow Field"), list("Listening Post") @@ -191,7 +189,6 @@ belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, Z_LEVEL_ROGUEMINE_2) -//TFF 16/4/20 - mining outpost shuttle defines mining_station_z = list(Z_LEVEL_SPACE_HIGH) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm index 29489eea93..847cd0e480 100644 --- a/maps/tether/tether_shuttle_defs.dm +++ b/maps/tether/tether_shuttle_defs.dm @@ -212,7 +212,7 @@ ..() ////////////////////////////////////////////////////////////// -//TFF 12/4/20 Surface Mining Outpost Shuttle +// Surface Mining Outpost Shuttle /datum/shuttle/autodock/ferry/surface_mining_outpost name = "Mining Outpost" diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm index 6ec0c4bc62..e380c18003 100644 --- a/maps/tether/tether_shuttles.dm +++ b/maps/tether/tether_shuttles.dm @@ -32,7 +32,6 @@ shuttle_tag = "Trade" req_one_access = list(access_trader) -//TFF 12/4/20 - Add console for Mining Outpost Shuttle /obj/machinery/computer/shuttle_control/surface_mining_outpost name = "surface mining outpost shuttle control console" shuttle_tag = "Mining Outpost" diff --git a/maps/tether_better/submaps/_tether_submaps.dm b/maps/tether_better/submaps/_tether_submaps.dm index 9d76b0f4d3..7ad00d5fa2 100644 --- a/maps/tether_better/submaps/_tether_submaps.dm +++ b/maps/tether_better/submaps/_tether_submaps.dm @@ -267,14 +267,14 @@ /datum/map_z_level/tether_lateload/gateway_destination name = "Gateway Destination" z = Z_LEVEL_GATEWAY - +/* //Disabled because mercs #include "../../gateway_vr/snow_outpost.dm" /datum/map_template/tether_lateload/gateway/snow_outpost name = "Snow Outpost" desc = "Big snowy area with various outposts." mappath = 'maps/gateway_vr/snow_outpost.dmm' associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination - +*/ //Disabled because mercs #include "../../gateway_vr/zoo.dm" /datum/map_template/tether_lateload/gateway/zoo name = "Zoo" diff --git a/maps/tether_better/tether_areas.dm b/maps/tether_better/tether_areas.dm index 68a3d8db83..bbac67466f 100644 --- a/maps/tether_better/tether_areas.dm +++ b/maps/tether_better/tether_areas.dm @@ -250,7 +250,6 @@ name = "\improper Vacant Prep Area" /area/vacant/vacant_site/gateway/lower name = "\improper Lower Vacant Prep Area" -//TFF 5/4/20 - Mining Ops move TODO Change all Vacant areas to construction_site per vermin event location announcement. /area/construction/vacant_mining_ops name = "\improper Vacant Mining Operations" @@ -267,7 +266,6 @@ /area/tether/surfacebase/emergency_storage/atrium name = "\improper Atrium Emergency Storage" -//TFF 7/4/20 - New areas for Surface Cargo bits as well as the Mining Outpost. Some former ones deleted. Others renamed. // Surface Cargo/Mining EVA/Warehouse/Mining Outpost adadditions /area/tether/surfacebase/cargo name = "Surface Cargo Foyer" @@ -650,7 +648,6 @@ name = "Atmospherics Gas Storage" icon_state = "atmos" -//TFF 11/12/19 - Minor refactor, makes mice spawn only in Atmos. /area/engineering/atmos_intake name = "\improper Atmospherics Intake" icon_state = "atmos" @@ -776,7 +773,6 @@ /area/rnd/robotics/resleeving name = "\improper Robotics Resleeving" -//TFF 28/8/19 - cleanup of areas placement /area/rnd/research/testingrange name = "\improper Weapons Testing Range" icon_state = "firingrange" @@ -787,7 +783,6 @@ //Outpost areas -//TFF 28/8/19 - cleanup of areas placement /area/rnd/outpost name = "\improper Research Outpost Hallway" icon_state = "research" @@ -939,7 +934,6 @@ name = "Public Meeting Room" icon_state = "blue" sound_env = SMALL_SOFTFLOOR -//TFF 28/8/19 - cleanup of areas placement /area/chapel/observation name = "\improper Chapel Observation" icon_state = "chapel" @@ -1003,7 +997,6 @@ flags = RAD_SHIELDED soundproofed = TRUE -//TFF 28/8/19 - cleanup of areas placement /area/crew_quarters/sleep/vistor_room_1 flags = RAD_SHIELDED | BLUE_SHIELDED soundproofed = TRUE @@ -1412,7 +1405,6 @@ /area/shuttle/securiship/engines name = "\improper Securiship Engines" -//TFF 5/4/20 - Mining Ops move // Asteroid Mining belter and Mining Outpost shuttles and refinery/gear areas /area/quartermaster/belterdock name = "\improper Cargo Belter Access" @@ -1460,7 +1452,6 @@ area/shuttle/mining_outpost/shuttle name = "\improper Ninjacraft" icon_state = "shuttle2" -//TFF 28/8/19 - cleanup of areas placement /area/teleporter/departing name = "\improper Long-Range Teleporter" icon_state = "teleporter" diff --git a/maps/tether_better/tether_defines.dm b/maps/tether_better/tether_defines.dm index 5529983b94..3d36aad020 100644 --- a/maps/tether_better/tether_defines.dm +++ b/maps/tether_better/tether_defines.dm @@ -138,7 +138,6 @@ /area/rnd/miscellaneous_lab ) -//TFF 5/4/20 - Mining Ops move, airlock path change unit_test_exempt_from_atmos = list( /area/engineering/atmos_intake, // Outside, /area/rnd/external, // Outside, @@ -160,7 +159,6 @@ ) lateload_single_pick = list( - list("Snow Outpost"), list("Carp Farm"), list("Snow Field"), list("Listening Post") @@ -186,7 +184,6 @@ belter_belt_z = list(Z_LEVEL_ROGUEMINE_1, Z_LEVEL_ROGUEMINE_2) -//TFF 16/4/20 - mining outpost shuttle defines mining_station_z = list(Z_LEVEL_SPACE_HIGH) mining_outpost_z = list(Z_LEVEL_SURFACE_MINE) diff --git a/maps/tether_better/tether_shuttle_defs.dm b/maps/tether_better/tether_shuttle_defs.dm index 29489eea93..847cd0e480 100644 --- a/maps/tether_better/tether_shuttle_defs.dm +++ b/maps/tether_better/tether_shuttle_defs.dm @@ -212,7 +212,7 @@ ..() ////////////////////////////////////////////////////////////// -//TFF 12/4/20 Surface Mining Outpost Shuttle +// Surface Mining Outpost Shuttle /datum/shuttle/autodock/ferry/surface_mining_outpost name = "Mining Outpost" diff --git a/maps/tether_better/tether_shuttles.dm b/maps/tether_better/tether_shuttles.dm index 6ec0c4bc62..e380c18003 100644 --- a/maps/tether_better/tether_shuttles.dm +++ b/maps/tether_better/tether_shuttles.dm @@ -32,7 +32,6 @@ shuttle_tag = "Trade" req_one_access = list(access_trader) -//TFF 12/4/20 - Add console for Mining Outpost Shuttle /obj/machinery/computer/shuttle_control/surface_mining_outpost name = "surface mining outpost shuttle control console" shuttle_tag = "Mining Outpost" diff --git a/maps/~map_system/maps.dm b/maps/~map_system/maps.dm index 5ded15b95a..0ed8fc4b18 100644 --- a/maps/~map_system/maps.dm +++ b/maps/~map_system/maps.dm @@ -68,7 +68,7 @@ var/list/all_maps = list() var/ai_shell_restricted = FALSE //VOREStation Addition - are there z-levels restricted? var/ai_shell_allowed_levels = list() //VOREStation Addition - which z-levels ARE we allowed to visit? - //VOREStation Addition Start - belter stuff TFF 16/4/20 - Mining Outpost Shuttle + //VOREStation Addition Start var/list/belter_docked_z = list() var/list/belter_transit_z = list() var/list/belter_belt_z = list() diff --git a/tgui/packages/tgui/interfaces/VorePanel.js b/tgui/packages/tgui/interfaces/VorePanel.js index 9725685f75..845e896969 100644 --- a/tgui/packages/tgui/interfaces/VorePanel.js +++ b/tgui/packages/tgui/interfaces/VorePanel.js @@ -908,6 +908,7 @@ const VoreUserPreferences = (props, context) => { const { digestable, devourable, + resizable, feeding, absorbable, digest_leave_remains, @@ -1055,6 +1056,44 @@ const VoreUserPreferences = (props, context) => { : "Click here to turn on hunger noises.")} content={noisy ? "Hunger Noises Enabled" : "Hunger Noises Disabled"} /> + +