diff --git a/code/modules/surgery/bone_mending.dm b/code/modules/surgery/bone_mending.dm index 222a90d39dc..9937226a8a4 100644 --- a/code/modules/surgery/bone_mending.dm +++ b/code/modules/surgery/bone_mending.dm @@ -28,12 +28,12 @@ targetable_wound = /datum/wound/blunt/critical /datum/surgery/repair_bone_compound/can_start(mob/living/user, mob/living/carbon/target) + if(!istype(target)) + return FALSE if(..()) var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) return(targeted_bodypart.get_wound_type(targetable_wound)) - - //SURGERY STEPS ///// Repair Hairline Fracture (Severe) diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm index 558174e8875..aed5432bdfe 100644 --- a/code/modules/surgery/burn_dressing.dm +++ b/code/modules/surgery/burn_dressing.dm @@ -11,6 +11,8 @@ targetable_wound = /datum/wound/burn /datum/surgery/debride/can_start(mob/living/user, mob/living/carbon/target) + if(!istype(target)) + return FALSE if(..()) var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected) var/datum/wound/burn/burn_wound = targeted_bodypart.get_wound_type(targetable_wound) diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm index 338882d94d1..7c3e07fba89 100644 --- a/code/modules/surgery/repair_puncture.dm +++ b/code/modules/surgery/repair_puncture.dm @@ -15,6 +15,8 @@ targetable_wound = /datum/wound/pierce /datum/surgery/repair_puncture/can_start(mob/living/user, mob/living/carbon/target) + if(!istype(target)) + return FALSE . = ..() if(.) var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected)