From 13fa795f162bca0725c986101ec61dfc76a864cc Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 10 Dec 2018 00:07:39 +0000 Subject: [PATCH] Temporary removal of NIFs :c --- code/ZAS/Phoron.dm | 3 +- code/controllers/subsystems/transcore_vr.dm | 10 ++-- code/game/machinery/adv_med.dm | 5 +- code/game/machinery/cryopod.dm | 4 +- code/game/objects/items/contraband_vr.dm | 3 +- .../items/devices/communicator/phone.dm | 17 ++++-- code/game/objects/items/devices/flash.dm | 4 +- .../game/objects/items/devices/scanners_vr.dm | 16 ++++-- code/game/objects/items/weapons/tools.dm | 2 +- code/game/objects/structures/trash_pile.dm | 4 +- code/modules/admin/admin_verbs.dm | 8 +-- .../loadout/loadout_utility.dm | 4 +- code/modules/mob/living/carbon/breathe.dm | 5 +- .../mob/living/carbon/human/emote_vr.dm | 3 ++ .../mob/living/carbon/human/examine_vr.dm | 8 ++- code/modules/mob/living/carbon/human/human.dm | 5 +- .../living/carbon/human/human_attackhand.dm | 5 +- .../mob/living/carbon/human/human_damage.dm | 12 +++-- .../mob/living/carbon/human/human_helpers.dm | 5 +- code/modules/mob/living/carbon/human/life.dm | 23 +++++--- .../mob/living/carbon/human/life_vr.dm | 4 +- .../living/carbon/human/species/species_vr.dm | 4 +- .../station/protean_vr/protean_species.dm | 21 ++++---- .../simple_animal/vore/corrupt_hounds.dm | 5 +- code/modules/nano/interaction/inventory_vr.dm | 3 ++ code/modules/organs/organ_external.dm | 4 +- .../modules/reagents/Chemistry-Reagents_vr.dm | 3 ++ code/modules/research/designs_vr.dm | 4 +- code/modules/resleeving/infocore_records.dm | 5 +- code/modules/resleeving/machines.dm | 5 +- code/modules/surgery/implant.dm | 6 ++- code/modules/vore/fluffstuff/guns/nsfw.dm | 5 +- code/modules/vore/persist/persist_vr.dm | 8 ++- maps/northern_star/polaris-1.dmm | 53 +++++++++---------- maps/northern_star/polaris-2.dmm | 2 +- maps/northern_star/polaris-5.dmm | 2 +- vorestation.dme | 13 ----- 37 files changed, 179 insertions(+), 114 deletions(-) diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index 0f39ab4b56..b295a3c60a 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -119,10 +119,11 @@ obj/var/phoronproof = 0 if(burn_eyes && head && (head.body_parts_covered & EYES) && (head.item_flags & AIRTIGHT)) burn_eyes = 0 +/* //Chompstation Edit: Removing NIFs - Jon //VOREStation Edit - NIF Support if(nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) burn_eyes = 0 - +*/ //If we still need to, burn their eyes if(burn_eyes) burn_eyes() diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm index feae05ae91..f13ccda290 100644 --- a/code/controllers/subsystems/transcore_vr.dm +++ b/code/controllers/subsystems/transcore_vr.dm @@ -53,9 +53,9 @@ SUBSYSTEM_DEF(transcore) var/mob/living/carbon/human/H = imp.loc BITSET(H.hud_updateflag, BACKUP_HUD) - if(H == imp.imp_in && H.mind && H.stat < DEAD) - SStranscore.m_backup(H.mind,H.nif) - persist_nif_data(H) +// if(H == imp.imp_in && H.mind && H.stat < DEAD) +// SStranscore.m_backup(H.mind,H.nif) +// persist_nif_data(H) //Chompstation Edit: Removing NIFs - Jon if(MC_TICK_CHECK) return @@ -129,6 +129,8 @@ SUBSYSTEM_DEF(transcore) MR.last_update = world.time MR.one_time = one_time +// Chompstation Edit: TEMPORARILY REMOVING - Jon +/* //Pass a 0 to not change NIF status (because the elseif is checking for null) if(nif) MR.nif_path = nif.type @@ -145,7 +147,7 @@ SUBSYSTEM_DEF(transcore) MR.nif_durability = null MR.nif_software = null MR.nif_savedata = null - +*/ else MR = new(mind, mind.current, add_to_db = TRUE, one_time = one_time) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 121082c008..a062b61d9e 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -161,7 +161,10 @@ //Body Scan Console /obj/machinery/body_scanconsole var/obj/machinery/bodyscanner/scanner - var/known_implants = list(/obj/item/weapon/implant/health, /obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking, /obj/item/weapon/implant/language, /obj/item/weapon/implant/language/eal, /obj/item/weapon/implant/backup, /obj/item/device/nif) //VOREStation Add - Backup Implant, NIF + //Chompstation Edit: Removing NIFs - Jon +// var/known_implants = list(/obj/item/weapon/implant/health, /obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking, /obj/item/weapon/implant/language, /obj/item/weapon/implant/language/eal, /obj/item/weapon/implant/backup, /obj/item/device/nif) //VOREStation Add - Backup Implant, NIF + var/known_implants = list(/obj/item/weapon/implant/health, /obj/item/weapon/implant/chem, /obj/item/weapon/implant/death_alarm, /obj/item/weapon/implant/loyalty, /obj/item/weapon/implant/tracking, /obj/item/weapon/implant/language, /obj/item/weapon/implant/language/eal, /obj/item/weapon/implant/backup) + var/delete var/temphtml name = "Body Scanner Console" diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 7ba7a808a5..dfd3a6c280 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -391,13 +391,15 @@ var/obj/belly/B = belly for(var/mob/living/sub_L in B) despawn_occupant(sub_L) +// Chompstation Edit: Removed Nifs - Jon +/* if(ishuman(to_despawn)) var/mob/living/carbon/human/H = to_despawn if(H.nif) var/datum/nifsoft/soulcatcher/SC = H.nif.imp_check(NIF_SOULCATCHER) if(SC) for(var/bm in SC.brainmobs) - despawn_occupant(bm) + despawn_occupant(bm)*/ // VOREStation //Drop all items into the pod. diff --git a/code/game/objects/items/contraband_vr.dm b/code/game/objects/items/contraband_vr.dm index 399be72e30..38276115f5 100644 --- a/code/game/objects/items/contraband_vr.dm +++ b/code/game/objects/items/contraband_vr.dm @@ -47,7 +47,8 @@ /obj/item/clothing/accessory/permit/gun, /obj/item/device/perfect_tele, /obj/item/device/sleevemate, - /obj/item/weapon/disk/nifsoft/compliance, +// Chompstation Edit: Removing NIFs temporarily - Jon +// /obj/item/weapon/disk/nifsoft/compliance, /obj/item/seeds/ambrosiadeusseed, /obj/item/seeds/ambrosiavulgarisseed, /obj/item/seeds/libertymycelium, diff --git a/code/game/objects/items/devices/communicator/phone.dm b/code/game/objects/items/devices/communicator/phone.dm index 8668627f8e..d7139ea535 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -209,12 +209,16 @@ if(!T) return //VOREStation Edit Start for commlinks var/list/mobs_to_relay + +// Chompstation Edit: Removing NIFs temporarily - Jon +/* if(istype(comm,/obj/item/device/communicator/commlink)) var/obj/item/device/communicator/commlink/CL = comm mobs_to_relay = list(CL.nif.human) else - var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display - mobs_to_relay = in_range["mobs"] +*/ + var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display + mobs_to_relay = in_range["mobs"] //VOREStation Edit End for(var/mob/mob in mobs_to_relay) //We can't use visible_message(), or else we will get an infinite loop if two communicators hear each other. @@ -237,12 +241,15 @@ if(!T) return //VOREStation Edit Start for commlinks var/list/mobs_to_relay - if(istype(comm,/obj/item/device/communicator/commlink)) + + // Chompstation Edit: Removing NIFs temporarily - Jon +/* if(istype(comm,/obj/item/device/communicator/commlink)) var/obj/item/device/communicator/commlink/CL = comm mobs_to_relay = list(CL.nif.human) else - var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display - mobs_to_relay = in_range["mobs"] +*/ + var/list/in_range = get_mobs_and_objs_in_view_fast(T,world.view,0) //Range of 3 since it's a tiny video display + mobs_to_relay = in_range["mobs"] //VOREStation Edit End for(var/mob/mob in mobs_to_relay) diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 53b2d83564..055cff3284 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -77,6 +77,8 @@ playsound(src.loc, 'sound/weapons/flash.ogg', 100, 1) var/flashfail = 0 +//Chompstation Edit: Removing NIFs - Jon +/* //VOREStation Add - NIF if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -84,7 +86,7 @@ flashfail = 1 H.nif.notify("High intensity light detected, and blocked!",TRUE) //VOREStation Add End - +*/ if(iscarbon(M) && !flashfail) //VOREStation Add - NIF var/mob/living/carbon/C = M if(C.stat != DEAD) diff --git a/code/game/objects/items/devices/scanners_vr.dm b/code/game/objects/items/devices/scanners_vr.dm index b8b29997f0..89eadcefba 100644 --- a/code/game/objects/items/devices/scanners_vr.dm +++ b/code/game/objects/items/devices/scanners_vr.dm @@ -97,12 +97,14 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob else output += "Unable
" +//Chompstation Edit: Removing NIFs - Jon +/* //Soulcatcher transfer if(stored_mind && H.nif) var/datum/nifsoft/soulcatcher/SC = H.nif.imp_check(NIF_SOULCATCHER) if(SC) output += "Store in Soulcatcher: \[Perform\]
" - +*/ to_chat(user,output) /obj/item/device/sleevemate/Topic(href, href_list) @@ -129,15 +131,17 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob to_chat(usr,"Target seems totally braindead.") return - var/nif +//Chompstation Edit: Removing NIFs - Jon +/* var/nif if(ishuman(target)) var/mob/living/carbon/human/H = target nif = H.nif - persist_nif_data(H) + persist_nif_data(H)*/ usr.visible_message("[usr] begins scanning [target]'s mind.","You begin scanning [target]'s mind.") if(do_after(usr,8 SECONDS,target)) - SStranscore.m_backup(target.mind,nif,one_time = TRUE) +// SStranscore.m_backup(target.mind,nif,one_time = TRUE) //Chompstation Edit: Removing NIFs - Jon + SStranscore.m_backup(target.mind,null,one_time = TRUE) to_chat(usr,"Mind backed up!") else to_chat(usr,"You must remain close to your target!") @@ -180,6 +184,8 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob return +//Chompstation Edit: Removing NIFs - Jon +/* if(href_list["mindput"]) if(!stored_mind) to_chat(usr,"\The [src] no longer has a stored mind.") @@ -189,7 +195,6 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob if(!istype(target)) return //href hacking only - if(!H.nif) return //Lost it? or href hacking @@ -207,6 +212,7 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob stored_mind = null to_chat(usr,"Mind transferred into Soulcatcher!") update_icon() +*/ /obj/item/device/sleevemate/update_icon() if(stored_mind) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 9a8937adbc..ddcb722fc9 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -597,7 +597,7 @@ var/obj/item/organ/internal/eyes/E = H.internal_organs_by_name[O_EYES] if(!E) return - if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF +// if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF //Chompstation Edit: Removing NIFs - Jon switch(safety) if(1) to_chat(usr, "Your eyes sting a little.") diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index 727dcbb9f4..e87dc1b24f 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -230,13 +230,13 @@ prob(2);/obj/item/weapon/storage/box/syndie_kit/spy, prob(2);/obj/item/weapon/grenade/anti_photon, prob(1);/obj/item/clothing/suit/storage/vest/heavy/merc, - prob(1);/obj/item/device/nif/bad, +// prob(1);/obj/item/device/nif/bad, //Chompstation Edit: Removing NIFs - Jon prob(1);/obj/item/device/radio_jammer, prob(1);/obj/item/device/sleevemate, prob(1);/obj/item/device/bodysnatcher, prob(1);/obj/item/weapon/beartrap, prob(1);/obj/item/weapon/cell/hyper/empty, - prob(1);/obj/item/weapon/disk/nifsoft/compliance, +// prob(1);/obj/item/weapon/disk/nifsoft/compliance, //Chompstation Edit: Removing NIFs - Jon prob(1);/obj/item/weapon/material/knife/tacknife, prob(1);/obj/item/weapon/reagent_containers/syringe/steroid) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 757a397b10..b56bee42e3 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -102,7 +102,7 @@ var/list/admin_verbs_admin = list( /client/proc/toggle_attack_logs, /datum/admins/proc/paralyze_mob, /client/proc/fixatmos, - /datum/admins/proc/quick_nif, //VOREStation Add, +// /datum/admins/proc/quick_nif, //VOREStation Add, //Chompstation Edit: Removing NIFs - Jon /datum/admins/proc/sendFax, /client/proc/despawn_player ) @@ -140,7 +140,7 @@ var/list/admin_verbs_fun = list( ) var/list/admin_verbs_spawn = list( - /datum/admins/proc/quick_nif, //CHOMPStation Add, +// /datum/admins/proc/quick_nif, //CHOMPStation Add, //Chompstation Edit: Removing NIFs - Jon /datum/admins/proc/spawn_fruit, /datum/admins/proc/spawn_custom_item, /datum/admins/proc/check_custom_items, @@ -347,7 +347,7 @@ var/list/admin_verbs_mod = list( /client/proc/cmd_admin_subtle_message, //send an message to somebody as a 'voice in their head', /datum/admins/proc/paralyze_mob, /client/proc/cmd_admin_direct_narrate, - /datum/admins/proc/quick_nif, //CHOMPStation Add, +// /datum/admins/proc/quick_nif, //CHOMPStation Add, //Chompstation Edit: Removing NIFs - Jon /client/proc/allow_character_respawn, // Allows a ghost to respawn , /datum/admins/proc/sendFax, /client/proc/giveruntimelog, //allows us to give access to runtime logs to somebody, @@ -376,7 +376,7 @@ var/list/admin_verbs_event_manager = list( /datum/admins/proc/paralyze_mob, /client/proc/cmd_admin_direct_narrate, /client/proc/cmd_admin_world_narrate, //sends text to all players with no padding, - /datum/admins/proc/quick_nif, //CHOMPStation Add, +// /datum/admins/proc/quick_nif, //CHOMPStation Add, //Chompstation Edit: Removing NIFs - Jon /client/proc/allow_character_respawn, /datum/admins/proc/sendFax, /client/proc/respawn_character, diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 76178dada2..b5e035d423 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -21,7 +21,9 @@ /datum/gear/utility/communicator/New() ..() var/list/communicators = list() - for(var/communicator in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink +// Chompstation Edit: Conflict with Removing NIFs - Jon +// for(var/communicator in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink + for(var/communicator in typesof(/obj/item/device/communicator) - /obj/item/device/communicator/integrated) var/obj/item/device/communicator_type = communicator communicators[initial(communicator_type.name)] = communicator_type gear_tweaks += new/datum/gear_tweak/path(sortAssoc(communicators)) diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm index 2b8ce41063..353dfbdcbe 100644 --- a/code/modules/mob/living/carbon/breathe.dm +++ b/code/modules/mob/living/carbon/breathe.dm @@ -22,12 +22,13 @@ else //Okay, we can breathe, now check if we can get air breath = get_breath_from_internal() //First, check for air from internals - //VOREStation Add - Respirocytes as a NIF implant +// Chompstation Edit: Removed Nifs - Jon +/* //VOREStation Add - Respirocytes as a NIF implant if(!breath && ishuman(src)) var/mob/living/carbon/human/H = src if(H.nif && H.nif.flag_check(NIF_H_SPAREBREATH,NIF_FLAGS_HEALTH)) var/datum/nifsoft/spare_breath/SB = H.nif.imp_check(NIF_SPAREBREATH) - breath = SB.resp_breath() + breath = SB.resp_breath()*/ //VOREStation Add End if(!breath) breath = get_breath_from_environment() //No breath from internals so let's try to get air from our location diff --git a/code/modules/mob/living/carbon/human/emote_vr.dm b/code/modules/mob/living/carbon/human/emote_vr.dm index a637dff787..c9d5a3b0d1 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -19,12 +19,15 @@ if ("awoo") message = "awoos loudly. AwoooOOOOoooo!" m_type = 2 +//Chompstation Edit: Removing NIFs - Jon +/* if ("nsay") nsay() return TRUE if ("nme") nme() return TRUE +*/ if ("flip") var/danger = 1 //Base 1% chance to break something. var/list/involved_parts = list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT) diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index 44488ae319..65097c23a2 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -119,14 +119,15 @@ //For OmniHUD records access for appropriate models /proc/hasHUD_vr(mob/living/carbon/human/H, hudtype) - if(H.nif) +//Chompstation Edit: Removing NIFs - Jon +/* if(H.nif) switch(hudtype) if("security") if(H.nif.flag_check(NIF_V_AR_SECURITY,NIF_FLAGS_VISION)) return TRUE if("medical") if(H.nif.flag_check(NIF_V_AR_MEDICAL,NIF_FLAGS_VISION)) - return TRUE + return TRUE */ if(istype(H.glasses, /obj/item/clothing/glasses/omnihud)) var/obj/item/clothing/glasses/omnihud/omni = H.glasses @@ -152,6 +153,9 @@ message = "They are small enough that you could easily trample them!\n" return message +//Chompstation Edit: Removing NIFs - Jon +/* /mob/living/carbon/human/proc/examine_nif(mob/living/carbon/human/H) if(nif && nif.examine_msg) //If you have one set, anyway. return "[nif.examine_msg]\n" +*/ \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 792011043a..fc1c35b69a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -57,8 +57,9 @@ human_mob_list -= src for(var/organ in organs) qdel(organ) - qdel_null(nif) //VOREStation Add - qdel_null_list(vore_organs) //VOREStation Add +// Chompstation Edit: Removing NIFs temporarily - Jon +// qdel_null(nif) //VOREStation Add +// qdel_null_list(vore_organs) //VOREStation Add return ..() /mob/living/carbon/human/Stat() diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index e698258bdb..46ade0ac93 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -1,6 +1,7 @@ /mob/living/carbon/human/proc/get_unarmed_attack(var/mob/living/carbon/human/target, var/hit_zone) + //Chompstation Edit: Removing NIFs - Jon // VOREStation Edit - Begin - if(nif && nif.flag_check(NIF_C_HARDCLAWS,NIF_FLAGS_COMBAT)){return unarmed_hardclaws} +// if(nif && nif.flag_check(NIF_C_HARDCLAWS,NIF_FLAGS_COMBAT)){return unarmed_hardclaws} if(src.default_attack && src.default_attack.is_usable(src, target, hit_zone)) if(pulling_punches) var/datum/unarmed_attack/soft_type = src.default_attack.get_sparring_variant() @@ -251,7 +252,7 @@ H.visible_message("[attack_message]") playsound(loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1) - + add_attack_logs(H,src,"Melee attacked with fists (miss/block)") if(miss_type) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 45f174063f..aab6d786dc 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -117,7 +117,8 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_brute_damage_percent)) amount *= M.incoming_brute_damage_percent - if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage + //Chompstation Edit: Removing NIFs - Jon +// if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage take_overall_damage(amount, 0) else for(var/datum/modifier/M in modifiers) @@ -135,7 +136,8 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_fire_damage_percent)) amount *= M.incoming_fire_damage_percent - if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage + //Chompstation Edit: Removing NIFs - Jon +// if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage take_overall_damage(0, amount) else for(var/datum/modifier/M in modifiers) @@ -155,7 +157,8 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_brute_damage_percent)) amount *= M.incoming_brute_damage_percent - if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage +// Chompstation Edit: Removing NIFs temporarily - Jon +// if(nif && nif.flag_check(NIF_C_BRUTEARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage O.take_damage(amount, 0, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) else for(var/datum/modifier/M in modifiers) @@ -177,7 +180,8 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_fire_damage_percent)) amount *= M.incoming_fire_damage_percent - if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage +//Chompstation Edit: Removing NIFs - Jon +// if(nif && nif.flag_check(NIF_C_BURNARMOR,NIF_FLAGS_COMBAT)){amount *= 0.7} //VOREStation Edit - NIF mod for damage resistance for this type of damage O.take_damage(0, amount, sharp=is_sharp(damage_source), edge=has_edge(damage_source), used_weapon=damage_source) else for(var/datum/modifier/M in modifiers) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 2589b1c9da..8add0cb4b8 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -147,11 +147,12 @@ var/obj/item/clothing/glasses/V = rig.visor.vision.glasses compiled_vis |= V.enables_planes - //VOREStation Add - NIF Support +//Chompstation Edit: Removing NIFs - Jon +/* //VOREStation Add - NIF Support if(nif) compiled_vis |= nif.planes_visible() //VOREStation Add End - +*/ if(!compiled_vis.len && !vis_enabled.len) return //Nothin' doin'. diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 8619dee42d..837568ae4c 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -83,7 +83,10 @@ handle_medical_side_effects() handle_heartbeat() - handle_nif() //VOREStation Add + + //Chompstation Edit: Removing NIFs - Jon +// handle_nif() //VOREStation Add + if(!client) species.handle_npc(src) @@ -688,7 +691,9 @@ pressure_alert = -1 else if( !(COLD_RESISTANCE in mutations)) - if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF pressure seals +// Chompstation Edit - Removes NIFs - Jon +// if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF pressure seals + if(!isSynthetic()) take_overall_damage(brute=LOW_PRESSURE_DAMAGE, used_weapon = "Low Pressure") if(getOxyLoss() < 55) // 11 OxyLoss per 4 ticks when wearing internals; unconsciousness in 16 ticks, roughly half a minute adjustOxyLoss(4) // 16 OxyLoss per 4 ticks when no internals present; unconsciousness in 13 ticks, roughly twenty seconds @@ -726,8 +731,9 @@ // FBPs will overheat, prosthetic limbs are fine. if(robobody_count) - if(!nif || !nif.flag_check(NIF_O_HEATSINKS,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF heatsinks - bodytemperature += round(robobody_count*1.75) +// Chompstation Edit: Removing NIFs temporarily - Jon +// if(!nif || !nif.flag_check(NIF_O_HEATSINKS,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF heatsinks + bodytemperature += round(robobody_count*1.75) var/body_temperature_difference = species.body_temperature - bodytemperature @@ -1304,8 +1310,10 @@ var/obj/item/clothing/glasses/G = glasses if(!G.prescription) set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1) - else if (!nif || !nif.flag_check(NIF_V_CORRECTIVE,NIF_FLAGS_VISION)) //VOREStation Edit - NIF - set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1) +//Chompstation Edit: Removing NIFs - Jon +// else if (!nif || !nif.flag_check(NIF_V_CORRECTIVE,NIF_FLAGS_VISION)) //VOREStation Edit - NIF + + set_fullscreen(disabilities & NEARSIGHTED, "impaired", /obj/screen/fullscreen/impaired, 1) set_fullscreen(eye_blurry, "blurry", /obj/screen/fullscreen/blurry) set_fullscreen(druggy, "high", /obj/screen/fullscreen/high) @@ -1319,7 +1327,8 @@ var/obj/item/clothing/glasses/welding/O = glasses if(!O.up) found_welder = 1 - if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF +//Chompstation Edit: Removing NIFs - Jon +// if(!found_welder && nif && nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) found_welder = 1 //VOREStation Add - NIF if(!found_welder && istype(head, /obj/item/clothing/head/welding)) var/obj/item/clothing/head/welding/O = head if(!O.up) diff --git a/code/modules/mob/living/carbon/human/life_vr.dm b/code/modules/mob/living/carbon/human/life_vr.dm index 1dc37ff8cc..2710ca452e 100644 --- a/code/modules/mob/living/carbon/human/life_vr.dm +++ b/code/modules/mob/living/carbon/human/life_vr.dm @@ -48,14 +48,16 @@ else vantag.icon_state = "hudblank" apply_hud(VANTAG_HUD, vantag) +// Chompstation Edit: Removing NIFs temporarily - Jon +/* //Our call for the NIF to do whatever /mob/living/carbon/human/proc/handle_nif() if(!nif) return //Process regular life stuff nif.life() - +*/ //Overriding carbon move proc that forces default hunger factor /mob/living/carbon/Move(NewLoc, direct) . = ..() 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 fa3bb9762d..a4afed724d 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -28,6 +28,8 @@ for(var/u_type in unarmed_types) unarmed_attacks += new u_type() +//Chompstation Edit: Removing NIFs - Jon +/* /datum/species/create_organs(var/mob/living/carbon/human/H) if(H.nif) var/type = H.nif.type @@ -39,4 +41,4 @@ var/obj/item/device/nif/nif = new type(H,durability,nif_savedata) nif.nifsofts = nifsofts else - ..() + ..() */ diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm index 0b64f473e6..b3d2af1df7 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_species.dm @@ -112,6 +112,8 @@ for(var/path in powertypes) abilities += new path() +//Chompstation Edit: Removing NIFs - Jon +/* /datum/species/protean/create_organs(var/mob/living/carbon/human/H) var/obj/item/device/nif/saved_nif = H.nif if(saved_nif) @@ -119,7 +121,7 @@ H.nif.forceMove(null) ..() if(saved_nif) - saved_nif.quick_implant(H) + saved_nif.quick_implant(H)*/ /datum/species/protean/get_bodytype(var/mob/living/carbon/human/H) if(H) @@ -139,18 +141,19 @@ if(H.backbag == 1) //Somewhat misleading, 1 == no bag (not boolean) H.equip_to_slot_or_del(permit, slot_l_hand) - H.equip_to_slot_or_del(metal_stack, slot_r_hand) + H.equip_to_slot_or_del(metal_stack, slot_r_hand) else H.equip_to_slot_or_del(permit, slot_in_backpack) H.equip_to_slot_or_del(metal_stack, slot_in_backpack) - +// Chompstation Edit: Removing temporarily - Jon +/* spawn(0) //Let their real nif load if they have one if(!H.nif) var/obj/item/device/nif/bioadap/new_nif = new() new_nif.quick_implant(H) else H.nif.durability = rand(21,25) - +*/ /datum/species/protean/hug(var/mob/living/carbon/human/H, var/mob/living/target) return ..() //Wut @@ -172,7 +175,7 @@ var/obj/item/organ/internal/nano/refactory/refactory = locate() in H.internal_organs if(refactory && !(refactory.status & ORGAN_DEAD)) - + //MHydrogen adds speeeeeed if(refactory.get_stored_material("mhydrogen") >= METAL_PER_TICK) H.add_modifier(/datum/modifier/protean/mhydrogen, origin = refactory) @@ -233,7 +236,7 @@ var/obj/item/organ/internal/nano/refactory/refactory = origin.resolve() if(!istype(refactory) || refactory.status & ORGAN_DEAD) expire() - + //Out of materials if(!refactory.use_stored_material(material_name,material_use)) expire() @@ -255,7 +258,7 @@ on_created_text = "You feel yourself become nearly impervious to physical attacks as plasteel nanites are made." on_expired_text = "Your refactory finishes consuming the plasteel, and you return to your normal nanites." - + material_name = "plasteel" incoming_brute_damage_percent = 0.5 @@ -266,7 +269,7 @@ on_created_text = "You feel yourself become more reflective, able to resist heat and fire better for a time." on_expired_text = "Your refactory finishes consuming the diamond, and you return to your normal nanites." - + material_name = "diamond" incoming_fire_damage_percent = 0.2 @@ -277,7 +280,7 @@ on_created_text = "You feel new nanites being produced from your stockpile of steel, healing you slowly." on_expired_text = "Your steel supply has either run out, or is no longer needed, and your healing stops." - + material_name = "steel" /datum/modifier/protean/steel/tick() diff --git a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm index a7ee0bcd7d..2e7e2f949a 100644 --- a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm +++ b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm @@ -57,8 +57,9 @@ vore_icons = SA_ICON_LIVING | SA_ICON_REST vore_stomach_name = "fuel processor" vore_stomach_flavor = "You have ended up in the fuel processor of this corrupted machine. This place was definitely not designed with safety and comfort in mind. The heated and cramped surroundings oozing potent fluids all over your form, eager to do nothing less than breaking you apart to fuel its rampage for the next few days... hours... minutes? Oh dear..." - - loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6) +//Chompstation Edit: Removing NIFs - Jon +// loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6, /obj/item/weapon/disk/nifsoft/compliance = 6) + loot_list = list(/obj/item/borg/upgrade/syndicate = 6, /obj/item/borg/upgrade/vtec = 6, /obj/item/weapon/material/knife/ritual = 6) /mob/living/simple_animal/hostile/corrupthound/prettyboi name = "corrupt corrupt hound" diff --git a/code/modules/nano/interaction/inventory_vr.dm b/code/modules/nano/interaction/inventory_vr.dm index 21ee1ca590..b8eb72ade2 100644 --- a/code/modules/nano/interaction/inventory_vr.dm +++ b/code/modules/nano/interaction/inventory_vr.dm @@ -11,6 +11,8 @@ return STATUS_CLOSE +//Chompstation Edit: Removing NIFs - Jon +/* /var/global/datum/topic_state/nif_state/nif_state = new() /datum/topic_state/nif_state/can_use_topic(var/src_object, var/mob/user) @@ -30,3 +32,4 @@ return user.shared_nano_interaction() return STATUS_CLOSE +*/ \ No newline at end of file diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 789dce7dfb..b6064b7645 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -464,7 +464,9 @@ This function completely restores a damaged organ to perfect condition. // remove embedded objects and drop them on the floor for(var/obj/implanted_object in implants) - if(!istype(implanted_object,/obj/item/weapon/implant) && !istype(implanted_object,/obj/item/device/nif)) // We don't want to remove REAL implants. Just shrapnel etc. //VOREStation Edit - NIFs pls + // Chompstation Edit: Removing NIFs temporarily - Jon +// if(!istype(implanted_object,/obj/item/weapon/implant) && !istype(implanted_object,/obj/item/device/nif)) // We don't want to remove REAL implants. Just shrapnel etc. //VOREStation Edit - NIFs pls + if(!istype(implanted_object,/obj/item/weapon/implant) && !istype(implanted_object)) implanted_object.loc = get_turf(src) implants -= implanted_object diff --git a/code/modules/reagents/Chemistry-Reagents_vr.dm b/code/modules/reagents/Chemistry-Reagents_vr.dm index b841375b84..72274b390a 100644 --- a/code/modules/reagents/Chemistry-Reagents_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents_vr.dm @@ -27,6 +27,8 @@ result_amount = 30 required = /obj/item/slime_extract/sapphire +//Chompstation Edit: Removing NIFs - Jon +/* /datum/reagent/nif_repair_nanites name = "Programmed Nanomachines" id = "nifrepairnanites" @@ -44,3 +46,4 @@ if(nif.stat == NIF_TEMPFAIL) nif.stat = NIF_INSTALLING nif.durability = min(nif.durability + removed, initial(nif.durability)) +*/ \ No newline at end of file diff --git a/code/modules/research/designs_vr.dm b/code/modules/research/designs_vr.dm index a78da35191..9072bf644a 100644 --- a/code/modules/research/designs_vr.dm +++ b/code/modules/research/designs_vr.dm @@ -84,6 +84,8 @@ build_path = /obj/item/device/perfect_tele sort_string = "HABAF" +// Chompstation Edit: Removing temporarily - Jon +/* /datum/design/item/nif name = "nanite implant framework" id = "nif" @@ -108,7 +110,7 @@ materials = list(DEFAULT_WALL_MATERIAL = 200, "glass" = 3000, "uranium" = 2000, "diamond" = 2000) build_path = /obj/item/device/nifrepairer sort_string = "HABBE" //CHOMP Edit, Changed String from HABBD to HABBE - +*/ // Resleeving Circuitboards /datum/design/circuit/transhuman_clonepod diff --git a/code/modules/resleeving/infocore_records.dm b/code/modules/resleeving/infocore_records.dm index 834b067e9d..662ef0717b 100644 --- a/code/modules/resleeving/infocore_records.dm +++ b/code/modules/resleeving/infocore_records.dm @@ -41,7 +41,8 @@ ckey = ckey(mind.key) cryo_at = 0 - +// Chompstation Edit: Removing NIFs temporarily - Jon +/* //Mental stuff the game doesn't keep mentally if(istype(M) || istype(M,/mob/living/carbon/brain/caught_soul)) id_gender = M.identifying_gender @@ -57,7 +58,7 @@ nifsofts += nifsoft.type nif_software = nifsofts nif_savedata = M.nif.save_data.Copy() - +*/ last_update = world.time if(add_to_db) diff --git a/code/modules/resleeving/machines.dm b/code/modules/resleeving/machines.dm index 8f4cc8e13c..bd4cbc3be6 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -528,14 +528,15 @@ var/how_long = round((world.time - MR.last_update)/10/60) to_chat(occupant,"Your mind backup was a 'one-time' backup. \ You will not be able to remember anything since the backup, [how_long] minutes ago.") - +// Chompstation Edit: Removed Nifs - Jon +/* //Re-supply a NIF if one was backed up with them. if(MR.nif_path) var/obj/item/device/nif/nif = new MR.nif_path(occupant,null,MR.nif_savedata) for(var/path in MR.nif_software) new path(nif) nif.durability = MR.nif_durability //Restore backed up durability after restoring the softs. - +*/ // If it was a custom sleeve (not owned by anyone), update namification sequences if(!occupant.original_player) occupant.real_name = occupant.mind.name diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 3bbb5f1089..d5ea0f9e88 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -148,7 +148,8 @@ user.drop_item() affected.implants += tool tool.loc = affected - if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support +// Chompstation Edit: Removing NIFs temporarily - Jon +// if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support affected.cavity = 0 ////////////////////////////////////////////////////////////////// @@ -220,7 +221,8 @@ var/obj/item/weapon/implant/imp = obj imp.imp_in = null imp.implanted = 0 - else if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support +// Chompstation Edit: Removing NIFs temporarily - Jon +// else if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.unimplant(target)} //VOREStation Add - NIF support else user.visible_message("[user] removes \the [tool] from [target]'s [affected.name].", \ "There's something inside [target]'s [affected.name], but you just missed it this time." ) diff --git a/code/modules/vore/fluffstuff/guns/nsfw.dm b/code/modules/vore/fluffstuff/guns/nsfw.dm index bc570697d6..e8e3febce2 100644 --- a/code/modules/vore/fluffstuff/guns/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -316,12 +316,13 @@ /obj/item/projectile/beam/final_option/on_hit(var/atom/impacted) if(isliving(impacted)) var/mob/living/L = impacted - if(L.mind) +// Chompstation Edit: Removed Nifs - Jon +/* if(L.mind) var/nif if(ishuman(L)) var/mob/living/carbon/human/H = L nif = H.nif - SStranscore.m_backup(L.mind,nif,one_time = TRUE) + SStranscore.m_backup(L.mind,nif,one_time = TRUE)*/ L.gib() ..() diff --git a/code/modules/vore/persist/persist_vr.dm b/code/modules/vore/persist/persist_vr.dm index eeeca1713e..22e7b2da55 100644 --- a/code/modules/vore/persist/persist_vr.dm +++ b/code/modules/vore/persist/persist_vr.dm @@ -82,10 +82,12 @@ WARNING("Persist (PID): Skipping [occupant] for persisting, as they have no prefs.") return +//Chompstation Edit: Removing NIFs - Jon +/* //This one doesn't rely on persistence prefs if(ishuman(occupant) && occupant.stat != DEAD) persist_nif_data(occupant, prefs) - +*/ if(!prefs.persistence_settings) return // Persistence disabled by preference settings @@ -218,11 +220,14 @@ var/loss = (MAX_NUTRITION_TO_LOSE - C.nutrition) * weight_per_nutrition * C.weight_loss/100 C.weight = max(MIN_MOB_WEIGHT, C.weight - loss) +// Chompstation Edit: Removing NIFs temporarily - Jon + /** * Persist any NIF data that needs to be persisted. It's stored in a list to make it more malleable * towards future shenanigans such as upgradable NIFs or different types or things of that nature, * without invoking the need for a bunch of different save file variables. */ +/* /proc/persist_nif_data(var/mob/living/carbon/human/H,var/datum/preferences/prefs) if(!istype(H)) crash_with("Persist (NIF): Given a nonhuman: [H]") @@ -257,3 +262,4 @@ if(!S) WARNING ("Persist (NIF): Couldn't load NIF save savefile? [prefs.real_name]") S.cd = "/character[prefs.default_slot]" nif_prefs.save_character(S) +*/ \ No newline at end of file diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm index c3cefddd76..52a3b5f61b 100644 --- a/maps/northern_star/polaris-1.dmm +++ b/maps/northern_star/polaris-1.dmm @@ -901,7 +901,7 @@ "arq" = (/obj/structure/closet/secure_closet/security,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "arr" = (/obj/structure/closet/secure_closet/security,/obj/machinery/light,/obj/effect/floor_decal/industrial/outline/yellow,/obj/item/clothing/glasses/hud/security,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "ars" = (/obj/structure/table/standard,/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/item/clothing/accessory/badge/holo,/obj/item/clothing/accessory/badge/holo,/obj/effect/floor_decal/corner/red/full,/obj/item/clothing/accessory/badge/holo,/obj/item/clothing/accessory/badge/holo/cord,/obj/item/clothing/accessory/badge/holo/cord,/turf/simulated/floor/tiled,/area/security/security_lockerroom) -"art" = (/obj/structure/table/standard,/obj/structure/reagent_dispensers/peppertank{pixel_x = 30},/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/storage/box/nifsofts_security,/turf/simulated/floor/tiled,/area/security/security_lockerroom) +"art" = (/obj/structure/table/standard,/obj/structure/reagent_dispensers/peppertank{pixel_x = 30},/obj/machinery/recharger/wallcharger{pixel_x = 4; pixel_y = -28},/obj/effect/floor_decal/corner/red/full{dir = 4},/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/radio,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/device/flashlight,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/obj/item/weapon/crowbar,/turf/simulated/floor/tiled,/area/security/security_lockerroom) "aru" = (/obj/structure/curtain/open/shower/security,/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/window/northleft{name = "Shower"; req_access = list()},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "arv" = (/obj/structure/curtain/open/shower/security,/obj/machinery/shower{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/northright{dir = 1; name = "Shower"; req_access = list()},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) "arw" = (/obj/structure/toilet{dir = 1},/obj/machinery/light/small{brightness_color = "#DA0205"; brightness_power = 1; brightness_range = 5},/turf/simulated/floor/tiled/freezer,/area/security/security_bathroom) @@ -1463,7 +1463,7 @@ "aCg" = (/obj/machinery/door/firedoor/glass,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aCh" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aCi" = (/obj/structure/reagent_dispensers/water_cooler/full,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) -"aCj" = (/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) +"aCj" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station) "aCk" = (/obj/item/weapon/stool/padded,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aCl" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aCm" = (/obj/structure/closet/lasertag/blue,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) @@ -1605,7 +1605,7 @@ "aES" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/holodeck_control) "aET" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/machinery/light{dir = 8},/obj/item/weapon/stool/padded,/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) "aEU" = (/obj/structure/disposalpipe/segment,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/turf/simulated/floor/tiled,/area/crew_quarters/recreation_area_hallway) -"aEV" = (/obj/machinery/vending/nifsoft_shop,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) +"aEV" = (/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aEW" = (/obj/structure/bed/chair/office/dark{dir = 4},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aEX" = (/obj/structure/table/woodentable,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) "aEY" = (/obj/structure/table/woodentable,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/carpet,/area/crew_quarters/recreation_area) @@ -2642,7 +2642,7 @@ "aYP" = (/obj/structure/bed/chair/wood{dir = 4},/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/tiled,/area/hydroponics/garden) "aYQ" = (/obj/structure/table/woodentable,/obj/effect/floor_decal/corner/green{dir = 5},/turf/simulated/floor/tiled,/area/hydroponics/garden) "aYR" = (/obj/structure/bed/chair/wood{dir = 8},/obj/effect/floor_decal/corner/green/full{dir = 1},/turf/simulated/floor/tiled,/area/hydroponics/garden) -"aYS" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station) +"aYS" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station) "aYT" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/hydroponics/garden) "aYU" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/grille,/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/hallway/primary/central_two) "aYV" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/light{dir = 8},/turf/simulated/floor/tiled,/area/hallway/primary/central_two) @@ -2767,7 +2767,7 @@ "bbk" = (/obj/effect/floor_decal/corner/brown{dir = 10},/obj/machinery/status_display{density = 0; layer = 2; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "bbl" = (/obj/effect/floor_decal/corner/yellow{dir = 10},/obj/structure/table/marble,/obj/machinery/alarm{dir = 1; pixel_y = -22},/obj/item/taperoll/engineering,/obj/item/weapon/crowbar,/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) "bbm" = (/obj/effect/floor_decal/corner/yellow{dir = 10},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/effect/decal/cleanable/dirt,/obj/item/stack/material/steel{amount = 8},/turf/simulated/floor/tiled/white,/area/ai_monitored/storage/emergency/eva) -"bbn" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station) +"bbn" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station) "bbo" = (/obj/item/weapon/bedsheet,/obj/structure/bed,/obj/item/weapon/handcuffs,/turf/simulated/floor,/area/mine/unexplored/upper_level) "bbp" = (/obj/machinery/iv_drip,/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "bbq" = (/obj/machinery/door/blast/shutters{density = 0; dir = 4; icon_state = "shutter0"; id = "medbayquar"; name = "Medbay Emergency Lockdown Shutters"; opacity = 0},/turf/simulated/floor,/area/maintenance/medbay_fore) @@ -2810,7 +2810,7 @@ "bcb" = (/obj/structure/closet/crate/medical,/obj/item/weapon/surgical/surgicaldrill,/obj/item/weapon/surgical/FixOVein,/obj/item/weapon/surgical/circular_saw,/obj/item/weapon/surgical/scalpel,/obj/item/stack/medical/advanced/bruise_pack,/obj/item/weapon/surgical/retractor,/obj/item/weapon/surgical/hemostat,/obj/item/weapon/surgical/cautery,/obj/item/weapon/surgical/bonesetter,/obj/item/weapon/surgical/bonegel,/obj/item/stack/nanopaste,/obj/item/weapon/autopsy_scanner,/obj/item/weapon/reagent_containers/spray/cleaner{desc = "Someone has crossed out the Space from Space Cleaner and written in Surgery. 'Do not remove under punishment of death!!!' is scrawled on the back."; name = "Surgery Cleaner"; pixel_x = 2; pixel_y = 2},/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "bcc" = (/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) "bcd" = (/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/structure/sink{dir = 4; icon_state = "sink"; pixel_x = 11; pixel_y = 0},/turf/simulated/floor/tiled/freezer,/area/medical/surgery_storage) -"bce" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 4; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod2/station) +"bce" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station) "bcf" = (/obj/effect/floor_decal/industrial/warning/corner,/turf/simulated/floor,/area/maintenance/medbay_fore) "bcg" = (/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/maintenance/medbay_fore) "bch" = (/obj/machinery/light/small{dir = 1},/obj/effect/floor_decal/industrial/warning,/turf/simulated/floor,/area/maintenance/medbay_fore) @@ -4130,7 +4130,7 @@ "bBv" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled/white,/area/medical/reception) "bBw" = (/obj/effect/floor_decal/corner/paleblue{dir = 4},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/white,/area/medical/reception) "bBx" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/glass/bottle/stoxin{pixel_x = -6; pixel_y = 10},/obj/item/weapon/reagent_containers/glass/bottle/antitoxin{pixel_x = 5; pixel_y = 5},/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline{pixel_x = 1},/obj/random/medical,/obj/effect/floor_decal/corner/paleblue/full,/obj/machinery/light{dir = 8},/obj/item/weapon/storage/firstaid/regular{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/regular,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bBy" = (/obj/structure/table/standard,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/effect/floor_decal/corner/paleblue{dir = 8},/obj/item/weapon/storage/box/nifsofts_medical,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) +"bBy" = (/obj/structure/table/standard,/obj/item/weapon/packageWrap,/obj/item/weapon/hand_labeler,/obj/effect/floor_decal/corner/paleblue{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bBz" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bBA" = (/obj/effect/floor_decal/corner/paleblue{dir = 10},/obj/machinery/vending/medical,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bBB" = (/obj/structure/table/standard,/obj/item/weapon/storage/toolbox/emergency,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/item/bodybag/cryobag,/obj/effect/floor_decal/corner/paleblue{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) @@ -6107,7 +6107,7 @@ "cnw" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cnx" = (/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 4},/turf/simulated/floor/tiled,/area/quartermaster/delivery) "cny" = (/obj/machinery/conveyor{dir = 1; id = "packageSort1"},/turf/simulated/floor/plating,/area/quartermaster/delivery) -"cnz" = (/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/obj/machinery/vending/nifsoft_shop,/turf/simulated/floor/tiled,/area/storage/primary) +"cnz" = (/obj/machinery/ai_status_display{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/primary) "cnA" = (/obj/structure/table/standard,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/random/tech_supply,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/storage/primary) "cnB" = (/obj/machinery/vending/assist,/obj/machinery/status_display{layer = 4; pixel_x = 32; pixel_y = 0},/turf/simulated/floor/tiled,/area/storage/primary) "cnC" = (/turf/simulated/wall,/area/storage/emergency_storage/emergency6) @@ -6325,7 +6325,7 @@ "crG" = (/obj/structure/disposalpipe/segment,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "crH" = (/obj/machinery/door/firedoor/glass,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/hallway/primary/central_three) "crI" = (/obj/structure/closet/crate,/obj/item/stack/material/silver,/obj/item/stack/material/silver,/obj/item/stack/material/silver,/obj/item/stack/material/gold,/obj/item/stack/material/gold,/obj/item/stack/material/gold,/obj/item/weapon/storage/belt/champion,/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) -"crJ" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station) +"crJ" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station) "crK" = (/obj/effect/landmark{name = "xeno_spawn"; pixel_x = -1},/turf/simulated/floor/tiled/dark,/area/security/nuke_storage) "crL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/maintenance/medbay_aft) "crM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor,/area/maintenance/medbay_aft) @@ -6608,7 +6608,7 @@ "cxd" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced,/obj/machinery/door/firedoor/border_only,/turf/simulated/floor/plating,/area/crew_quarters/locker) "cxe" = (/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cxf" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor/tiled,/area/crew_quarters/locker) -"cxg" = (/obj/machinery/light{dir = 1},/obj/machinery/vending/nifsoft_shop,/turf/simulated/floor/tiled,/area/crew_quarters/locker) +"cxg" = (/obj/machinery/light{dir = 1},/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cxh" = (/obj/machinery/lapvend,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cxi" = (/obj/machinery/vending/cigarette,/turf/simulated/floor/tiled,/area/crew_quarters/locker) "cxj" = (/obj/structure/closet/secure_closet/personal,/turf/simulated/floor/wood,/area/crew_quarters/sleep/vistor_room_5) @@ -7481,7 +7481,7 @@ "cNS" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cNT" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) "cNU" = (/obj/machinery/door/firedoor/glass,/obj/machinery/door/airlock/glass_command{name = "E.V.A."; req_one_access = list(18)},/turf/simulated/floor/tiled/dark,/area/ai_monitored/storage/eva) -"cNV" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station) +"cNV" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station) "cNW" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 1},/turf/simulated/floor/tiled,/area/security/checkpoint2) "cNX" = (/obj/effect/floor_decal/corner/red{dir = 6},/obj/structure/table/reinforced,/obj/item/weapon/pen,/turf/simulated/floor/tiled,/area/security/checkpoint2) "cNY" = (/obj/effect/floor_decal/industrial/outline/yellow,/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/docking_hallway) @@ -7518,7 +7518,6 @@ "cOD" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 4},/obj/structure/mirror{pixel_x = -28},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) "cOE" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) "cOF" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/obj/machinery/atmospherics/unary/vent_pump/on{dir = 8},/turf/simulated/floor/tiled/white,/area/crew_quarters/sleep/vistor_room_8) -"cOG" = (/turf/space,/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_r"},/turf/simulated/shuttle/plating/airless/carry,/area/shuttle/large_escape_pod1/station) "cOH" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled,/area/quartermaster/storage) "cOI" = (/obj/structure/table/standard,/obj/item/weapon/hand_labeler,/obj/item/weapon/stamp{pixel_x = -3; pixel_y = 3},/obj/item/weapon/hand_labeler,/turf/simulated/floor/tiled,/area/quartermaster/storage) "cOJ" = (/obj/machinery/status_display/supply_display,/turf/simulated/wall,/area/quartermaster/warehouse) @@ -8883,7 +8882,7 @@ "doQ" = (/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/mechanical{pixel_y = 5},/obj/item/weapon/storage/toolbox/electrical,/obj/structure/window/reinforced{dir = 4},/obj/structure/table/reinforced,/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/turf/simulated/floor/tiled,/area/engineering/workshop) "doR" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/table/reinforced,/obj/item/stack/rods{amount = 50},/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/weapon/cell/high,/obj/item/stack/material/glass/phoronrglass{amount = 20},/obj/item/weapon/pickaxe,/obj/item/weapon/pickaxe,/obj/item/stack/material/wood{amount = 50},/turf/simulated/floor/tiled,/area/engineering/workshop) "doS" = (/obj/structure/table/reinforced,/obj/item/device/floor_painter,/obj/item/device/multitool{pixel_x = 5},/obj/item/device/t_scanner,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/machinery/requests_console{announcementConsole = 0; department = "Engineering"; departmentType = 3; name = "Engineering RC"; pixel_x = 0; pixel_y = -32},/turf/simulated/floor/tiled,/area/engineering/workshop) -"doT" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/box/lights/mixed,/obj/structure/disposalpipe/segment,/obj/item/weapon/storage/box/nifsofts_engineering,/turf/simulated/floor/tiled,/area/engineering/workshop) +"doT" = (/obj/structure/cable/green,/obj/machinery/power/apc{dir = 2; name = "south bump"; pixel_y = -24},/obj/structure/table/reinforced,/obj/item/weapon/crowbar,/obj/item/clothing/gloves/black,/obj/item/weapon/storage/box/lights/mixed,/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/engineering/workshop) "doU" = (/obj/structure/bed/chair/comfy/brown,/obj/structure/noticeboard{pixel_y = 27},/obj/effect/floor_decal/corner/brown/full{dir = 8},/obj/machinery/vending/wallmed1{pixel_x = -32},/turf/simulated/floor/tiled,/area/quartermaster/office) "doV" = (/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green,/obj/effect/floor_decal/industrial/warning{dir = 4},/obj/machinery/power/sensor{name = "Powernet Sensor - Engineering Subgrid"; name_tag = "Engineering Subgrid"},/obj/machinery/alarm{dir = 1; pixel_y = -22},/turf/simulated/floor,/area/maintenance/substation/engineering) "doW" = (/obj/machinery/power/smes/buildable{charge = 0; RCon_tag = "Substation - Engineering"},/obj/structure/cable/green{d2 = 4; icon_state = "0-4"},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor,/area/maintenance/substation/engineering) @@ -10220,10 +10219,10 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafbfharWaxBavIayJazNayKawHaxCaGvaxEaxFaxGaxHaxIaqTaxJaxKaxLaxMaxNaxOaxPaxQaxRaxSaxTaxUaxVaxWaxWaxXaxYaxZayaaybaycaydayeayfaygayhayiayjaykayoaymaynazoaypayqayraysaytauVayuayvalCagnaywahcazAazAahcahcayxayyarMarNarBarxaaiaaiaaiaaiaaiaaiaaiaxuayzayAaxuaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafayBayCayDayEayFaxwaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafayGayIazKazKazKazLazLazLazLazKazLaDLayGaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafarWarWarWazPaBgaBhbbtayLarWarWayMayNayOayPaqTaqTayQawNawNayRawNaySayTayUayVayWayXayYayZazaazbauBazcazdazeaxcazfazgazhaziazjazkazlazmaznaLFazpazqaLGazrazsaztazuazvazwazxazyazzagnagnagnagnayyayyayyayyayyarMarNazBarxaaiaaiaaiaaiaaiaaiaaiaxuazCayAaxuaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafazDazEazFazGazHaxwazIazIazIazIazIazIazIazIazIazJazJazJazJazJazJazJazJazJazJazJazJazJazJaLeaLeazJazJazJazJazJazJaDMaDMaNEayGayGaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafarWarWazMavIawFavIavIawHazQarWazRazSazTazUazVazWazUazXazYayRazZaAaaAbaAcaAdaAeaAfaAgaAhaAiaAjauBaxcaAkaxcaAlaAmaAnaAoaApaAqaAraAsaApaAtaAuaAtaApaAtaAvaAtaAwatxaAxagnaAyaAzaAAagnagnaDlaBQaEDaACaADaAEayyaAFarAarBaAGaAGaAGaAGaAGaaiaaiaaiaxuayzaxuaxuaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaAHaAIaAJaAKaALaxwaAMaANaAOaAPaAQaARaASaATaAMazJaAUaAUaAVaAWaAXaAYaAZaAYaBaaAWaAVaBbazJazJazJazJaOeaPmaQwaQxazJazJazJaSLaBdayGaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafarWarWaBeaBfbrNaBhbbtawHaBiaBjdJjaxRaBlazUazRaBmazUaBnaBoaBpaBqaBraBsaBtaBuauBaBvaBwaBxaByaBzauBaBAaBBaBCaOmaBEaBFaBGaApaBHaBIaBJaApaBKaBLaBMaApaBKaBIaBMaAwaafaafagnaBNaBOaBPahcagnaDmaDmaDmaBRaBSaBTaBUarMarNaBVaAGaBWaBXaBYaAGaAGaaiaaiaxuayzaxuaaiaaiaBZaBZaCaaCbaCbaCbaCcaCbaCbaCbaCbaCdaBZaCeaCfaCgaChaxwaCiaCjaCkaCjaClaCjaCkaCjaCmazJaCnaCoaCnaCnaCnaCnaCnaCnaCnaCnaCnaDIaCpazJaSMaCnaCnaCnaCnaCnaCnaSMazJaSLaCqayGayGayGayGayGaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaalaalaalaalaalaalaalaafarWarWaCravIaCsaCtaCtaCuaCvaCwaCxaCyaCzaCAaCBaCCaCDaCEaCFaCGaCHaCIaCJaCKaCLaCMaCNaCOaCPaCHaCQaCRaCSaCTaCUaCVaCWaCXaCYaApaCZaDaaDbaApaDcaDdaDeaApaDfaDaaDgaAwaafaafagnaDhaDiaDjahcagnaEFcedcedaBRaDnaDoayyaDparNarBaAGaDqaDraDsaDtaAGaAGaaiaxuayzaxuaaiaaiaBZaDuaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaDwaDxaDyaDzaDAaxwaDBaCjaCjaDCaDDaDEaCjaCjaDFazJaCnaDGaDHaDHaDHaDHaDHaDHaDHaDHaDHaNDaCnazJafHaCnbltbmbbBfaFiaCnagoazJaSLaDJaDKbzeaDMaDNayGaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaaqaaqaSvaalaTsbSOaalaafarWarWaDOaDPaDQaDRaDRaDSaDTaDUaDVaDWaDXaDYaDZaEaaEbaEcaEdaEeaEfaEgaEhaEiaEjaEkaElaEkaEmaEnaEoaEpaEqaEraxeaEsaEtaBFaEuaApaEvaEwaExaApaEyaEzaEyaApaEyaEAaEyaAwaafaafagnaEBaECaDjagnayydCacedcedaEEdAAaEGaEHaEIaSgaEKaELaEMaENaEOaEPaEQaAGaaiaxuayzaxuaaiaaiaBZaERaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaESaETaAJaAKaEUaxwaEVaCjaEWaEXaEYaEZaFaaCjaFbazJaFcaFdaFeaFfaFfaFfaFfaFfaFgaFgaFhbEFaGoazJbZyaCnbltbMDbZJaFiaCnbrwazJaBcaFjaDKaDMaFkbBbayGaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaaqaTsaaqaalaaqbSOaalaafarWarWaFmavIaFnaFoaFpawFaFqarWaFraFsaFsaFsaFtaFuaFsaFvaFsaFwaFxaFsaFyaFBaFAaGsaFyaFCaFDaFEaApaFFaFGaApaFHaFIaApaFJaApaApaFKaFLaFMaFNaFOaFPaFQaFRaFSaFLaFTaAwaAwaafagnagnawqaFUakBaFVaFWaFXaDmaDmaFYaFZayyarMarNarBaGaaEMaGbaGcaEMaGdaAGaaiaxuayzaxuaBZaBZaBZaBZaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaESaGeaDyaDzaGfayBaGgaCjaEWaEXaEYaEZaFaaCjaGhaGiaGjaFdaGkaGlaGlaGlaGlaGlaGmaGmaGncanaJWcaNaJWaJWcbOceHchbaFiaCnaCnaSNaSLaGpayGaFkaLeaGqayGaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafarWarWaBeaBfbrNaBhbbtawHaBiaBjdJjaxRaBlazUazRaBmazUaBnaBoaBpaBqaBraBsaBtaBuauBaBvaBwaBxaByaBzauBaBAaBBaBCaOmaBEaBFaBGaApaBHaBIaBJaApaBKaBLaBMaApaBKaBIaBMaAwaafaafagnaBNaBOaBPahcagnaDmaDmaDmaBRaBSaBTaBUarMarNaBVaAGaBWaBXaBYaAGaAGaaiaaiaxuayzaxuaaiaaiaBZaBZaCaaCbaCbaCbaCcaCbaCbaCbaCbaCdaBZaCeaCfaCgaChaxwaCiaEVaCkaEVaClaEVaCkaEVaCmazJaCnaCoaCnaCnaCnaCnaCnaCnaCnaCnaCnaDIaCpazJaSMaCnaCnaCnaCnaCnaCnaSMazJaSLaCqayGayGayGayGayGaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaalaalaalaalaalaalaalaafarWarWaCravIaCsaCtaCtaCuaCvaCwaCxaCyaCzaCAaCBaCCaCDaCEaCFaCGaCHaCIaCJaCKaCLaCMaCNaCOaCPaCHaCQaCRaCSaCTaCUaCVaCWaCXaCYaApaCZaDaaDbaApaDcaDdaDeaApaDfaDaaDgaAwaafaafagnaDhaDiaDjahcagnaEFcedcedaBRaDnaDoayyaDparNarBaAGaDqaDraDsaDtaAGaAGaaiaxuayzaxuaaiaaiaBZaDuaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaDwaDxaDyaDzaDAaxwaDBaEVaEVaDCaDDaDEaEVaEVaDFazJaCnaDGaDHaDHaDHaDHaDHaDHaDHaDHaDHaNDaCnazJafHaCnbltbmbbBfaFiaCnagoazJaSLaDJaDKbzeaDMaDNayGaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaaqaaqaSvaalaTsbSOaalaafarWarWaDOaDPaDQaDRaDRaDSaDTaDUaDVaDWaDXaDYaDZaEaaEbaEcaEdaEeaEfaEgaEhaEiaEjaEkaElaEkaEmaEnaEoaEpaEqaEraxeaEsaEtaBFaEuaApaEvaEwaExaApaEyaEzaEyaApaEyaEAaEyaAwaafaafagnaEBaECaDjagnayydCacedcedaEEdAAaEGaEHaEIaSgaEKaELaEMaENaEOaEPaEQaAGaaiaxuayzaxuaaiaaiaBZaERaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaESaETaAJaAKaEUaxwaEVaEVaEWaEXaEYaEZaFaaEVaFbazJaFcaFdaFeaFfaFfaFfaFfaFfaFgaFgaFhbEFaGoazJbZyaCnbltbMDbZJaFiaCnbrwazJaBcaFjaDKaDMaFkbBbayGaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaaqaTsaaqaalaaqbSOaalaafarWarWaFmavIaFnaFoaFpawFaFqarWaFraFsaFsaFsaFtaFuaFsaFvaFsaFwaFxaFsaFyaFBaFAaGsaFyaFCaFDaFEaApaFFaFGaApaFHaFIaApaFJaApaApaFKaFLaFMaFNaFOaFPaFQaFRaFSaFLaFTaAwaAwaafagnagnawqaFUakBaFVaFWaFXaDmaDmaFYaFZayyarMarNarBaGaaEMaGbaGcaEMaGdaAGaaiaxuayzaxuaBZaBZaBZaBZaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaESaGeaDyaDzaGfayBaGgaEVaEWaEXaEYaEZaFaaEVaGhaGiaGjaFdaGkaGlaGlaGlaGlaGlaGmaGmaGncanaJWcaNaJWaJWcbOceHchbaFiaCnaCnaSNaSLaGpayGaFkaLeaGqayGaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaalblsaalaalaaqaalaalaafbIeaGraGraGrbtRaGtaGuaIPaGraGraFraGwaGwaGxaGwaGyaGzaGAaGBaGCaGDaGEaFyaGFaGGaGHaGIaGJaGKaGLaApaGMaGNaApaGOaGPaGQaGRaGSaGTaGUaGVaGWaGXaGYaGZaGUaHaaHaaHaaHaaHbaAwaafaafagnaHcaDjahcaHdaHeaHfaHgaHhaHiaHjayyaHkarNarBaAGaHlaHmaEMaEMaHnaAGaaiaxuaHoaHpaBZaHqaHraHsaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaHtaHuaDyaShaGfaAHaHvaHwaHwaHxaHyaHzaHwaHwaHAaHBaHCaFdaGkaGlaGlaGlaGlaGlaGmaGmaGnaFdaFiazJbzfaCnaCnaCnaCnaCnaCnbBaazJaBcayGayGayGayGayGayGaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaalaalaalaalaalaaqaaqbnhaaqcuWaalaafaafaGraGraHDaHEaXBaHGaHHaHIaGraFraHJaGwaGwaGwaHKaHLaHMaHNaHOaHPaHQaHRaHSaGGaGGaHTaHUaHVaHWaApaHXaHYaApaHZaIaaIbaIcaIdaIeaHaaIfaIgaIhaIiaHaaHaaIhaHaaHaaHaaHbaAwaafaafagnaIjaDjagnayyayyayyayyayyayyayyayyaIkaIlaImaInaIoaIpaIqaEMaIraAGaaiaxuaIsaItaBZaIuaIvaIwaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaIxaHuaIyazGaIzaIAaIBaIBaIBaICaIDaIEaIBaSiaIBaIFaIGaFdaGkaGlaGlaIHaIIaIJaGmaGmaGnaFdaIKazJbBgaCnbBgaCnceGbBgaCnbBgazJaBcayGaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaalbSOaSvbSOaalaTsaaqaaqaaqdBIaalaafaafaGraGraILaIMaINaIOaHHaKgaGraFraIQaIRaISaISaISaITaIUaIVaIWaIXaIYaIZaJaaJbaJcaJdaJeaJfaJgaApaJhaJiaApaJjaJkaApaJlaJmaApaHaaJnaJoaJpaJqaJraJsaJtaJsaHaaJuaAwaAwaafaafagnaJvaJwagnaafaJxaJyaJzaJAaJBaJCaJDarMarNarHaAGaJEaJFaEMaEMaJGaAGaaiaxuaJHaJIaJJaJKaJLaJMaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaIxaHuaJNaJOaJPaJQaJRaJRaJRaJSaJRaJTaJRaJUaJRaJVaJWaJXaGkaGlaGlaJYaJZaKaaGmaGmaGnaFdaKbazJazJazJazJazJazJazJazJazJazJaKcayGaafaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -10231,11 +10230,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaalaalaalaalaalaalaalaalaalaalaalaafaafaGraGraGraLfaLgaLhaLiaGraGraFraGwaLjaGwaGwaGwaLkaLlaLmaLnaLoaLpaFyaNLaLqaLraLraLraLsaLtaLuaLvaLwaLxaLyaLzaLAaLzaLBaLCaLzaLDaLEaLHaLIaMwaMxaApaLJaLKaLLaApaafaafaalaalagnaDjagnaafaJxaLMaKJaLNaLOaLPaLQaLRaSqaLTaGaaEMaLUaEOaEPaLVaAGaaiaxuaKPaxuaBZaBZaBZaBZaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaESaGeaHuaDzaLWaLXaLYaLZaLZaMaaLZaLZaMbaMcaMdaHBaMeaFdaGkaGlaGlaGmaGmaGmaGmaGmaGnaFdaGoazJdJrbEEbEEbEEbEEbEEbEEbSRaSNaKcayGayGaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaGraGraGraGraGraGraGraGraFraFraLjaGwaMfaMgaMhaHMaMiaMjaMkaMlaFyaMmaMnaMoaGGaMoaMpaMqaAwaAwaAwaAwaMraGUaMsaMtaMtaIiaHaaMuaMvaLzaLBaMyaNhaApaMzaLKaNgaApaafaafaalbboagnaDjagnaafaJxaJxaMAaKJaMBaMCaJDarHarNaMDaAGaEMaEMaDsaMEaAGaAGaaiaxuaKPaxuaafaafaBZaMFaDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaESaMGaMHayEaMIaxwaLZaLZaMJaMKaMLaLZaLZaMMaLZaLZaMNaFdaMOaMPaMPaMQaMQaMQaMQaMQaMRaFdaFiazJdLobEEdJrbKibKkdJrbEEdLrazJaBcaMSayGaafaafaafaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaaiaMTaMTaMTaMTaMTaMTaMTaMTaMTaMTaMTaMTaafaafaafaafaafaGraGraGraGraGraGraafaafaMUaMVaMUaMUaFraFraFraFraFraFraFraMWaMWaMWaMXaFEaMYaMWaMWaMWaafaafaAwaAwaMZaNaaNbaNcaNdaNeaNfaLEaNiaNjaNkbbsaAwaApaApaNPaApaafaafaalagnagnaDjagnaafaafaJxaJxaNlaNmaNnaKMarHarNaNoaAGaNpaNqaBYaAGaAGaaiaaiaxuaKPaxuaafaafaBZaNraDvaDvaDvaDvaDvaDvaDvaDvaDvaDvaHtaNsaHuaDzaNtaxwaNuaNvaNwaNxaNyaLZaNzaNxaNAaLZaMNaNBaNCaNCaNCaNCaNCaNCaNCaNCaNCdJoaJWdJpdJqdJqdJqdJqdJqdJqdJqdLtazJaBcaFlayGayGayGayGayGayGayGaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNFaNFaNFaNFaNFaNFaNFaNFaNFaNFaYSaMTaafaafaafaafaafaafaafaafaafaafaafaafaafaMUaNHaNIaNJaaiaaiaaiaaiaaiaaiaaiaaiaaiaNKaVxaVxaVxaNKaaiaaiaafaafaafaAwaAwaNMaNNaNNaNOaAwaAwaAwaAwaAwaAwaAwaAwaafaApdzOaApaafaafaafagnaNQaNRagnaafaafaaiaJxaJxaJxaJxaJxaNSaNTarHaAGaAGaAGaAGaAGaaiaaiaaiaxuaKPaxuaxuaafaBZaBZaCaaCbaCbaCbaNUaCbaCbaCbaCbaCdaBZaCeaNVaCgaChaxwaLZaLZaNWaNXaNYaNZaOaaObaOcaNZaMNaOdaCnaCnaCnaCnaCnaCnaCnaCnaCndJtdLwazJbDjcDpcDpdJcbEEcDpcDpdJuazJaBcaGpayGaLeaDMayGaLeaSCayGaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNFaNFaOfaOgaOkaOhaOiaOjaOfaONaOlbbnaMTaafaafaafaafaafaafaafaafaafaOnaOnaOnaOnaOnaOoaOpaNJaaiaaiaaiaaiaaiaaiaaiaaiaaiaOqaOraOsaOtaOqaaiaaiaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaApaApaApaafaafaafagnaOuaOvagnaafaafaaiaaiaaiaaiaaiaOwarHarNarHaOwaaiaaiaaiaaiaaiaaiaaiaxuaOxaOyaxuaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiayBaAIaOzaAKaALaxwaOAaOBaOCaODaOEaLZaNzaOFaNAaLZaOGaCnaAVaOHaPMaAYaOJaAYaOKaOHaAVaOLazJazJazJazJazJbDjbDjazJazJazJazJaKcayGayGaLeaLeayGaLeaDMayGaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaOMaPnaOOaOOaOOaOOaOOaOOaOOaOPaOlbbnaMTaafaafaafaafaafaafaafaafaafaOnaOQaORaOSaOTaOUaOVaNJaaiaaiaaiaOWaOXaOYaOZaOWaaiaPaaPbaPcaPbaPaaaiaaiaafaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafaafaafaafagnaDjaPdagnaafaafaaiaaiaaiaaiaaiaPearHarNarHaPeaaiaPfaPgaPhaPiaPfaaiaxuaKPaPjaxuaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiazDaPkaHuaDzaGfaxwaLZaLZaLZaLZaLZaLZaLZaLZaLZaLZazJazJazJazJazJazJazJazJazJazJazJazJazJaPlazJdLxazJazJazJazJaRXazJaLeaKcayGaDMaDMaLeayGaLeayGayGaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNFaNFaPqaPraPraOOaPoaPpaPqbkyaOlbbnaMTaafaafaafaafaafaafaafaafaafaOnaPsaPtaPuaPvaPwaPxaNJaaiaaiaOWaOWaPyaPzaPyaOWaOWaOWaPAaPBaPAaOWaOWaaiaaiaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaOWaOWaOWaOWaOWaafaafaafaafaOWagnaPCagnaOWaafaafaafaaiaaiaaiarxarxaPDaPEaPDarxaPfaPfaPFaPGaPHaPfaPfaxuaPIaxuaxuaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaAHayCaMHayEaEUaxwaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafayGaPJazJdIvdIvcIAcIAcIAcIAazJaLeaPKayGaDMaXAaLeayGaLeayGaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNFaNFaNFaNFaPLaPLaNFaNFaNFaNFbceaMTaafaafaafaafaafaalaalaalaalaOnaPNaPOaPPaOnaNJaPQaNJaPRaPSaOWaPTaPbaPbaPbaPUaOWaPVaPbaPWaPbaYHaOWaPYaPZaOWaOWaOWaOWaOXaOYaOYaOYaOYaOYaOYaOYaOZaOWaQaaQbaQcaOWaOWaOWaOWaOWaOWaQdaQeaQfaOWaOWaOWaOWaOWaQgaQhaOWaQiaPbaPcaPbaQjaPfaQkaQlaQlaQmaQnaPfaQoaQpaQqaxwaxwaxwaxwaxwaxwaQraQsaQsaQsaQsaQsaQsaQtaxwaCeaQuaxyaxzaxwaxwaQvaQvaQvaQvaQvaQvayGayGayGayGayGayGaafaafaafaafaafaafaafaalayGayGaSLazJcIAdIvdIvdIvdIvdIvazJaLedIxayGaLeaLeaGpayGaLeayGaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNFaNFaNFaNFaNFaNFaNFaNFaNFaNFaCjaMTaafaafaafaafaafaafaafaafaafaafaafaafaafaMUaNHaNIaNJaaiaaiaaiaaiaaiaaiaaiaaiaaiaNKaVxaVxaVxaNKaaiaaiaafaafaafaAwaAwaNMaNNaNNaNOaAwaAwaAwaAwaAwaAwaAwaAwaafaApdzOaApaafaafaafagnaNQaNRagnaafaafaaiaJxaJxaJxaJxaJxaNSaNTarHaAGaAGaAGaAGaAGaaiaaiaaiaxuaKPaxuaxuaafaBZaBZaCaaCbaCbaCbaNUaCbaCbaCbaCbaCdaBZaCeaNVaCgaChaxwaLZaLZaNWaNXaNYaNZaOaaObaOcaNZaMNaOdaCnaCnaCnaCnaCnaCnaCnaCnaCndJtdLwazJbDjcDpcDpdJcbEEcDpcDpdJuazJaBcaGpayGaLeaDMayGaLeaSCayGaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNFaNFaOfaOgaOkaOhaOiaOjaOfaONaOlaYSaMTaafaafaafaafaafaafaafaafaafaOnaOnaOnaOnaOnaOoaOpaNJaaiaaiaaiaaiaaiaaiaaiaaiaaiaOqaOraOsaOtaOqaaiaaiaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaApaApaApaafaafaafagnaOuaOvagnaafaafaaiaaiaaiaaiaaiaOwarHarNarHaOwaaiaaiaaiaaiaaiaaiaaiaxuaOxaOyaxuaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiayBaAIaOzaAKaALaxwaOAaOBaOCaODaOEaLZaNzaOFaNAaLZaOGaCnaAVaOHaPMaAYaOJaAYaOKaOHaAVaOLazJazJazJazJazJbDjbDjazJazJazJazJaKcayGayGaLeaLeayGaLeaDMayGaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaOMaPnaOOaOOaOOaOOaOOaOOaOOaOPaOlaYSaMTaafaafaafaafaafaafaafaafaafaOnaOQaORaOSaOTaOUaOVaNJaaiaaiaaiaOWaOXaOYaOZaOWaaiaPaaPbaPcaPbaPaaaiaaiaafaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaafaafaafaafaafaafaafaafagnaDjaPdagnaafaafaaiaaiaaiaaiaaiaPearHarNarHaPeaaiaPfaPgaPhaPiaPfaaiaxuaKPaPjaxuaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiazDaPkaHuaDzaGfaxwaLZaLZaLZaLZaLZaLZaLZaLZaLZaLZazJazJazJazJazJazJazJazJazJazJazJazJazJaPlazJdLxazJazJazJazJaRXazJaLeaKcayGaDMaDMaLeayGaLeayGayGaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNFaNFaPqaPraPraOOaPoaPpaPqbkyaOlaYSaMTaafaafaafaafaafaafaafaafaafaOnaPsaPtaPuaPvaPwaPxaNJaaiaaiaOWaOWaPyaPzaPyaOWaOWaOWaPAaPBaPAaOWaOWaaiaaiaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaOWaOWaOWaOWaOWaafaafaafaafaOWagnaPCagnaOWaafaafaafaaiaaiaaiarxarxaPDaPEaPDarxaPfaPfaPFaPGaPHaPfaPfaxuaPIaxuaxuaafaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaAHayCaMHayEaEUaxwaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafayGaPJazJdIvdIvcIAcIAcIAcIAazJaLeaPKayGaDMaXAaLeayGaLeayGaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaNFaNFaNFaNFaPLaPLaNFaNFaNFaNFbbnaMTaafaafaafaafaafaalaalaalaalaOnaPNaPOaPPaOnaNJaPQaNJaPRaPSaOWaPTaPbaPbaPbaPUaOWaPVaPbaPWaPbaYHaOWaPYaPZaOWaOWaOWaOWaOXaOYaOYaOYaOYaOYaOYaOYaOZaOWaQaaQbaQcaOWaOWaOWaOWaOWaOWaQdaQeaQfaOWaOWaOWaOWaOWaQgaQhaOWaQiaPbaPcaPbaQjaPfaQkaQlaQlaQmaQnaPfaQoaQpaQqaxwaxwaxwaxwaxwaxwaQraQsaQsaQsaQsaQsaQsaQtaxwaCeaQuaxyaxzaxwaxwaQvaQvaQvaQvaQvaQvayGayGayGayGayGayGaafaafaafaafaafaafaafaalayGayGaSLazJcIAdIvdIvdIvdIvdIvazJaLedIxayGaLeaLeaGpayGaLeayGaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaMTaMTaMTaMTaQyaQyaMTaMTaMTaMTaMTaMTaQzaQzaQzaQzaQzaQzaQAaQBaQCaOnaOTaQDaOnaOnaQEaQFaQGaQHaQHaQIaPbaQJaQKaQLaQLaQMaQNaQLaQOaQLaQLaQMaQLaQLaQLaQPaQQaQLaQRaQLaQLaQLaQLaQKaQLaQLaQLaQMaQLaQSaQKaQMaQLaQLaQTaQUaQVaQLaQWaPbaPAaPbaQXaPbaQYaPbaPbaQZaPbaPbaPcaPbaPbaRaaRbaQlaQlaRcaRdaReaRfaRgaRfaRhaRiaRjaRkaRlaRmaRfaRfaRfaRnaRfaRfaRoaRpaRqaRfaRfaRraRsaHuaQqaRtaRuaRvaRwaRxaRxayGaGpaRyaCqaBdayGayGayGayGayGayGayGayGayGaRzaLeaSLazJazJazJazJazJazJazJazJaLedIxayGayGayGayGayGaLeayGaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaMTaRAaRBaRCaRDaREaRFaRGaRHaRIaRJaRKbgBaRLaRMaRNaRMaROaRPaRQaRMaRRaRMaRLaRSaRTaRSaROaRMaRUaRVaRWdJwaRVaRVaRYaRZaSaaSbaSaaScaRYaSaaSaaSaaSdaSebgWaSaaSfaSabuuaScaRZaSaaSaaSaaRYaSabuIaRZaRYaSaaSaaSdaSaaSjaSeaSkaSaaRYaSaaSfaSaaRZaSaaSaaSlaSaaScbHOaPbaPbaSnaSoaSpbIvaSraSsaStaSubWoaSuaSwaSuaSuaSuaSuaSxaSyaSubXNaSuaSuaSuaSzaSAaSAaSAaSBcdkaSuaSuaSDaSEaSFaSFaSGaSHaSIaSJaSKdIydIzdIzdIzdIzdIzdIAdIzdIzdIzdIzaSKaSKaSKdIBazLazLazLazLazKazKazKazKazKdICayGaDKaDMaLeaLeaLeayGaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaauqauqauqauqauqaaaauqauqauqauqauqaaaauqauqauqauqauqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaafaMTaSOaSPaSQaSRaSSaSTaSUaSVaSWaSXaSYcgaaSZaTaaTbaTcaTdaTeaTfaTgaThaTiaTjaTkaTlaTmaTnaToaTpaTqaTrcivaTtaTuaTvaTuaTuaTuaTuaTwaTvaTuaTuaTxaTuaTyaTuaTuaTzaTuaTuaTAaTBaTCaTuaTDaTvaTEaTFaTGaTHaTGaTGaTGaTIaTJaTKaTLaTMaTNaTOaTPaTuaZeaTBaTRaTSaPbaTTaPbaPbaPbaRaaQlaTUaTVaTWaTXaTYaTZaUaaHuaHuaUbaHuaHuaUcaNVaUdaHuaHuaHuaUeaHuaUfaUgaUcaUhaUiaHuaHuaHuaQqaRtaUjaUkaUlaUmaUnayGayGayGayGayGayGayGayGaBcaLeayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGayGaafaafaafaafaafaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -10283,11 +10282,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafaaicbtcbucbvcbwcbtaaiaaiaafaafaafaafaafbZYbZZbZYaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbSecbxcbycbzcbAbSecbBcbCcbDcbEcbFcbGcbHcbIcbJcbKcbLcbMcbNbVVbYQbYRbYQdJydJzbYQbYRbYQcbPcbQbVVcbRcbSbbMbbKcbTbjzbbMaaibUmcbUdLqcbVcbWcbXcbYbUmcbZccaccbcbZbMXcccccdcceccfccgcchccibMXaafaVAbJHcaIbRjccjcaMcclbYhbYibSQbUFcaJbUHdMdbSQbSQccmccnbYjccoccpccqbSQbZxaQlaQlccraQlbSXbSYbpZaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiccscctccucaZaawccvccwccxbZNaawaafbZDccycczccAbZHccBccCbZIccDccEccFbZMdJMdJNdJOdJPdJOdJQbZNbZObZNbZNbZNbZNaafaafaafaafcbpccGccHccIccJccKccLaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaaiaaibXhccMccNccObXhaaiaaiaafaafaafbZYbZYbZYbZZbZYaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbSebSeccPccQbSebSebSlbSlbSlbSlbSlccRbSlbSlbSlccSccTccUbSlbVVbXDbXDbXDdJAbXGbXDbXDbXDcbPccVccWccXbbJbbJbbJaZHaWebbMaaibUmbUmbUmbUmbUmbUmbUmbUmdHFccZcdaceUbMXbMXcdcbMXbMXbMXcddcdebMXcdfaVAcdgaVAbRjcaKcckcdjcdjbYibSQbSQbWvbSQbSQbSQbSQbSQbUFcdmcdncficcqcdobRjaPfaPfaPfbGJbjMbGJbuJaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiccscdpcdqcaZaawccwccwcdrbZNaawaafbZDbZDbZDbZDbZDcdscdtbZMbZMbZMbZMbZMdJRdJOdJScgScgSdJTbZNbZObZNaafaafaafaafaafaafaafcbpcducdvcdwcdxcdycdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaaiaaibYzcdAccNcdBbYzaaiaaiaafaafaafbZYcdCcdDcdEbZYbZYbZYbZYaafaafaafaafaafaafaafaafaafaafaafaafaafbSebSebSebSeaafaafaafaafbZYcdFcdGbZYaaiaaiaaiaaiaaiaaibVVcdHcdIdJBdJCbXGbXGcdJbXGcdKcdLccWccXcdMcdNbbJaZHaWecbZcbZcbZcbZcdOcdPcdQcdRcdScdTcdUcdVcdWcdXcdYcdZceacebceccbZcbZcbZcbZcbZdLsceecefbRjbRjcegbYibYibZvbSQbZwbWvbSQcehcehbSQcfjcfjceiceiceicejceiceicflcgUaPfcekbcacelaPfcaZaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicemcenceocaZaawcepceqcerbZNaawaafaafaafaafaafbZNcescetbZNdJVdJUcgSdJYcgSdJWcgScgSdJXdKebZNbZObZNaafaafcbpcbpcbpcbpcbpcbpceuceucbpcbpcbpcbpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafbZVbVCbVAbZVcevccNcewbZVbVCbVAbZVbZVbZYbZYcexceycezceAceBceCbZYaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbZYceDceEceFceFceFceFceFaaiaaibVVbVWbVWdJDbVWbVWbVVbVVbVVbVVbVVbVVcbRcbSbbMceJbihaWecgcceLceMcbZceNceOcePceOceNceNceNccZcdaceNceNceNceaceQceRceScbZceTceLcgsceVceWceXceYceZcfabSKcfbcfccfccfdbWvbUFcfecffbUHcfjcfmceicfhcgBcgEcgFchYcibcgUaPfcfnbbbaQlcfocaZcfpcfqcfqcfqcfqcfqcfqcfqcfqcfrcaZcfscftcaZbZNcfubZNbZNaalaawaafaafaafbZNbZNbZNcfvcfwbZNdJZdKacgSdKbcgSdKfdKcdJWdKdbZNbZNbZObZNaafaafcbpcrJcfycfycfycfycfzcfzcfAcfycfycfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafbZVcuycfCcfBcfDcfEcfFcfGcfHcfIcfJcfKcfLcfMcfNcfOcfPcfQcfRcfSbZYaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbZYcfTcfUcfVcfWcfXcfYceFaaiaaibVVdJkdJFdJAdJldJnbVVaaiaaiaaiaaiaaiaaiaaiaYrcfZcuZcgbchNcgdcgecgfcggcghcgicgjcgjcgjcgjcgkcglcgjcgjcgjcgmcgncghcgocgpcgqcgrcotcgtcguceVcgvcgwcgxbSQcgybSQbSQcehbWvbUFcgzcgAdKgcfjdKZceicgCceicgDceicgDceidJiaPfcgGbcacgHaRdcgIcgJcgJcgJcgKcgJcgJcgJcgJcgJcgJdMfcgLcgMcgNbZNcepccwcgObZNbZNbZNbZNbZNbZNcgPcgQcgRcgSbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNcgTbZObZNaafaafcbpcNVcgVcgWcgXcgYcgZchachcchdcitcfycfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafbZVchechfchgccNchhccNccNchiccNchjbZVchkchlchkchmchnchochpbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYchqchrceFchschtchuceFaaiaaibVVdJkbXGdJAbXGdJnbVVaaiaaiaaiaaiaaiaaiaaiaWdchvchwchxcxKchzchAcbZchBchCchDchEchFchGchCchCchHchCchIchJchKchLchCchMcbZchAchzcxLchOchPchQdLOchRchSchTchUchVchTchWcgxbSQchXchXdKlcfjdKmceichZceiciaceidKnceiceiaPfciccidaYXaYYciecifcifcifcigcifcihciicifcifcifcifcijcikcilcimcinciocincincincincincincincincincipciqciqciqciqciqciqciqciqciqciqciqciqciqcirbZNaafaafcbpcNVcgVcischachachachachachachacjOciuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafbZVckGciwcixciycizciAciBccNciCciDbZVciEciFciGciFciHciIciJciKciKciKciKciKciKciKciLciMciKciKciKciKciKciKciKciKciKciKciKciNciOciKciKciPciQciRciSciTciUceFaaiaaibVVdJkdJHdJIdJzdJnbVVaaiaaiaaiaaiaaiaaiaaiaXdciVaZHbbJcbZcbZcbZcbZciWciXciYciZcjacjbcjccjdcjecjfcjgcjhcjicjjcjkcjlcbZcbZcbZcbZcjmcjncjocjpbRjbRjcjqcjrcjrcjscjtbRjcjqcjrcjrcjrdKoceiceiceiceiceiceiceiceiaaibIucjucjvcjwcjvcjxcjycjycjzcjycjycjAcjBcjycjycjycjzcjCcjDcjEbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNcjFcjGcjHcjIbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNaafaafcbpcNVcgVcjJcjKcDHcjMcjNcjPcjQcBTcfycfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafcjRcjRbZVbZVcjScjTcjUchhcjVcjWcjWcjXbZVbZVcjYciFcjZciFckackbckcckdbZYbZYbZYckeckfckgckhckgckickjbZYbZYbZYbZYbZYbZYbZYbZYbZYckkcklckgckgckmcknckoceFceFceFceFaaiaaidJmdJmdJmdJmdJmdJmdJmaaiaaiaaiaaiaaiaaiaaiaWZciVaZHbbJckqaaiaaicbZcbZcbZckrckscktdlOcktcktckvcktdlOcktcksckwcbZcbZcbZaaiaaickxckyckzckAcjpaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaibuJaQlaQlckBckCcaZcfpcfqcfqcfqckDckEckFcfqcfqcfrcaZcaZcaZcaZbZNaafaafaafaafaafaafaafaafbZNbZNbZNcjHbZNbZNdHVdHWccwccwccwcgRdHXdLubZNbZNaafaafaafaafaafcbpcOGcfycfycfycfycfycfycfAcfycfycfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafbZVbVCbVAbZVcevccNcewbZVbVCbVAbZVbZVbZYbZYcexceycezceAceBceCbZYaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbZYceDceEceFceFceFceFceFaaiaaibVVbVWbVWdJDbVWbVWbVVbVVbVVbVVbVVbVVcbRcbSbbMceJbihaWecgcceLceMcbZceNceOcePceOceNceNceNccZcdaceNceNceNceaceQceRceScbZceTceLcgsceVceWceXceYceZcfabSKcfbcfccfccfdbWvbUFcfecffbUHcfjcfmceicfhcgBcgEcgFchYcibcgUaPfcfnbbbaQlcfocaZcfpcfqcfqcfqcfqcfqcfqcfqcfqcfrcaZcfscftcaZbZNcfubZNbZNaalaawaafaafaafbZNbZNbZNcfvcfwbZNdJZdKacgSdKbcgSdKfdKcdJWdKdbZNbZNbZObZNaafaafcbpbcecfycfycfycfycfzcfzcfAcfycfycfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafbZVcuycfCcfBcfDcfEcfFcfGcfHcfIcfJcfKcfLcfMcfNcfOcfPcfQcfRcfSbZYaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbZYcfTcfUcfVcfWcfXcfYceFaaiaaibVVdJkdJFdJAdJldJnbVVaaiaaiaaiaaiaaiaaiaaiaYrcfZcuZcgbchNcgdcgecgfcggcghcgicgjcgjcgjcgjcgkcglcgjcgjcgjcgmcgncghcgocgpcgqcgrcotcgtcguceVcgvcgwcgxbSQcgybSQbSQcehbWvbUFcgzcgAdKgcfjdKZceicgCceicgDceicgDceidJiaPfcgGbcacgHaRdcgIcgJcgJcgJcgKcgJcgJcgJcgJcgJcgJdMfcgLcgMcgNbZNcepccwcgObZNbZNbZNbZNbZNbZNcgPcgQcgRcgSbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNcgTbZObZNaafaafcbpcrJcgVcgWcgXcgYcgZchachcchdcitcfycfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafbZVchechfchgccNchhccNccNchiccNchjbZVchkchlchkchmchnchochpbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYbZYchqchrceFchschtchuceFaaiaaibVVdJkbXGdJAbXGdJnbVVaaiaaiaaiaaiaaiaaiaaiaWdchvchwchxcxKchzchAcbZchBchCchDchEchFchGchCchCchHchCchIchJchKchLchCchMcbZchAchzcxLchOchPchQdLOchRchSchTchUchVchTchWcgxbSQchXchXdKlcfjdKmceichZceiciaceidKnceiceiaPfciccidaYXaYYciecifcifcifcigcifcihciicifcifcifcifcijcikcilcimcinciocincincincincincincincincincipciqciqciqciqciqciqciqciqciqciqciqciqciqcirbZNaafaafcbpcrJcgVcischachachachachachachacjOciuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafaafaafbZVckGciwcixciycizciAciBccNciCciDbZVciEciFciGciFciHciIciJciKciKciKciKciKciKciKciLciMciKciKciKciKciKciKciKciKciKciKciKciNciOciKciKciPciQciRciSciTciUceFaaiaaibVVdJkdJHdJIdJzdJnbVVaaiaaiaaiaaiaaiaaiaaiaXdciVaZHbbJcbZcbZcbZcbZciWciXciYciZcjacjbcjccjdcjecjfcjgcjhcjicjjcjkcjlcbZcbZcbZcbZcjmcjncjocjpbRjbRjcjqcjrcjrcjscjtbRjcjqcjrcjrcjrdKoceiceiceiceiceiceiceiceiaaibIucjucjvcjwcjvcjxcjycjycjzcjycjycjAcjBcjycjycjycjzcjCcjDcjEbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNcjFcjGcjHcjIbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNbZNaafaafcbpcrJcgVcjJcjKcDHcjMcjNcjPcjQcBTcfycfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafcjRcjRbZVbZVcjScjTcjUchhcjVcjWcjWcjXbZVbZVcjYciFcjZciFckackbckcckdbZYbZYbZYckeckfckgckhckgckickjbZYbZYbZYbZYbZYbZYbZYbZYbZYckkcklckgckgckmcknckoceFceFceFceFaaiaaidJmdJmdJmdJmdJmdJmdJmaaiaaiaaiaaiaaiaaiaaiaWZciVaZHbbJckqaaiaaicbZcbZcbZckrckscktdlOcktcktckvcktdlOcktcksckwcbZcbZcbZaaiaaickxckyckzckAcjpaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaibuJaQlaQlckBckCcaZcfpcfqcfqcfqckDckEckFcfqcfqcfrcaZcaZcaZcaZbZNaafaafaafaafaafaafaafaafbZNbZNbZNcjHbZNbZNdHVdHWccwccwccwcgRdHXdLubZNbZNaafaafaafaafaafcbpcNVcfycfycfycfycfycfycfAcfycfycfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaafcjRcjRckHckIcjRbVCckJbVAckKbVCckJbVAbZVciFckLckMciFckNciFckOckPckQckbaafaafckRckRckRckRckSckRckRckRckRaafaafaafaafaafaafaafbZYbZYcklckTbZYckUckVbZYaafaaiaaiaaiaaickpckpckWckXckYckZdMcckpckpaaiaaiaaiaaiaaiaYraYrclbbjAbbKaYraYraaiaaiaaiclcaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiclcaaiaaiaaicjpcjpcldcjnclecjpcjpaafaafaafaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaicjpcjpclfclgclhcjpcjpaaiaaiaaiaaiclickEcliaaiaaiaaiaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbZNcjHbZNdIacgRccwccwccwccwcgRcgRcgRdIbbZNaafaafaafaafaafcbpcbpcbpcbpcbpcbpcbpcbpcbpcbpcbpcbpaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafcjRcjRcljclkcllclmclncloclpclqclrclscltcluclvclwclxciFclyciFclzclAclBckbaafaafckRclCclDclEclFclGclHclCckRaafaafaafaafaafaafaafaafbZYcklbZYbZYbZYbZYbZYaaiaaiclIclJclJclKclLclMclMclMclMclMdMrckpaaiaaiaaiaaiaYraYrclNciVaZHbbJbCSaYrclOclPclQcjpclOclPclPclPclPclPclPclPclPclPclPclQcjpclOclPclQcjpclRclSclTcleclUcjpcjpcjpcjpcjpclOclPclPclPclPclPclPclPclPclPclPclVcjpclOclPclVcjpclWclecleclXclYcjpcjpaaiclZclZclZcmaclZclZclZaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbZNcjHbZNdIccgRcgRcgRcgRcgRccwccwcgRdIdbZNaafaafaafaafaafaafaafaafaafaafaafaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafcjRdoUclkcllcmccmdcmecmfcmgcmhciCcmicmjcmkcmkcmlcmmcmndIHciFcmocmpcmqckbaafaafckRcmrcmscmscmtcmucmvcmwckRaafaafaafaafaafaafaafaafbZYcklbZYaafaafaafaafaaiaaicmxcmycmzcmAcmBcmCcmDcmEcmFcmGcmHckpaaiaaiaaiaaiaWdbfnbbJcmIcmJcmKcmKcmLcmMcmMcmMcmNcmMcmMcmMcmOcmPclecleclecmQcmRcmScmTcmUcmTcmTcmTcmVcmWcmXcmYcmTcmTcmVcmTcmZcmTcnacmTcmTcnbcmTcmTcmTcmTcmTcnccmTcndcmTcnecmTcnbcmTcmVcmTcnfcnfcngcnhcnicnjaaiclZdMocnlcnmcnncnoclZaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafaafbZNcjHbZNdIecgRcgRccwccwccwcgRdIfccwdIgbZNaafaafaafaafaafaafaafaafaafaafaafaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/maps/northern_star/polaris-2.dmm b/maps/northern_star/polaris-2.dmm index dbd144ff15..a74931ea89 100644 --- a/maps/northern_star/polaris-2.dmm +++ b/maps/northern_star/polaris-2.dmm @@ -1201,7 +1201,7 @@ "xe" = (/obj/structure/bed/padded,/obj/item/weapon/bedsheet/orange,/obj/effect/floor_decal/corner/orange/full{dir = 1},/turf/unsimulated/floor{icon_state = "vault"; dir = 5},/area/centcom/security) "xf" = (/obj/structure/bed/chair/office/dark{dir = 1},/turf/unsimulated/floor{icon_state = "carpet"; dir = 2},/area/centcom/command) "xg" = (/obj/structure/table/rack/shelf,/obj/item/device/radio/headset/omni,/obj/item/device/radio/headset/omni,/obj/item/device/radio/headset/omni,/turf/simulated/floor/wood/sif,/area/admin) -"xh" = (/obj/structure/table/rack/shelf,/obj/item/device/nif/authentic,/obj/item/device/nifrepairer,/turf/simulated/floor/wood/sif,/area/admin) +"xh" = (/obj/structure/table/rack/shelf,/obj/item/device/nifrepairer,/turf/simulated/floor/wood/sif,/area/admin) "xi" = (/obj/structure/table/rack/shelf,/obj/fiftyspawner/durasteel,/obj/fiftyspawner/durasteel,/obj/fiftyspawner/durasteel,/turf/simulated/floor/wood/sif,/area/admin) "xj" = (/turf/unsimulated/wall,/area/alien) "xk" = (/obj/structure/table/woodentable,/turf/simulated/floor/wood/sif,/area/admin) diff --git a/maps/northern_star/polaris-5.dmm b/maps/northern_star/polaris-5.dmm index be855613ca..2840aba0ab 100644 --- a/maps/northern_star/polaris-5.dmm +++ b/maps/northern_star/polaris-5.dmm @@ -1150,7 +1150,7 @@ "wf" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/firedoor/border_only,/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/outpost/mining_main/north_hall) "wg" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{pixel_x = 2; pixel_y = 3},/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer{pixel_x = 5},/obj/item/weapon/reagent_containers/food/drinks/bottle/small/beer,/turf/simulated/floor/tiled/dark,/area/outpost/mining_main/break_room) "wh" = (/obj/structure/bed/chair{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) -"wi" = (/obj/structure/table/standard,/obj/item/weapon/storage/box/nifsofts_mining,/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) +"wi" = (/obj/structure/table/standard,/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wj" = (/obj/structure/bed/chair{dir = 8},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wk" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor/wood,/area/outpost/mining_main/break_room) "wl" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/regular,/obj/item/weapon/storage/firstaid/toxin,/obj/effect/floor_decal/corner/paleblue/full{dir = 8},/turf/simulated/floor/tiled/white,/area/outpost/mining_main/medbay) diff --git a/vorestation.dme b/vorestation.dme index f1e7d2e0d5..72d9b258e1 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1372,7 +1372,6 @@ #include "code\modules\admin\verbs\custom_event.dm" #include "code\modules\admin\verbs\deadsay.dm" #include "code\modules\admin\verbs\debug.dm" -#include "code\modules\admin\verbs\debug_vr.dm" #include "code\modules\admin\verbs\diagnostics.dm" #include "code\modules\admin\verbs\dice.dm" #include "code\modules\admin\verbs\getlogs.dm" @@ -1504,7 +1503,6 @@ #include "code\modules\client\preference_setup\vore\05_persistence.dm" #include "code\modules\client\preference_setup\vore\06_vantag.dm" #include "code\modules\client\preference_setup\vore\07_traits.dm" -#include "code\modules\client\preference_setup\vore\08_nif.dm" #include "code\modules\client\preference_setup\vore\09_misc.dm" #include "code\modules\clothing\chameleon.dm" #include "code\modules\clothing\clothing.dm" @@ -1931,7 +1929,6 @@ #include "code\modules\mob\dead\observer\login.dm" #include "code\modules\mob\dead\observer\logout.dm" #include "code\modules\mob\dead\observer\observer.dm" -#include "code\modules\mob\dead\observer\observer_vr.dm" #include "code\modules\mob\dead\observer\say.dm" #include "code\modules\mob\freelook\chunk.dm" #include "code\modules\mob\freelook\eye.dm" @@ -2305,16 +2302,6 @@ #include "code\modules\nano\modules\nano_module.dm" #include "code\modules\nano\modules\power_monitor.dm" #include "code\modules\nano\modules\rcon.dm" -#include "code\modules\nifsoft\nif.dm" -#include "code\modules\nifsoft\nif_softshop.dm" -#include "code\modules\nifsoft\nif_statpanel.dm" -#include "code\modules\nifsoft\nifsoft.dm" -#include "code\modules\nifsoft\software\01_vision.dm" -#include "code\modules\nifsoft\software\05_health.dm" -#include "code\modules\nifsoft\software\10_combat.dm" -#include "code\modules\nifsoft\software\13_soulcatcher.dm" -#include "code\modules\nifsoft\software\14_commlink.dm" -#include "code\modules\nifsoft\software\15_misc.dm" #include "code\modules\organs\blood.dm" #include "code\modules\organs\misc.dm" #include "code\modules\organs\organ.dm"