diff --git a/code/_helpers/icons.dm b/code/_helpers/icons.dm index f1452a9385..9e8d475dab 100644 --- a/code/_helpers/icons.dm +++ b/code/_helpers/icons.dm @@ -794,7 +794,7 @@ GLOBAL_LIST_EMPTY(cached_examine_icons) if (!bicon_cache[key]) // Doesn't exist, make it. var/icon/target_icon = icon(target_atom.icon, target_atom.icon_state, SOUTH, 1) - if (ishuman(target)) // Shitty workaround for a BYOND issue. + if(ishuman(target)) // Shitty workaround for a BYOND issue. var/icon/temp = target_icon target_icon = icon() target_icon.Insert(temp, dir = SOUTH) diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm index 23b4cd91dc..8b9e54647b 100644 --- a/code/game/gamemodes/cult/narsie.dm +++ b/code/game/gamemodes/cult/narsie.dm @@ -315,7 +315,7 @@ var/global/narsie_cometh = 0 to_chat(target, span_boldnotice("[capname] HAS LOST INTEREST IN YOU.")) target = food - if (ishuman(target)) + if(ishuman(target)) to_chat(target, span_danger("[capname] HUNGERS FOR YOUR SOUL.")) else to_chat(target, span_danger("[capname] HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL.")) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6fe9b7ead1..88a8ba6a27 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -320,7 +320,7 @@ else to_chat(user, span_notice("This is anchored and you can't lift it.")) return // End CHOMPStation Edit - if (hasorgans(user)) + if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND] if (user.hand) diff --git a/code/game/objects/items/bells.dm b/code/game/objects/items/bells.dm index c25eef8006..70b19684aa 100644 --- a/code/game/objects/items/bells.dm +++ b/code/game/objects/items/bells.dm @@ -71,7 +71,7 @@ to_chat(user,span_notice("You gracefully ring [src].")) /obj/item/deskbell/proc/check_ability(mob/user) - if (ishuman(user)) + if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND] if (H.hand) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 0308bded58..76741d7a65 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -169,7 +169,7 @@ . += "There is about [src.amount] square units of paper left!" /obj/item/wrapping_paper/attack(mob/target as mob, mob/user as mob) - if (!ishuman(target)) return + if(!ishuman(target)) return var/mob/living/carbon/human/H = target if (istype(H.wear_suit, /obj/item/clothing/suit/straight_jacket) || istype(H.wear_suit, /obj/item/clothing/suit/shibari) || H.stat) diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index fbe5da91d8..880aec4ec0 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -48,7 +48,7 @@ /obj/structure/extinguisher_cabinet/attack_hand(mob/living/user) if(isrobot(user)) return - if (ishuman(user)) + if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND] if (user.hand) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e6bc664119..1f02a0646d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -593,7 +593,7 @@ thing.update_icon() /obj/structure/sink/attack_hand(mob/user as mob) - if (ishuman(user)) + if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND] if (H.hand) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 9d2d39efc9..aafd82beef 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -199,7 +199,7 @@ else if (user.a_intent == I_HURT) - if (ishuman(user)) + if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.species.can_shred(H)) attack_generic(H,25) diff --git a/code/modules/eventkit/medical_issues.dm b/code/modules/eventkit/medical_issues.dm index 7e1bbc2bc1..e4cbced136 100644 --- a/code/modules/eventkit/medical_issues.dm +++ b/code/modules/eventkit/medical_issues.dm @@ -277,7 +277,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/strengthen_bone/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -318,7 +318,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/remove_growth/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -359,7 +359,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/redirect_vessels/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -400,7 +400,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/extract_object/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -441,7 +441,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/flesh_graft/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -484,7 +484,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/remove_growth_internal/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -527,7 +527,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/redirect_vessels_internal/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -570,7 +570,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/close_holes/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -613,7 +613,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/ultrasound/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -656,7 +656,7 @@ max_duration = 60 /datum/surgery_step/medical_issue/reoxygenate_tissue/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 48426543e1..f6c2233929 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -57,9 +57,6 @@ /mob/proc/is_cloaked() return FALSE -/proc/hasorgans(A) // Fucking really?? - return ishuman(A) - /proc/iscuffed(A) if(istype(A, /mob/living/carbon)) var/mob/living/carbon/C = A @@ -391,7 +388,6 @@ It's fairly easy to fix if dealing with single letters but not so much with comp return 0 //converts intent-strings into numbers and back -var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HURT) /proc/intent_numeric(argument) if(istext(argument)) switch(argument) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index f4b2a23e74..21d53042f7 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -538,7 +538,7 @@ else if (P.name != initial(P.name)) B.name = P.name user.drop_from_inventory(P) - if (ishuman(user)) + if(ishuman(user)) var/mob/living/carbon/human/h_user = user if (h_user.r_hand == src) h_user.drop_from_inventory(src) diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index edbc8754ce..7013b9472f 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -22,7 +22,7 @@ max_duration = 40 //CHOMPedit /datum/surgery_step/glue_bone/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -67,7 +67,7 @@ max_duration = 45 //CHOMPedit /datum/surgery_step/set_bone/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -118,7 +118,7 @@ max_duration = 50 //CHOMPedit /datum/surgery_step/mend_skull/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -166,7 +166,7 @@ max_duration = 30 //CHOMPedit /datum/surgery_step/finish_bone/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) @@ -211,7 +211,7 @@ max_duration = 55 //CHOMPedit /datum/surgery_step/clamp_bone/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index 535c5ccb09..a785e93057 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -9,7 +9,7 @@ blood_level = 1 /datum/surgery_step/open_encased/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -32,13 +32,13 @@ max_duration = 50 //CHOMPedit /datum/surgery_step/open_encased/saw/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) return ..() && affected && affected.open == 2 /datum/surgery_step/open_encased/saw/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -49,7 +49,7 @@ ..() /datum/surgery_step/open_encased/saw/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -59,7 +59,7 @@ affected.open = 2.5 /datum/surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -86,13 +86,13 @@ max_duration = 30 //CHOMPedit /datum/surgery_step/open_encased/retract/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) return ..() && affected && affected.open == 2.5 /datum/surgery_step/open_encased/retract/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -104,7 +104,7 @@ ..() /datum/surgery_step/open_encased/retract/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) var/msg = span_notice("[user] forces open [target]'s [affected.encased] with \the [tool].") @@ -115,7 +115,7 @@ affected.open = 3 /datum/surgery_step/open_encased/retract/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -143,13 +143,13 @@ max_duration = 30 //CHOMPedit /datum/surgery_step/open_encased/close/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) return (..() && affected && affected.open == 3) /datum/surgery_step/open_encased/close/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -161,7 +161,7 @@ ..() /datum/surgery_step/open_encased/close/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -173,7 +173,7 @@ affected.open = 2.5 /datum/surgery_step/open_encased/close/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -205,13 +205,13 @@ max_duration = 20 //CHOMPedit /datum/surgery_step/open_encased/mend/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) return ..() && affected && affected.open == 2.5 /datum/surgery_step/open_encased/mend/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -223,7 +223,7 @@ ..() /datum/surgery_step/open_encased/mend/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -250,13 +250,13 @@ excludes_steps = list(/datum/surgery_step/open_encased/saw) /datum/surgery_step/open_encased/advancedsaw_open/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) return ..() && affected && affected.open >= 2 && affected.open < 3 /datum/surgery_step/open_encased/advancedsaw_open/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -267,7 +267,7 @@ ..() /datum/surgery_step/open_encased/advancedsaw_open/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -277,7 +277,7 @@ affected.open = 3 /datum/surgery_step/open_encased/advancedsaw_open/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -303,13 +303,13 @@ max_duration = 30 //CHOMPedit /datum/surgery_step/open_encased/advancedsaw_mend/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) return (..() && affected && affected.open == 3) /datum/surgery_step/open_encased/advancedsaw_mend/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -321,7 +321,7 @@ ..() /datum/surgery_step/open_encased/advancedsaw_mend/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) diff --git a/code/modules/surgery/external_repair.dm b/code/modules/surgery/external_repair.dm index e7c0c846a9..2767827c03 100644 --- a/code/modules/surgery/external_repair.dm +++ b/code/modules/surgery/external_repair.dm @@ -18,7 +18,7 @@ return 0 if (target_zone == O_EYES || target_zone == O_MOUTH) return 0 - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected == null) diff --git a/code/modules/surgery/face.dm b/code/modules/surgery/face.dm index 804346cce6..6531f03967 100644 --- a/code/modules/surgery/face.dm +++ b/code/modules/surgery/face.dm @@ -10,7 +10,7 @@ can_infect = 0 /datum/surgery_step/face/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (!affected || (affected.robotic >= ORGAN_ROBOT)) diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index c7a4da045d..3d68d95abb 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -11,7 +11,7 @@ return 0 if (target_zone == O_EYES) //there are specific steps for eye surgery return 0 - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected == null) @@ -371,7 +371,7 @@ /datum/surgery_step/generic/amputate/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if (target_zone == O_EYES) //there are specific steps for eye surgery return 0 - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected == null) diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 05e85d6cff..c2c471a7d8 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -9,7 +9,7 @@ priority = 1 /datum/surgery_step/cavity/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if(!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if(coverage_check(user, target, affected, tool)) diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index 9cbac04e2d..3bb98fbae9 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -10,7 +10,7 @@ can_infect = 0 /datum/surgery_step/limb/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected) diff --git a/code/modules/surgery/neck.dm b/code/modules/surgery/neck.dm index 5ad7575b99..7cfe68a0e6 100644 --- a/code/modules/surgery/neck.dm +++ b/code/modules/surgery/neck.dm @@ -10,7 +10,7 @@ can_infect = 1 /datum/surgery_step/brainstem/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (!affected || (affected.robotic >= ORGAN_ROBOT) || !(affected.open >= 3)) diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index e9779eeeab..290f9a2f49 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -6,7 +6,7 @@ /datum/surgery_step/internal/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -31,7 +31,7 @@ max_duration = 60 /datum/surgery_step/internal/fix_organ/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) @@ -50,7 +50,7 @@ else if (istype(tool, /obj/item/stack/medical/bruise_pack)) tool_name = "the bandaid" - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -72,7 +72,7 @@ if (istype(tool, /obj/item/stack/medical/bruise_pack)) tool_name = "the bandaid" - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -93,7 +93,7 @@ target.SetLosebreath(0) /datum/surgery_step/internal/fix_organ/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -133,7 +133,7 @@ max_duration = 60 /datum/surgery_step/fix_organic_organ_robotic/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) return @@ -145,7 +145,7 @@ return affected.open != 3 && is_organ_damaged //Robots have their own code. /datum/surgery_step/fix_organic_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -160,7 +160,7 @@ ..() /datum/surgery_step/fix_organic_organ_robotic/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -175,7 +175,7 @@ target.sdisabilities &= ~BLIND /datum/surgery_step/fix_organic_organ_robotic/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index d90c3955b0..c828537dc8 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -21,7 +21,7 @@ max_duration = 50 //CHOMPedit /datum/surgery_step/fix_vein/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if(!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -80,7 +80,7 @@ max_duration = 50 //CHOMPedit /datum/surgery_step/fix_dead_tissue/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if(!hasorgans(target)) + if(!ishuman(target)) return 0 if (target_zone == O_MOUTH || target_zone == O_EYES) @@ -142,7 +142,7 @@ if(!container.reagents.has_reagent(REAGENT_ID_PERIDAXON)) return 0 - if(!hasorgans(target)) + if(!ishuman(target)) return 0 if (target_zone == O_MOUTH || target_zone == O_EYES) @@ -264,7 +264,7 @@ blood_level = 1 /datum/surgery_step/dehusk/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (!affected || (affected.robotic >= ORGAN_ROBOT)) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 1a237fb793..55be0919f6 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -12,7 +12,7 @@ return 0 if (target_zone == O_EYES) //there are specific steps for eye surgery return 0 - if (!hasorgans(target)) + if(!ishuman(target)) return 0 var/obj/item/organ/external/affected = target.get_organ(target_zone) if (affected == null) @@ -308,7 +308,7 @@ max_duration = 70 //CHOMPedit /datum/surgery_step/robotics/fix_organ_robotic/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) return @@ -320,7 +320,7 @@ return affected.open == 3 && is_organ_damaged /datum/surgery_step/robotics/fix_organ_robotic/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -335,7 +335,7 @@ ..() /datum/surgery_step/robotics/fix_organ_robotic/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -350,7 +350,7 @@ target.sdisabilities &= ~BLIND /datum/surgery_step/robotics/fix_organ_robotic/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) - if (!hasorgans(target)) + if(!ishuman(target)) return var/obj/item/organ/external/affected = target.get_organ(target_zone) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 113644d137..98b182dcc6 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -57,7 +57,7 @@ // Checks if this step applies to the user mob at all /datum/surgery_step/proc/is_valid_target(mob/living/carbon/human/target) - if(!hasorgans(target)) + if(!ishuman(target)) return 0 if(allowed_species) diff --git a/code/modules/vore/resizing/holder_vr.dm b/code/modules/vore/resizing/holder_vr.dm index bc38d54e9c..43eaee1393 100644 --- a/code/modules/vore/resizing/holder_vr.dm +++ b/code/modules/vore/resizing/holder_vr.dm @@ -11,7 +11,7 @@ if(anchored) to_chat(user, span_notice("\The [src] won't budge, you can't pick it up!")) return - if (hasorgans(user)) + if(ishuman(user)) var/mob/living/carbon/human/H = user var/obj/item/organ/external/temp = H.organs_by_name[BP_R_HAND] if (user.hand)