diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 46b06a15555..2d30343883c 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -69,7 +69,7 @@ if(!l_hand_obj && !r_hand_obj) to_chat(owner, "You are not holding any items, your hands relax...") - active = 0 + active = FALSE else var/msg = 0 msg += !l_hand_ignore && l_hand_obj ? 1 : 0 diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm index 542b24287a3..a7fec193dcd 100644 --- a/code/modules/surgery/organs/helpers.dm +++ b/code/modules/surgery/organs/helpers.dm @@ -104,29 +104,3 @@ if(affecting.body_part == LEG_LEFT) .++ -//sometimes we want to ignore that we don't have the required amount of legs. -/mob/proc/get_leg_ignore() - return FALSE - - -/mob/living/carbon/human/get_leg_ignore() - - if(flying || floating) - return TRUE - - var/obj/item/tank/jetpack/J - if(istype(back,/obj/item/tank/jetpack)) - J = back - if(J.on == 1) - return TRUE - return FALSE - -/mob/living/proc/get_missing_limbs() - return list() - -/mob/living/carbon/human/get_missing_limbs() - var/list/full = list("head", "chest", "r_arm", "l_arm", "r_leg", "l_leg") - for(var/zone in full) - if(has_organ(zone)) - full -= zone - return full diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index c6f490e459a..2c1171a89ab 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -24,7 +24,7 @@ var/burn_dam = 0 var/max_size = 0 var/icon/mob_icon - var/gendered_icon = 0 + var/gendered_icon = FALSE var/limb_name var/limb_flags var/s_tone = null @@ -46,8 +46,8 @@ var/damage_msg = "You feel an intense pain" var/broken_description - var/open = 0 // If the body part has an open incision from surgery - var/sabotaged = 0 //If a prosthetic limb is emagged, it will detonate when it fails. + var/open = 0 // If the body part has an open incision from surgery. Can have values > 1. + var/sabotaged = FALSE //If a prosthetic limb is emagged, it will detonate when it fails. var/encased // Needs to be opened with a saw to access the organs. var/obj/item/hidden = null diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm index 3e252b67fb8..f015da30d20 100644 --- a/code/modules/surgery/organs/subtypes/diona.dm +++ b/code/modules/surgery/organs/subtypes/diona.dm @@ -4,14 +4,14 @@ min_broken_damage = 50 amputation_point = "trunk" encased = null - gendered_icon = 0 + gendered_icon = FALSE convertable_children = list(/obj/item/organ/external/groin/diona) /obj/item/organ/external/groin/diona name = "fork" min_broken_damage = 50 amputation_point = "lower trunk" - gendered_icon = 0 + gendered_icon = FALSE /obj/item/organ/external/arm/diona name = "left upper tendril" @@ -66,7 +66,7 @@ min_broken_damage = 25 encased = null amputation_point = "upper trunk" - gendered_icon = 0 + gendered_icon = FALSE /obj/item/organ/diona/process() return diff --git a/code/modules/surgery/organs/subtypes/standard.dm b/code/modules/surgery/organs/subtypes/standard.dm index a1f5ecead33..9c2eb3c776c 100644 --- a/code/modules/surgery/organs/subtypes/standard.dm +++ b/code/modules/surgery/organs/subtypes/standard.dm @@ -12,7 +12,7 @@ body_part = UPPER_TORSO vital = TRUE amputation_point = "spine" - gendered_icon = 1 + gendered_icon = TRUE parent_organ = null encased = "ribcage" convertable_children = list(/obj/item/organ/external/groin) @@ -39,7 +39,7 @@ vital = TRUE parent_organ = "chest" amputation_point = "lumbar" - gendered_icon = 1 + gendered_icon = TRUE /obj/item/organ/external/arm limb_name = "l_arm" @@ -204,7 +204,7 @@ body_part = HEAD parent_organ = "chest" amputation_point = "neck" - gendered_icon = 1 + gendered_icon = TRUE encased = "skull" var/can_intake_reagents = 1 var/alt_head = "None" diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index 0b7a5e3bbe9..499e48882d5 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -5,7 +5,7 @@ /datum/surgery/embedded_removal/synth steps = list(/datum/surgery_step/robotics/external/unscrew_hatch,/datum/surgery_step/robotics/external/open_hatch,/datum/surgery_step/remove_object,/datum/surgery_step/robotics/external/close_hatch) - requires_organic_bodypart = 0 + requires_organic_bodypart = FALSE /datum/surgery/embedded_removal/can_start(mob/user, mob/living/carbon/human/target) if(!istype(target)) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index b8b86922c8e..6dd902b82f0 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -7,19 +7,19 @@ name = "Cybernetic Repair" steps = list(/datum/surgery_step/robotics/external/unscrew_hatch,/datum/surgery_step/robotics/external/open_hatch,/datum/surgery_step/robotics/external/repair) possible_locs = list("chest","head","l_arm", "l_hand","r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","groin") - requires_organic_bodypart = 0 + requires_organic_bodypart = FALSE /datum/surgery/cybernetic_repair/internal name = "Internal Component Manipulation" steps = list(/datum/surgery_step/robotics/external/unscrew_hatch,/datum/surgery_step/robotics/external/open_hatch,/datum/surgery_step/robotics/manipulate_robotic_organs) possible_locs = list("eyes", "mouth", "chest","head","groin","l_arm","r_arm") - requires_organic_bodypart = 0 + requires_organic_bodypart = FALSE /datum/surgery/cybernetic_amputation name = "Robotic Limb Amputation" steps = list(/datum/surgery_step/robotics/external/amputate) possible_locs = list("chest","head","l_arm", "l_hand","r_arm","r_hand","r_leg","r_foot","l_leg","l_foot","groin") - requires_organic_bodypart = 0 + requires_organic_bodypart = FALSE /datum/surgery/cybernetic_repair/can_start(mob/user, mob/living/carbon/target)