cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-12 07:35:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gets rid of hasorgans() helper proc (#18692)

Browse Source 
This was just ishuman()
This commit is contained in:
Cameron Lennox
2025-11-07 21:30:32 -05:00
committed by GitHub
parent 607d8a386d
commit c2b50ace33
24 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/eventkit/medical_issues.dm
+10 -10
View File
@@ -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))
code/modules/mob/mob_helpers.dm
-4
View File
@@ -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)
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -539,7 +539,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)
code/modules/surgery/bones.dm
+5 -5
View File
@@ -22,7 +22,7 @@
max_duration = 60
/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 = 70
/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 = 70
/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 = 60
/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 = 90
/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))
code/modules/surgery/encased.dm
+23 -23
View File
@@ -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 = 70
/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 = 40
/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 = 40
/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 = 40
/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 = 60
/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)
code/modules/surgery/external_repair.dm
+1 -1
View File
@@ -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)
code/modules/surgery/face.dm
+1 -1
View File
@@ -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))
code/modules/surgery/generic.dm
+2 -2
View File
@@ -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)
code/modules/surgery/implant.dm
+1 -1
View File
@@ -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))
code/modules/surgery/limb_reattach.dm
+1 -1
View File
@@ -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)
code/modules/surgery/neck.dm
+1 -1
View File
@@ -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))
code/modules/surgery/organs_internal.dm
+9 -9
View File
@@ -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)
code/modules/surgery/other.dm
+4 -4
View File
@@ -21,7 +21,7 @@
max_duration = 90
/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 = 160
/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))
code/modules/surgery/robotics.dm
+5 -5
View File
@@ -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)
@@ -304,7 +304,7 @@
max_duration = 90
/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
@@ -316,7 +316,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)
@@ -331,7 +331,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)
@@ -346,7 +346,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)
code/modules/surgery/surgery.dm
+1 -1
View File
@@ -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)
code/modules/vore/resizing/holder_vr.dm
+1 -1
View File
@@ -10,7 +10,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)