diff --git a/code/ZAS/Phoron.dm b/code/ZAS/Phoron.dm index b295a3c60a..0f39ab4b56 100644 --- a/code/ZAS/Phoron.dm +++ b/code/ZAS/Phoron.dm @@ -119,11 +119,10 @@ 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 8d5ef0f1d0..feae05ae91 100644 --- a/code/controllers/subsystems/transcore_vr.dm +++ b/code/controllers/subsystems/transcore_vr.dm @@ -54,9 +54,8 @@ SUBSYSTEM_DEF(transcore) 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) //Chompstation Edit: Removing NIFs - Jon - SStranscore.m_backup(H.mind,null) + SStranscore.m_backup(H.mind,H.nif) + persist_nif_data(H) if(MC_TICK_CHECK) return @@ -130,8 +129,6 @@ 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 @@ -148,7 +145,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/controllers/voting.dm b/code/controllers/voting.dm index eef0cd871c..9e763dbdbd 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -102,7 +102,7 @@ var/global/list/round_voters = list() // Keeps track of the individuals voting f else factor = 1.4 choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor) - world << "Crew Transfer Factor: [factor]" + world << "Crew Transfer Factor: [factor]" greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"]) . = list() // Get all options with that many votes and return them in a list @@ -135,7 +135,7 @@ var/global/list/round_voters = list() // Keeps track of the individuals voting f if(mode == VOTE_ADD_ANTAGONIST) antag_add_failed = 1 log_vote(text) - world << "[text]" + world << "[text]" /datum/controller/vote/proc/result() . = announce_result() @@ -249,7 +249,7 @@ var/global/list/round_voters = list() // Keeps track of the individuals voting f log_vote(text) - world << "[text]\nType vote or click here to place your votes.\nYou have [config.vote_period / 10] seconds to vote." + world << "[text]\nType vote or click here to place your votes.\nYou have [config.vote_period / 10] seconds to vote." if(vote_type == VOTE_CREW_TRANSFER || vote_type == VOTE_GAMEMODE || vote_type == VOTE_CUSTOM) world << sound('sound/ambience/alarm4.ogg', repeat = 0, wait = 0, volume = 50, channel = 3) diff --git a/code/game/gamemodes/technomancer/catalog.dm b/code/game/gamemodes/technomancer/catalog.dm index 3ff126e0cd..06464adfb6 100644 --- a/code/game/gamemodes/technomancer/catalog.dm +++ b/code/game/gamemodes/technomancer/catalog.dm @@ -133,7 +133,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - dat += "[spell.name]
" dat += "[spell.desc]
" if(spell.spell_power_desc) - dat += "Spell Power: [spell.spell_power_desc]
" + dat += "Spell Power: [spell.spell_power_desc]
" if(spell.enhancement_desc) dat += "Scepter Effect: [spell.enhancement_desc]
" if(spell.cost <= budget) @@ -255,7 +255,7 @@ var/list/all_technomancer_assistance = typesof(/datum/technomancer/assistance) - If a function is able to be boosted with it, it will be shown underneath the description of the function as \ 'Scepter Effect:'. Note that you must hold the scepter for it to work, so try to avoid losing it.
" dat += "Functions can also be boosted with the core itself. A function that is able to benefit \ - from this will have 'Spell Power:' underneath. Different Cores have different \ + from this will have 'Spell Power:' underneath. Different Cores have different \ amounts of spell power.
" dat += "When a function refers to 'allies', it means you, your apprentices, currently controlled entities (with the \ Control function), and friendly simple-minded entities that you've summoned with the Scepter of Enhancement.
" diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index a062b61d9e..55d003f06c 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -161,9 +161,7 @@ //Body Scan Console /obj/machinery/body_scanconsole var/obj/machinery/bodyscanner/scanner - //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/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/delete var/temphtml diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index dfd3a6c280..7ba7a808a5 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -391,15 +391,13 @@ 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 38276115f5..399be72e30 100644 --- a/code/game/objects/items/contraband_vr.dm +++ b/code/game/objects/items/contraband_vr.dm @@ -47,8 +47,7 @@ /obj/item/clothing/accessory/permit/gun, /obj/item/device/perfect_tele, /obj/item/device/sleevemate, -// Chompstation Edit: Removing NIFs temporarily - Jon -// /obj/item/weapon/disk/nifsoft/compliance, + /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 d7139ea535..db0e42ae52 100644 --- a/code/game/objects/items/devices/communicator/phone.dm +++ b/code/game/objects/items/devices/communicator/phone.dm @@ -211,14 +211,13 @@ 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. @@ -242,14 +241,13 @@ //VOREStation Edit Start for commlinks var/list/mobs_to_relay - // Chompstation Edit: Removing NIFs temporarily - Jon -/* if(istype(comm,/obj/item/device/communicator/commlink)) + + 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 055cff3284..53b2d83564 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -77,8 +77,6 @@ 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 @@ -86,7 +84,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 89eadcefba..ba8abce75b 100644 --- a/code/game/objects/items/devices/scanners_vr.dm +++ b/code/game/objects/items/devices/scanners_vr.dm @@ -97,14 +97,11 @@ 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) @@ -131,17 +128,15 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob to_chat(usr,"Target seems totally braindead.") return -//Chompstation Edit: Removing NIFs - Jon -/* var/nif + 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) //Chompstation Edit: Removing NIFs - Jon - SStranscore.m_backup(target.mind,null,one_time = TRUE) + SStranscore.m_backup(target.mind,nif,one_time = TRUE) to_chat(usr,"Mind backed up!") else to_chat(usr,"You must remain close to your target!") @@ -184,8 +179,7 @@ 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.") @@ -212,7 +206,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 ddcb722fc9..9a8937adbc 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 //Chompstation Edit: Removing NIFs - Jon + if(H.nif && H.nif.flag_check(NIF_V_UVFILTER,NIF_FLAGS_VISION)) return //VOREStation Add - NIF 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 e87dc1b24f..727dcbb9f4 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, //Chompstation Edit: Removing NIFs - Jon + prob(1);/obj/item/device/nif/bad, 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, //Chompstation Edit: Removing NIFs - Jon + prob(1);/obj/item/weapon/disk/nifsoft/compliance, 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 839da18d4d..3689c49970 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, //Chompstation Edit: Removing NIFs - Jon, + /datum/admins/proc/quick_nif, //VOREStation Add, /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, //Chompstation Edit: Removing NIFs - Jon, + /datum/admins/proc/quick_nif, //CHOMPStation Add, /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 Edit: Removing NIFs - Jon, + /datum/admins/proc/quick_nif, /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, //Chompstation Edit: Removing NIFs - Jon, + /datum/admins/proc/quick_nif, //CHOMPStation Add, /client/proc/allow_character_respawn, /datum/admins/proc/sendFax, /client/proc/respawn_character, diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index f879b8332e..b85a8b9a2b 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -17,7 +17,7 @@ return var/image/cross = image('icons/obj/storage.dmi',"bible") - msg = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]" + msg = "\icon[cross] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC) (SMITE): [msg]" for(var/client/C in admins) if(R_ADMIN & C.holder.rights) diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index b5e035d423..76178dada2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -21,9 +21,7 @@ /datum/gear/utility/communicator/New() ..() var/list/communicators = list() -// 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) + for(var/communicator in typesof(/obj/item/device/communicator) - list(/obj/item/device/communicator/integrated,/obj/item/device/communicator/commlink)) //VOREStation Edit - Remove Commlink 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/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 5d93f215d5..e7ced61d89 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -622,7 +622,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp is_manifest = TRUE verbs |= /mob/observer/dead/proc/toggle_visibility verbs |= /mob/observer/dead/proc/ghost_whisper - to_chat(src,"As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.") + to_chat(src,"As you are now in the realm of the living, you can whisper to the living with the Spectral Whisper verb, inside the IC tab.") if(plane != PLANE_WORLD) user.visible_message( \ "\The [user] drags ghost, [src], to our plane of reality!", \ @@ -754,7 +754,7 @@ mob/observer/dead/MayRespawn(var/feedback = 0) var/msg = sanitize(input(src, "Message:", "Spectral Whisper") as text|null) if(msg) log_say("(SPECWHISP to [key_name(M)]): [msg]", src) - M << " You hear a strange, unidentifiable voice in your head... [msg]" + M << " You hear a strange, unidentifiable voice in your head... [msg]" src << " You said: '[msg]' to [M]." else return diff --git a/code/modules/mob/living/carbon/breathe.dm b/code/modules/mob/living/carbon/breathe.dm index 353dfbdcbe..4dbac4b77c 100644 --- a/code/modules/mob/living/carbon/breathe.dm +++ b/code/modules/mob/living/carbon/breathe.dm @@ -22,13 +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 -// Chompstation Edit: Removed Nifs - Jon -/* //VOREStation Add - Respirocytes as a NIF implant + + //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 c9d5a3b0d1..7f96f0bba4 100644 --- a/code/modules/mob/living/carbon/human/emote_vr.dm +++ b/code/modules/mob/living/carbon/human/emote_vr.dm @@ -19,15 +19,13 @@ 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.dm b/code/modules/mob/living/carbon/human/examine.dm index 7f8e9db4d4..d05babc345 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -294,7 +294,7 @@ msg += attempt_vr(src,"examine_bellies",args) //VOREStation Code msg += attempt_vr(src,"examine_pickup_size",args) //VOREStation Code msg += attempt_vr(src,"examine_step_size",args) //VOREStation Code -// msg += attempt_vr(src,"examine_nif",args) //VOREStation Code //removed due to removal of NIFs temporarily - Jon + msg += attempt_vr(src,"examine_nif",args) //VOREStation Code if(mSmallsize in mutations) msg += "[T.He] [T.is] very short!
" diff --git a/code/modules/mob/living/carbon/human/examine_vr.dm b/code/modules/mob/living/carbon/human/examine_vr.dm index 65097c23a2..4ddcdbd796 100644 --- a/code/modules/mob/living/carbon/human/examine_vr.dm +++ b/code/modules/mob/living/carbon/human/examine_vr.dm @@ -153,9 +153,8 @@ 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 fc1c35b69a..700415bdda 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -57,9 +57,9 @@ human_mob_list -= src for(var/organ in organs) qdel(organ) -// Chompstation Edit: Removing NIFs temporarily - Jon -// qdel_null(nif) //VOREStation Add -// qdel_null_list(vore_organs) //VOREStation Add + + 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 46ade0ac93..f61ddbfd09 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -1,5 +1,5 @@ /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(src.default_attack && src.default_attack.is_usable(src, target, hit_zone)) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index aab6d786dc..394acc565e 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -117,9 +117,8 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_brute_damage_percent)) amount *= M.incoming_brute_damage_percent - //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) + 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) if(!isnull(M.incoming_healing_percent)) @@ -136,9 +135,8 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_fire_damage_percent)) amount *= M.incoming_fire_damage_percent - //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) + 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) if(!isnull(M.incoming_healing_percent)) @@ -157,8 +155,7 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_brute_damage_percent)) amount *= M.incoming_brute_damage_percent -// 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 + 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) @@ -180,9 +177,8 @@ amount *= M.incoming_damage_percent if(!isnull(M.incoming_fire_damage_percent)) amount *= M.incoming_fire_damage_percent -//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) + 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) if(!isnull(M.incoming_healing_percent)) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 8add0cb4b8..35f192e208 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -147,12 +147,12 @@ var/obj/item/clothing/glasses/V = rig.visor.vision.glasses compiled_vis |= V.enables_planes -//Chompstation Edit: Removing NIFs - Jon -/* //VOREStation Add - NIF Support + + //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 dda754484d..65439ec3c1 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -84,8 +84,8 @@ handle_heartbeat() - //Chompstation Edit: Removing NIFs - Jon -// handle_nif() //VOREStation Add + + handle_nif() //VOREStation Add if(!client) species.handle_npc(src) @@ -691,9 +691,8 @@ pressure_alert = -1 else if( !(COLD_RESISTANCE in mutations)) -// Chompstation Edit - Removes NIFs - Jon -// if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF pressure seals - if(!isSynthetic()) + + if(!isSynthetic() || !nif || !nif.flag_check(NIF_O_PRESSURESEAL,NIF_FLAGS_OTHER)) //VOREStation Edit - NIF pressure seals 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 @@ -731,9 +730,9 @@ // FBPs will overheat, prosthetic limbs are fine. if(robobody_count) -// 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) + + 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 @@ -1310,9 +1309,9 @@ var/obj/item/clothing/glasses/G = glasses if(!G.prescription) 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) + + 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) @@ -1326,8 +1325,8 @@ var/obj/item/clothing/glasses/welding/O = glasses if(!O.up) found_welder = 1 -//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 && 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 2710ca452e..5090bf4b85 100644 --- a/code/modules/mob/living/carbon/human/life_vr.dm +++ b/code/modules/mob/living/carbon/human/life_vr.dm @@ -48,16 +48,15 @@ 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 a4afed724d..b1e4bcbb1a 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -28,8 +28,7 @@ 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 @@ -41,4 +40,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 b3d2af1df7..83dfc68022 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,8 +112,6 @@ 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) @@ -121,7 +119,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) @@ -145,15 +143,14 @@ 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 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 2e7e2f949a..83244887b0 100644 --- a/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm +++ b/code/modules/mob/living/simple_animal/vore/corrupt_hounds.dm @@ -57,9 +57,7 @@ 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..." -//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) + 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) /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 b8eb72ade2..21ee1ca590 100644 --- a/code/modules/nano/interaction/inventory_vr.dm +++ b/code/modules/nano/interaction/inventory_vr.dm @@ -11,8 +11,6 @@ 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) @@ -32,4 +30,3 @@ 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 b6064b7645..789dce7dfb 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -464,9 +464,7 @@ 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) - // 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)) + 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 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 72274b390a..b841375b84 100644 --- a/code/modules/reagents/Chemistry-Reagents_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents_vr.dm @@ -27,8 +27,6 @@ result_amount = 30 required = /obj/item/slime_extract/sapphire -//Chompstation Edit: Removing NIFs - Jon -/* /datum/reagent/nif_repair_nanites name = "Programmed Nanomachines" id = "nifrepairnanites" @@ -46,4 +44,3 @@ 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 9072bf644a..a78da35191 100644 --- a/code/modules/research/designs_vr.dm +++ b/code/modules/research/designs_vr.dm @@ -84,8 +84,6 @@ 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" @@ -110,7 +108,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 662ef0717b..834b067e9d 100644 --- a/code/modules/resleeving/infocore_records.dm +++ b/code/modules/resleeving/infocore_records.dm @@ -41,8 +41,7 @@ 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 @@ -58,7 +57,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 bd4cbc3be6..8f4cc8e13c 100644 --- a/code/modules/resleeving/machines.dm +++ b/code/modules/resleeving/machines.dm @@ -528,15 +528,14 @@ 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 d5ea0f9e88..3bbb5f1089 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -148,8 +148,7 @@ user.drop_item() affected.implants += tool tool.loc = affected -// 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 + if(istype(tool,/obj/item/device/nif)){var/obj/item/device/nif/N = tool;N.implant(target)} //VOREStation Add - NIF support affected.cavity = 0 ////////////////////////////////////////////////////////////////// @@ -221,8 +220,7 @@ var/obj/item/weapon/implant/imp = obj imp.imp_in = null imp.implanted = 0 -// 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 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 e8e3febce2..bc570697d6 100644 --- a/code/modules/vore/fluffstuff/guns/nsfw.dm +++ b/code/modules/vore/fluffstuff/guns/nsfw.dm @@ -316,13 +316,12 @@ /obj/item/projectile/beam/final_option/on_hit(var/atom/impacted) if(isliving(impacted)) var/mob/living/L = impacted -// Chompstation Edit: Removed Nifs - Jon -/* if(L.mind) + 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 22e7b2da55..7b9f3d497d 100644 --- a/code/modules/vore/persist/persist_vr.dm +++ b/code/modules/vore/persist/persist_vr.dm @@ -82,12 +82,11 @@ 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 @@ -220,14 +219,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]") @@ -262,4 +261,3 @@ 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/vorestation.dme b/vorestation.dme index a575f27846..7993dbe6c2 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1372,6 +1372,7 @@ #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" @@ -1503,6 +1504,7 @@ #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" @@ -2303,6 +2305,16 @@ #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"