diff --git a/code/modules/surgery/bones.dm b/code/modules/surgery/bones.dm index 16d69b6da49..df8c4d00efe 100644 --- a/code/modules/surgery/bones.dm +++ b/code/modules/surgery/bones.dm @@ -18,14 +18,14 @@ var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(affected.is_robotic()) - return 0 + return FALSE if(affected.limb_flags & CANNOT_BREAK) return FALSE if(affected.status & ORGAN_BROKEN) - return 1 - return 1 + return TRUE + return TRUE //surgery steps @@ -36,7 +36,7 @@ /obj/item/bonegel = 100, \ /obj/item/screwdriver = 90 ) - can_infect = 1 + can_infect = TRUE blood_level = 1 time = 24 @@ -57,13 +57,13 @@ user.visible_message(" [user] applies some [tool] to [target]'s bone in [affected.name]", \ " You apply some [tool] to [target]'s bone in [affected.name] with \the [tool].") - return 1 + return TRUE /datum/surgery_step/glue_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") - return 0 + return FALSE /datum/surgery_step/set_bone name = "set bone" @@ -91,18 +91,18 @@ if(affected.status & ORGAN_BROKEN) user.visible_message(" [user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \ " You set the bone in [target]'s [affected.name] in place with \the [tool].") - return 1 + return TRUE else user.visible_message(" [user] sets the bone in [target]'s [affected.name] in place with \the [tool].", \ " You set the bone in [target]'s [affected.name] in place with \the [tool].") - return 1 + return TRUE /datum/surgery_step/set_bone/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!" , \ " Your hand slips, damaging the bone in [target]'s [affected.name] with \the [tool]!") affected.receive_damage(5) - return 0 + return FALSE /datum/surgery_step/mend_skull name = "mend skull" @@ -128,7 +128,7 @@ user.visible_message(" [user] sets [target]'s [affected.encased] with \the [tool]." , \ " You set [target]'s [affected.encased] with \the [tool].") - return 1 + return TRUE /datum/surgery_step/mend_skull/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -137,7 +137,7 @@ var/obj/item/organ/external/head/h = affected h.receive_damage(10) h.disfigure() - return 0 + return FALSE /datum/surgery_step/finish_bone name = "medicate bones" @@ -146,7 +146,7 @@ /obj/item/bonegel = 100, \ /obj/item/screwdriver = 90 ) - can_infect = 1 + can_infect = TRUE blood_level = 1 time = 24 @@ -172,4 +172,4 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s hand slips, smearing [tool] in the incision in [target]'s [affected.name]!" , \ " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") - return 0 + return FALSE diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm index 9980ac2bef2..5c79b51193f 100644 --- a/code/modules/surgery/cavity_implant.dm +++ b/code/modules/surgery/cavity_implant.dm @@ -15,37 +15,36 @@ name = "Robotic Cavity Implant/Removal" steps = list(/datum/surgery_step/robotics/external/unscrew_hatch,/datum/surgery_step/robotics/external/open_hatch,/datum/surgery_step/cavity/place_item,/datum/surgery_step/robotics/external/close_hatch) possible_locs = list("chest","head","groin") - requires_organic_bodypart = 0 + requires_organic_bodypart = FALSE /datum/surgery/cavity_implant/can_start(mob/user, mob/living/carbon/human/target) if(!istype(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(affected.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery/cavity_implant/synth/can_start(mob/user, mob/living/carbon/human/target) if(!istype(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE return affected.is_robotic() /datum/surgery_step/cavity - priority = 1 /datum/surgery_step/cavity/proc/get_max_wclass(obj/item/organ/external/affected) switch(affected.limb_name) if("head") - return 1 + return WEIGHT_CLASS_TINY if("chest") - return 3 + return WEIGHT_CLASS_NORMAL if("groin") - return 2 + return WEIGHT_CLASS_SMALL return 0 /datum/surgery_step/cavity/proc/get_cavity(obj/item/organ/external/affected) @@ -86,7 +85,7 @@ user.visible_message(" [user] makes some space inside [target]'s [get_cavity(affected)] cavity with \the [tool].", \ " You make some space inside [target]'s [get_cavity(affected)] cavity with \the [tool]." ) - return 1 + return TRUE /datum/surgery_step/cavity/close_space name = "close cavity space" @@ -112,13 +111,13 @@ user.visible_message(" [user] mends [target]'s [get_cavity(affected)] cavity walls with \the [tool].", \ " You mend [target]'s [get_cavity(affected)] cavity walls with \the [tool]." ) - return 1 + return TRUE /datum/surgery_step/cavity/place_item name = "implant/extract object" - accept_hand = 1 - accept_any_item = 1 + accept_hand = TRUE + accept_any_item = TRUE var/obj/item/IC = null allowed_tools = list(/obj/item = 100) @@ -127,16 +126,16 @@ /datum/surgery_step/cavity/place_item/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(!ishuman(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) to_chat(user, "\The [target] lacks a [parse_zone(target_zone)]!") - return 0 + return FALSE if(tool) var/can_fit = !affected.hidden && tool.w_class <= get_max_wclass(affected) if(!can_fit) to_chat(user, "\The [tool] won't fit in \The [affected.name]!") - return 0 + return FALSE return ..() /datum/surgery_step/cavity/place_item/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) @@ -165,27 +164,27 @@ if(istype(tool, /obj/item/disk/nuclear)) to_chat(user, "Central command would kill you if you implanted the disk into someone.") - return 0//fail + return FALSE//fail var/obj/item/disk/nuclear/datdisk = locate() in tool if(datdisk) to_chat(user, "Central command would kill you if you implanted the disk into someone. Even if in a box. Especially in a box.") - return 0//fail + return FALSE//fail if(istype(tool,/obj/item/organ)) to_chat(user, "This isn't the type of surgery for organ transplants!") - return 0//fail + return FALSE//fail if(!user.canUnEquip(tool, 0)) to_chat(user, "[tool] is stuck to your hand, you can't put it in [target]!") - return 0 + return FALSE if(istype(tool,/obj/item/cautery)) - return 1//god this is ugly.... + return TRUE//god this is ugly.... else if(tool) if(IC) to_chat(user, "There seems to be something in there already!") - return 1 + return TRUE else user.visible_message(" [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ " You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) @@ -195,13 +194,13 @@ user.drop_item() affected.hidden = tool tool.forceMove(target) - return 1 + return TRUE else if(IC) user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "You pull [IC] out of [target]'s [target_zone].") user.put_in_hands(IC) affected.hidden = null - return 1 + return TRUE else to_chat(user, "You don't find anything in [target]'s [target_zone].") - return 0 + return FALSE diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index c479c5e3bbd..eee70271ac9 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -7,8 +7,8 @@ if(istype(target,/mob/living/carbon/human)) var/mob/living/carbon/human/H = target if(!H.check_has_mouth()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/insert_pill name = "insert pill" @@ -21,14 +21,14 @@ /datum/surgery_step/insert_pill/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/reagent_containers/food/pill/tool, datum/surgery/surgery) if(!istype(tool)) - return 0 + return FALSE var/dental_implants = 0 for(var/obj/item/reagent_containers/food/pill in target.contents) // Can't give them more than 4 dental implants. dental_implants++ if(dental_implants >= 4) user.visible_message("[user] pulls \the [tool] back out of [target]'s [parse_zone(target_zone)]!", "You pull \the [tool] back out of [target]'s [parse_zone(target_zone)], there wans't enough room...") - return 0 + return FALSE user.drop_item() tool.forceMove(target) @@ -40,7 +40,7 @@ P.Grant(target) user.visible_message("[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", "You wedge [tool] into [target]'s [parse_zone(target_zone)].") - return 1 + return TRUE /datum/action/item_action/hands_free/activate_pill name = "Activate Pill" @@ -55,4 +55,4 @@ target.reagents.trans_to(owner, target.reagents.total_volume) Remove(owner) qdel(target) - return 1 + return TRUE diff --git a/code/modules/surgery/encased.dm b/code/modules/surgery/encased.dm index 29d34f72808..2d7e74d5bfc 100644 --- a/code/modules/surgery/encased.dm +++ b/code/modules/surgery/encased.dm @@ -3,21 +3,20 @@ // GENERIC RIBCAGE SURGERY // ////////////////////////////////////////////////////////////////// /datum/surgery_step/open_encased - priority = 2 - can_infect = 1 + can_infect = TRUE blood_level = 1 /datum/surgery_step/open_encased/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(!hasorgans(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) - return 0 + return FALSE if(affected.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/open_encased/saw @@ -51,7 +50,7 @@ " You have cut [target]'s [affected.encased] open with \the [tool].") affected.open = 2.5 affected.fracture(silent = TRUE) - return 1 + return TRUE /datum/surgery_step/open_encased/saw/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) @@ -65,7 +64,7 @@ affected.receive_damage(20) affected.fracture() - return 0 + return FALSE /datum/surgery_step/open_encased/retract @@ -102,7 +101,7 @@ affected.open = 3 - return 1 + return TRUE /datum/surgery_step/open_encased/retract/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) @@ -117,7 +116,7 @@ affected.receive_damage(20) affected.fracture() - return 0 + return FALSE /datum/surgery_step/open_encased/close name = "unretract bone" //i suck at names okay? give me a new one @@ -153,7 +152,7 @@ affected.open = 2.5 - return 1 + return TRUE /datum/surgery_step/open_encased/close/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) @@ -168,7 +167,7 @@ affected.receive_damage(20) affected.fracture() - return 0 + return FALSE /datum/surgery_step/open_encased/mend name = "mend bone" @@ -203,4 +202,4 @@ affected.open = 2 - return 1 + return TRUE diff --git a/code/modules/surgery/generic.dm b/code/modules/surgery/generic.dm index 3d84525e5c4..054367043d8 100644 --- a/code/modules/surgery/generic.dm +++ b/code/modules/surgery/generic.dm @@ -4,17 +4,17 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /datum/surgery_step/generic/ - can_infect = 1 + can_infect = TRUE /datum/surgery_step/generic/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(!hasorgans(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(affected == null) - return 0 + return FALSE if(affected.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/generic/cut_open @@ -45,14 +45,14 @@ user.visible_message(" [user] has made an incision on [target]'s [affected.name] with \the [tool].", \ " You have made an incision on [target]'s [affected.name] with \the [tool].",) affected.open = 1 - return 1 + return TRUE /datum/surgery_step/generic/cut_open/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!", \ " Your hand slips, slicing open [target]'s [affected.name] in a wrong spot with \the [tool]!") affected.receive_damage(10) - return 0 + return FALSE /datum/surgery_step/generic/clamp_bleeders name = "clamp bleeders" @@ -79,14 +79,14 @@ user.visible_message(" [user] clamps bleeders in [target]'s [affected.name] with \the [tool].", \ " You clamp bleeders in [target]'s [affected.name] with \the [tool].") spread_germs_to_organ(affected, user, tool) - return 1 + return TRUE /datum/surgery_step/generic/clamp_bleeders/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!", \ " Your hand slips, tearing blood vessels and causing massive bleeding in [target]'s [affected.name] with \the [tool]!",) affected.receive_damage(10) - return 0 + return FALSE /datum/surgery_step/generic/retract_skin name = "retract skin" @@ -126,7 +126,7 @@ self_msg = " You keep the incision open on [target]'s lower abdomen with \the [tool]." user.visible_message(msg, self_msg) affected.open = 2 - return 1 + return TRUE /datum/surgery_step/generic/retract_skin/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -139,8 +139,8 @@ msg = " [user]'s hand slips, damaging several organs [target]'s lower abdomen with \the [tool]" self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with \the [tool]!" user.visible_message(msg, self_msg) - target.apply_damage(12, BRUTE, affected, sharp = 1) - return 0 + target.apply_damage(12, BRUTE, affected, sharp = TRUE) + return FALSE /datum/surgery_step/generic/cauterize @@ -169,14 +169,14 @@ " You cauterize the incision on [target]'s [affected.name] with \the [tool].") affected.open = 0 affected.germ_level = 0 - return 1 + return TRUE /datum/surgery_step/generic/cauterize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!", \ " Your hand slips, leaving a small burn on [target]'s [affected.name] with \the [tool]!") target.apply_damage(3, BURN, affected) - return 0 + return FALSE //drill bone /datum/surgery_step/generic/drill @@ -190,7 +190,7 @@ /datum/surgery_step/generic/drill/end_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) user.visible_message("[user] drills into [target]'s [parse_zone(target_zone)]!", "You drill into [target]'s [parse_zone(target_zone)].") - return 1 + return TRUE /datum/surgery_step/generic/amputate @@ -207,12 +207,12 @@ /datum/surgery_step/generic/amputate/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(target_zone == "eyes") //there are specific steps for eye surgery - return 0 + return FALSE if(!hasorgans(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(affected == null) - return 0 + return FALSE if(affected.limb_flags & CANNOT_DISMEMBER) return FALSE return TRUE @@ -234,7 +234,7 @@ var/atom/movable/thing = affected.droplimb(1,DROPLIMB_SHARP) if(istype(thing,/obj/item)) user.put_in_hands(thing) - return 1 + return TRUE /datum/surgery_step/generic/amputate/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -242,4 +242,4 @@ " Your hand slips, sawing through the bone in [target]'s [affected.name] with \the [tool]!") affected.receive_damage(30) affected.fracture() - return 0 + return FALSE diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index 47591a2325e..4c52a5cbb09 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -113,8 +113,8 @@ else if(!isrobot(user)) to_chat(user, "You need to hold a cautery or equivalent in your inactive hand to stop the surgery in progress.") - return 1 - return 0 + return TRUE + return FALSE /proc/get_pain_modifier(mob/living/carbon/human/M) //returns modfier to make surgery harder if patient is conscious and feels pain diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm index 078d0ec1384..48d99f4a60b 100644 --- a/code/modules/surgery/implant_removal.dm +++ b/code/modules/surgery/implant_removal.dm @@ -11,28 +11,28 @@ name = "Implant Removal" steps = list(/datum/surgery_step/robotics/external/unscrew_hatch,/datum/surgery_step/robotics/external/open_hatch,/datum/surgery_step/extract_implant,/datum/surgery_step/robotics/external/close_hatch) possible_locs = list("chest") - requires_organic_bodypart = 0 + requires_organic_bodypart = FALSE /datum/surgery/implant_removal/can_start(mob/user, mob/living/carbon/human/target) if(!istype(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(affected.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery/implant_removal/synth/can_start(mob/user, mob/living/carbon/human/target) if(!istype(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(!affected.is_robotic()) - return 0 + return FALSE - return 1 + return TRUE /datum/surgery_step/extract_implant name = "extract implant" @@ -76,4 +76,4 @@ else user.visible_message(" [user] could not find anything inside [target]'s [affected.name], and pulls \the [tool] out.", \ "You could not find anything inside [target]'s [affected.name].") - return 1 + return TRUE diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm index 561257c2595..43d721372d4 100644 --- a/code/modules/surgery/limb_augmentation.dm +++ b/code/modules/surgery/limb_augmentation.dm @@ -8,12 +8,12 @@ var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(affected.status & ORGAN_BROKEN) //The arm has to be in prime condition to augment it. - return 0 + return FALSE if(affected.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/augment name = "augment limb with robotic part" @@ -25,8 +25,8 @@ if(p.part) if(!(target_zone in p.part)) to_chat(user, "[tool] cannot be used to augment this limb!") - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/augment/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -42,9 +42,9 @@ for(var/part_name in L.part) if(!target.get_organ(part_name)) continue - affected.robotize(L.model_info, make_tough = 1, convert_all = 0) + affected.robotize(L.model_info, make_tough = TRUE, convert_all = FALSE) if(L.sabotaged) - affected.sabotaged = 1 + affected.sabotaged = TRUE break target.update_body() target.updatehealth() @@ -54,4 +54,4 @@ affected.open = 0 affected.germ_level = 0 - return 1 + return TRUE diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm index 8913220803c..529ab21e116 100644 --- a/code/modules/surgery/limb_reattach.dm +++ b/code/modules/surgery/limb_reattach.dm @@ -14,13 +14,13 @@ var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(affected.is_robotic()) - return 0 + return FALSE if(affected.limb_flags & CANNOT_DISMEMBER) return FALSE - return 1 + return TRUE /datum/surgery/reattach @@ -34,10 +34,10 @@ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(ismachineperson(target)) // RIP bi-centennial man - return 0 + return FALSE if(!affected) - return 1 - return 0 + return TRUE + return FALSE /datum/surgery/reattach_synth name = "Synthetic Limb Reattachment" @@ -49,9 +49,9 @@ var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) - return 1 + return TRUE - return 0 + return FALSE /datum/surgery/robo_attach @@ -64,18 +64,18 @@ var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) - return 1 + return TRUE - return 0 + return FALSE /datum/surgery_step/limb/ - can_infect = 0 + can_infect = FALSE /datum/surgery_step/limb/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if(!hasorgans(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(affected) - return 0 + return FALSE var/list/organ_data = target.dna.species.has_limbs["[target_zone]"] return !isnull(organ_data) @@ -87,27 +87,27 @@ /datum/surgery_step/limb/attach/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if(!..()) - return 0 + return FALSE if(!istype(tool, /obj/item/organ/external)) - return 0 + return FALSE var/obj/item/organ/external/E = tool if(target.get_organ(E.limb_name)) // This catches attaching an arm to a missing hand while the arm is still there to_chat(user, "[target] already has an [E.name]!") - return 0 + return FALSE if(E.limb_name != target_zone) // This ensures you must be aiming at the appropriate location to attach // this limb. (Can't aim at a missing foot to re-attach a missing arm) to_chat(user, "The [E.name] does not go there.") - return 0 + return FALSE // if(E.parent_organ && !target.get_organ(E.parent_organ)) // // No rayman allowed - // return 0 + // return FALSE if(!is_correct_limb(E)) to_chat(user, "This is not the correct limb type for this surgery!") - return 0 + return FALSE - return 1 + return TRUE /datum/surgery_step/limb/attach/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -120,20 +120,20 @@ user.visible_message("[user] has attached [target]'s [E.name] to the [E.amputation_point].", \ "You have attached [target]'s [E.name] to the [E.amputation_point].") attach_limb(user, target, E) - return 1 + return TRUE /datum/surgery_step/limb/attach/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = tool user.visible_message("[user]'s hand slips, damaging [target]'s [E.amputation_point]!", \ "Your hand slips, damaging [target]'s [E.amputation_point]!") - target.apply_damage(10, BRUTE, null, sharp = 1) - return 0 + target.apply_damage(10, BRUTE, null, sharp = TRUE) + return FALSE /datum/surgery_step/limb/attach/proc/is_correct_limb(obj/item/organ/external/E) if(E.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/limb/attach/proc/attach_limb(mob/living/user, mob/living/carbon/human/target, obj/item/organ/external/E) user.unEquip(E) @@ -150,8 +150,8 @@ /datum/surgery_step/limb/attach/robo/is_correct_limb(obj/item/organ/external/E) if(!E.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/limb/attach/robo/attach_limb(mob/living/user, mob/living/carbon/human/target, obj/item/organ/external/E) // Fixes fabricator IPC heads @@ -174,15 +174,15 @@ /obj/item/stack/cable_coil = 90, \ /obj/item/assembly/mousetrap = 25 ) - can_infect = 1 + can_infect = TRUE time = 32 /datum/surgery_step/limb/connect/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) if(!hasorgans(target)) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/limb/connect/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = target.get_organ(target_zone) @@ -196,14 +196,14 @@ target.update_body() target.updatehealth() target.UpdateDamageIcon() - return 1 + return TRUE /datum/surgery_step/limb/connect/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/E = target.get_organ(target_zone) user.visible_message("[user]'s hand slips, damaging [target]'s [E.amputation_point]!", \ "Your hand slips, damaging [target]'s [E.amputation_point]!") - target.apply_damage(10, BRUTE, null, sharp = 1) - return 0 + target.apply_damage(10, BRUTE, null, sharp = TRUE) + return FALSE /datum/surgery_step/limb/mechanize name = "apply robotic prosthetic" @@ -217,7 +217,7 @@ if(p.part) if(!(target_zone in p.part)) to_chat(user, "\The [tool] does not go there!") - return 0 + return FALSE return isnull(target.get_organ(target_zone)) /datum/surgery_step/limb/mechanize/begin_step(mob/user, mob/living/carbon/human/target, target_zone, obj/item/tool) @@ -244,17 +244,17 @@ var/obj/item/organ/external/new_limb = new new_limb_type(target) new_limb.robotize(L.model_info) if(L.sabotaged) - new_limb.sabotaged = 1 + new_limb.sabotaged = TRUE target.update_body() target.updatehealth() target.UpdateDamageIcon() qdel(tool) - return 1 + return TRUE /datum/surgery_step/limb/mechanize/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) user.visible_message("[user]'s hand slips, damaging [target]'s flesh!", \ "Your hand slips, damaging [target]'s flesh!") - target.apply_damage(10, BRUTE, null, sharp = 1) - return 0 + target.apply_damage(10, BRUTE, null, sharp = TRUE) + return FALSE diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index c04b4a1f8ab..6e7020d5ea2 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -51,7 +51,7 @@ . = ..() /obj/item/organ/internal/cyberimp/arm/emag_act() - return 0 + return FALSE /obj/item/organ/internal/cyberimp/arm/emp_act(severity) if(emp_proof) diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm index 2597aef0bf4..c50d5da4f19 100644 --- a/code/modules/surgery/organs/blood.dm +++ b/code/modules/surgery/organs/blood.dm @@ -139,16 +139,16 @@ //Gets blood from mob to a container or other mob, preserving all data in it. /mob/living/proc/transfer_blood_to(atom/movable/AM, amount, forced) if(!blood_volume || !AM.reagents) - return 0 + return FALSE if(blood_volume < BLOOD_VOLUME_BAD && !forced) - return 0 + return FALSE if(blood_volume < amount) amount = blood_volume var/blood_id = get_blood_id() if(!blood_id) - return 0 + return FALSE blood_volume -= amount diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 8aaf73f4e29..c6f490e459a 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -147,9 +147,9 @@ /obj/item/organ/external/attempt_become_organ(obj/item/organ/external/parent,mob/living/carbon/human/H) if(parent_organ != parent.limb_name) - return 0 + return FALSE replaced(H) - return 1 + return TRUE /**************************************************** DAMAGE PROCS @@ -666,7 +666,7 @@ Note that amputating the affected organ does in fact remove the infection from t status &= ~ORGAN_INT_BLEEDING perma_injury = 0 -/obj/item/organ/external/robotize(company, make_tough = 0, convert_all = 1) +/obj/item/organ/external/robotize(company, make_tough = FALSE, convert_all = TRUE) ..() //robot limbs take reduced damage if(!make_tough) @@ -781,7 +781,7 @@ Note that amputating the affected organ does in fact remove the infection from t if(isnull(O)) O = owner if(!istype(O)) // You're not the primary organ of ANYTHING, bucko - return 0 + return FALSE return src == O.bodyparts_by_name[limb_name] /obj/item/organ/external/proc/infection_check() diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index c2b59d7b3e3..ded517893a5 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -114,9 +114,9 @@ /obj/item/organ/internal/attempt_become_organ(obj/item/organ/external/parent,mob/living/carbon/human/H) if(parent_organ != parent.limb_name) - return 0 + return FALSE insert(H) - return 1 + return TRUE // Rendering! /obj/item/organ/internal/proc/render() diff --git a/code/modules/surgery/organs/subtypes/kidan.dm b/code/modules/surgery/organs/subtypes/kidan.dm index 33574ef8104..58d360e6d4e 100644 --- a/code/modules/surgery/organs/subtypes/kidan.dm +++ b/code/modules/surgery/organs/subtypes/kidan.dm @@ -61,11 +61,11 @@ /obj/item/organ/internal/lantern/proc/toggle_biolum(statoverride) if(!statoverride && owner.incapacitated()) to_chat(owner, "You cannot alter your bioluminescence in your current state.") - return 0 + return FALSE if(!statoverride && owner.nutrition < KIDAN_LANTERN_MINHUNGER) to_chat(owner, "You're too hungry to be bioluminescent!") - return 0 + return FALSE if(!colour) colour = BlendRGB(owner.m_colours["head"], owner.m_colours["body"], 0.65) diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 466157d9d7e..36038f7c807 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -5,18 +5,18 @@ steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw, /datum/surgery_step/open_encased/retract, /datum/surgery_step/internal/manipulate_organs, /datum/surgery_step/glue_bone, /datum/surgery_step/set_bone,/datum/surgery_step/finish_bone,/datum/surgery_step/generic/cauterize) possible_locs = list("chest","head") - requires_organic_bodypart = 1 + requires_organic_bodypart = TRUE /datum/surgery/organ_manipulation/soft possible_locs = list("groin", "eyes", "mouth") steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/internal/manipulate_organs,/datum/surgery_step/generic/cauterize) - requires_organic_bodypart = 1 + requires_organic_bodypart = TRUE /datum/surgery/organ_manipulation_boneless name = "Organ Manipulation" possible_locs = list("chest","head","groin", "eyes", "mouth", "l_arm", "r_arm") steps = list(/datum/surgery_step/generic/cut_open,/datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/internal/manipulate_organs,/datum/surgery_step/generic/cauterize) - requires_organic_bodypart = 1 + requires_organic_bodypart = TRUE /datum/surgery/organ_manipulation/alien name = "Alien Organ Manipulation" @@ -31,12 +31,12 @@ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) // I'd like to see you do surgery on LITERALLY NOTHING - return 0 + return FALSE if(affected.is_robotic()) - return 0 + return FALSE if(!affected.encased) //no bone, problem. - return 0 - return 1 + return FALSE + return TRUE /datum/surgery/organ_manipulation_boneless/can_start(mob/user, mob/living/carbon/target) if(istype(target,/mob/living/carbon/human)) @@ -44,24 +44,23 @@ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(affected && affected.is_robotic()) - return 0//no operating on robotic limbs in an organic surgery + return FALSE//no operating on robotic limbs in an organic surgery if(!affected) // I'd like to see you do surgery on LITERALLY NOTHING - return 0 + return FALSE if(affected && affected.encased) //no bones no problem. - return 0 - return 1 + return FALSE + return TRUE /datum/surgery/organ_manipulation/alien/can_start(mob/user, mob/living/carbon/target) if(istype(target,/mob/living/carbon/alien/humanoid)) - return 1 - else return 0 + return TRUE + return FALSE // Internal surgeries. /datum/surgery_step/internal - priority = 2 - can_infect = 1 + can_infect = TRUE blood_level = 1 @@ -137,7 +136,7 @@ if(C.reagents.total_volume <= 0) //end_step handles if there is not enough reagent user.visible_message("[user] notices [tool] is empty.", \ "You notice [tool] is empty.") - return 0 + return FALSE var/msg = "[user] starts pouring some of [tool] over [target]'s [I.name]." var/self_msg = "You start pouring some of [tool] over [target]'s [I.name]." @@ -260,7 +259,7 @@ return FALSE if(!user.drop_item()) to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!") - return 0 + return FALSE I.insert(target) spread_germs_to_organ(I, user, tool) @@ -313,7 +312,7 @@ if(R.total_volume < GHETTO_DISINFECT_AMOUNT) user.visible_message("[user] notices there is not enough in [tool].", \ "You notice there is not enough in [tool].") - return 0 + return FALSE if(I.germ_level < INFECTION_LEVEL_ONE / 2) to_chat(user, "[I] does not appear to be infected.") if(I.germ_level >= INFECTION_LEVEL_ONE / 2) @@ -341,9 +340,9 @@ var/self_msg = "You pull [target]'s flesh back into place with [tool]." user.visible_message(msg, self_msg) - return 1 + return TRUE - return 0 + return FALSE /datum/surgery_step/internal/manipulate_organs/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery) if(current_type == "mend") @@ -367,7 +366,7 @@ if(I && I.damage && !(I.tough)) I.receive_damage(dam_amt,0) - return 0 + return FALSE else if(current_type == "insert") user.visible_message(" [user]'s hand slips, damaging [tool]!", \ @@ -376,7 +375,7 @@ if(istype(I) && !I.tough) I.receive_damage(rand(3,5),0) - return 0 + return FALSE else if(current_type == "clean") if(!hasorgans(target)) @@ -402,7 +401,7 @@ user.visible_message(" [user]'s hand slips, splashing the contents of [tool] all over [target]'s [affected.name] incision!", \ " Your hand slips, splashing the contents of [tool] all over [target]'s [affected.name] incision!") - return 0 + return FALSE else if(current_type == "extract") if(I && I.owner == target) @@ -416,7 +415,7 @@ else user.visible_message("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!", "You can't extract anything from [target]'s [parse_zone(target_zone)]!") - return 0 + return FALSE else if(current_type == "finish") if(affected && affected.encased) @@ -430,10 +429,10 @@ user.visible_message(msg, self_msg) if(affected) affected.receive_damage(20) - return 0 + return FALSE - return 0 + return FALSE ////////////////////////////////////////////////////////////////// @@ -461,13 +460,13 @@ user.visible_message(" [user] has cut [target]'s [target_zone] open with [tool].", \ " You have cut [target]'s [target_zone] open with [tool].") - return 1 + return TRUE /datum/surgery_step/saw_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery) user.visible_message(" [user]'s hand slips, cracking [target]'s [target_zone] with [tool]!" , \ " Your hand slips, cracking [target]'s [target_zone] with [tool]!" ) - return 0 + return FALSE /datum/surgery_step/cut_carapace name = "cut carapace" @@ -494,13 +493,13 @@ user.visible_message(" [user] has made an incision on [target]'s [target_zone] with [tool].", \ " You have made an incision on [target]'s [target_zone] with [tool].",) - return 1 + return TRUE /datum/surgery_step/cut_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery) user.visible_message(" [user]'s hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!", \ " Your hand slips, slicing open [target]'s [target_zone] in a wrong spot with [tool]!") - return 0 + return FALSE /datum/surgery_step/retract_carapace name = "retract carapace" @@ -536,7 +535,7 @@ msg = " [user] keeps the incision open on [target]'s lower abdomen with [tool]." self_msg = " You keep the incision open on [target]'s lower abdomen with [tool]." user.visible_message(msg, self_msg) - return 1 + return TRUE /datum/surgery_step/generic/retract_carapace/fail_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool,datum/surgery/surgery) var/msg = " [user]'s hand slips, tearing the edges of incision on [target]'s [target_zone] with [tool]!" @@ -548,4 +547,4 @@ msg = " [user]'s hand slips, damaging several organs [target]'s lower abdomen with [tool]" self_msg = " Your hand slips, damaging several organs [target]'s lower abdomen with [tool]!" user.visible_message(msg, self_msg) - return 0 + return FALSE diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 39e010e4d85..985ffc7308a 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -23,11 +23,11 @@ var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(affected.is_robotic()) - return 0 - return 1 - return 0 + return FALSE + return TRUE + return FALSE /datum/surgery/bleeding/can_start(mob/user, mob/living/carbon/target) if(ishuman(target)) @@ -46,17 +46,17 @@ var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!hasorgans(target)) - return 0 + return FALSE if(!affected) - return 0 + return FALSE if(!(affected.status & ORGAN_DEAD)) - return 0 + return FALSE - return 1 + return TRUE - return 0 + return FALSE /datum/surgery_step/fix_vein name = "mend internal bleeding" @@ -64,7 +64,7 @@ /obj/item/FixOVein = 100, \ /obj/item/stack/cable_coil = 90 ) - can_infect = 1 + can_infect = TRUE blood_level = 1 time = 32 @@ -94,7 +94,7 @@ var/mob/living/carbon/human/U = user U.bloody_hands(target, 0) - return 1 + return TRUE /datum/surgery_step/fix_vein/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -102,7 +102,7 @@ " Your hand slips, smearing [tool] in the incision in [target]'s [affected.name]!") affected.receive_damage(5, 0) - return 0 + return FALSE /datum/surgery_step/fix_dead_tissue //Debridement name = "remove dead tissue" @@ -112,23 +112,23 @@ /obj/item/shard = 60, \ ) - can_infect = 1 + can_infect = TRUE blood_level = 1 time = 16 /datum/surgery_step/fix_dead_tissue/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(!hasorgans(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) - return 0 + return FALSE if(!(affected.status & ORGAN_DEAD)) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/fix_dead_tissue/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -143,7 +143,7 @@ " You have cut away necrotic tissue in [target]'s [affected.name] with \the [tool].") affected.open = 3 - return 1 + return TRUE /datum/surgery_step/fix_dead_tissue/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -151,7 +151,7 @@ " Your hand slips, slicing an artery inside [target]'s [affected.name] with \the [tool]!") affected.receive_damage(20) - return 0 + return FALSE /datum/surgery_step/treat_necrosis name = "treat necrosis" @@ -165,28 +165,28 @@ /obj/item/reagent_containers/glass/bucket = 50 ) - can_infect = 0 + can_infect = FALSE blood_level = 0 time = 24 /datum/surgery_step/treat_necrosis/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(!istype(tool, /obj/item/reagent_containers)) - return 0 + return FALSE var/obj/item/reagent_containers/container = tool if(!container.reagents.has_reagent("mitocholide")) user.visible_message("[user] looks at \the [tool] and ponders." , \ "You are not sure if \the [tool] contains mitocholide to treat the necrosis.") - return 0 + return FALSE if(!hasorgans(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!(affected.status & ORGAN_DEAD)) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/treat_necrosis/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -199,7 +199,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!istype(tool, /obj/item/reagent_containers)) - return 0 + return FALSE var/obj/item/reagent_containers/container = tool var/mitocholide = 0 @@ -218,7 +218,7 @@ user.visible_message(" [user] applies [trans] units of the solution to affected tissue in [target]'s [affected.name]", \ " You apply [trans] units of the solution to affected tissue in [target]'s [affected.name] with \the [tool].") - return 1 + return TRUE /datum/surgery_step/treat_necrosis/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) diff --git a/code/modules/surgery/remove_embedded_object.dm b/code/modules/surgery/remove_embedded_object.dm index 098e92ca4af..0b7a5e3bbe9 100644 --- a/code/modules/surgery/remove_embedded_object.dm +++ b/code/modules/surgery/remove_embedded_object.dm @@ -9,24 +9,24 @@ /datum/surgery/embedded_removal/can_start(mob/user, mob/living/carbon/human/target) if(!istype(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(affected.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery/embedded_removal/synth/can_start(mob/user, mob/living/carbon/human/target) if(!istype(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(!affected.is_robotic()) - return 0 + return FALSE - return 1 + return TRUE /datum/surgery_step/remove_object name = "Remove Embedded Objects" @@ -63,4 +63,4 @@ else to_chat(user, "You can't find [target]'s [parse_zone(user.zone_selected)], let alone any objects embedded in it!") - return 1 + return TRUE diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index d5e08e049fa..b8b86922c8e 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -27,46 +27,46 @@ var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(!affected.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery/cybernetic_amputation/can_start(mob/user, mob/living/carbon/target) if(istype(target,/mob/living/carbon/human)) var/mob/living/carbon/human/H = target var/obj/item/organ/external/affected = H.get_organ(user.zone_selected) if(!affected) - return 0 + return FALSE if(!affected.is_robotic()) - return 0 + return FALSE if(affected.limb_flags & CANNOT_DISMEMBER) return FALSE - return 1 + return TRUE //to do, moar surgerys or condense down ala manipulate organs. /datum/surgery_step/robotics - can_infect = 0 + can_infect = FALSE /datum/surgery_step/robotics/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(!istype(target)) - return 0 + return FALSE if(!hasorgans(target)) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(affected == null) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/robotics/external /datum/surgery_step/robotics/external/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(!..()) - return 0 + return FALSE var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected.is_robotic()) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/robotics/external/unscrew_hatch name = "unscrew hatch" @@ -82,8 +82,8 @@ if(..()) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/robotics/external/unscrew_hatch/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -96,13 +96,13 @@ user.visible_message(" [user] has opened the maintenance hatch on [target]'s [affected.name] with \the [tool].", \ " You have opened the maintenance hatch on [target]'s [affected.name] with \the [tool].",) affected.open = 1 - return 1 + return TRUE /datum/surgery_step/robotics/external/unscrew_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s [tool.name] slips, failing to unscrew [target]'s [affected.name].", \ " Your [tool] slips, failing to unscrew [target]'s [affected.name].") - return 0 + return FALSE /datum/surgery_step/robotics/external/open_hatch name = "open hatch" @@ -118,8 +118,8 @@ if(..()) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/robotics/external/open_hatch/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -132,13 +132,13 @@ user.visible_message(" [user] opens the maintenance hatch on [target]'s [affected.name] with \the [tool].", \ " You open the maintenance hatch on [target]'s [affected.name] with \the [tool]." ) affected.open = 2 - return 1 + return TRUE /datum/surgery_step/robotics/external/open_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s [tool.name] slips, failing to open the hatch on [target]'s [affected.name].", " Your [tool] slips, failing to open the hatch on [target]'s [affected.name].") - return 0 + return FALSE /datum/surgery_step/robotics/external/close_hatch name = "close hatch" @@ -154,8 +154,8 @@ if(..()) var/obj/item/organ/external/affected = target.get_organ(target_zone) if(!affected) - return 0 - return 1 + return FALSE + return TRUE /datum/surgery_step/robotics/external/close_hatch/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -168,13 +168,13 @@ user.visible_message(" [user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].", \ " You close and secure the hatch on [target]'s [affected.name] with \the [tool].") affected.open = 0 - return 1 + return TRUE /datum/surgery_step/robotics/external/close_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].", " Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].") - return 0 + return FALSE /datum/surgery_step/robotics/external/repair name = "repair damage internally" @@ -256,8 +256,8 @@ user.visible_message(" [user] closes and secures the hatch on [target]'s [affected.name] with \the [tool].", \ " You close and secure the hatch on [target]'s [affected.name] with \the [tool].") affected.open = 0 - return 1 - return 0 + return TRUE + return FALSE /datum/surgery_step/robotics/external/repair/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/obj/item/organ/external/affected = target.get_organ(target_zone) @@ -273,7 +273,7 @@ if("finish") user.visible_message(" [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].", " Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].") - return 0 + return FALSE ///////condenseing remove/extract/repair here. ///////////// /datum/surgery_step/robotics/manipulate_robotic_organs @@ -430,7 +430,7 @@ if(!user.canUnEquip(I, 0)) to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!") - return 0 + return FALSE user.drop_item() I.insert(target) @@ -467,8 +467,8 @@ " You close and secure the hatch on [target]'s [affected.name] with \the [tool].") affected.open = 0 affected.germ_level = 0 - return 1 - return 0 + return TRUE + return FALSE /datum/surgery_step/robotics/manipulate_robotic_organs/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) @@ -502,7 +502,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message(" [user]'s [tool.name] slips, failing to close the hatch on [target]'s [affected.name].", " Your [tool.name] slips, failing to close the hatch on [target]'s [affected.name].") - return 0 + return FALSE /datum/surgery_step/robotics/external/amputate @@ -533,13 +533,13 @@ if(istype(thing,/obj/item)) user.put_in_hands(thing) - return 1 + return TRUE /datum/surgery_step/robotics/external/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) user.visible_message(" [user]'s hand slips!", \ " Your hand slips!") - return 0 + return FALSE /datum/surgery/cybernetic_customization name = "Cybernetic Appearance Customization" diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 29d37d6b3c0..b7678479abc 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -2,29 +2,21 @@ /datum/surgery var/name var/status = 1 - var/list/steps = list() - /* - var/eyes = 0 - var/face = 0 - var/appendix = 0 - var/ribcage = 0 - var/head_reattach = 0 //Steps in a surgery - */ - - var/can_cancel = 1 - var/step_in_progress = 0 + var/list/steps = list() //Steps in a surgery + var/can_cancel = TRUE + var/step_in_progress = FALSE var/list/in_progress = list() //Actively performing a Surgery var/location = "chest" //Surgery location - var/requires_organic_bodypart = 1 //Prevents you from performing an operation on robotic limbs + var/requires_organic_bodypart = TRUE //Prevents you from performing an operation on robotic limbs var/list/possible_locs = list() //Multiple locations -- c0 var/obj/item/organ/organ_ref //Operable body part var/current_organ = "organ" var/list/allowed_mob = list(/mob/living/carbon/human) /datum/surgery/proc/can_start(mob/user, mob/living/carbon/target) - // if 0 surgery wont show up in list + // if FALSE surgery wont show up in list // put special restrictions here - return 1 + return TRUE /datum/surgery/proc/next_step(mob/user, mob/living/carbon/target) @@ -33,8 +25,8 @@ var/datum/surgery_step/S = get_surgery_step() if(S) if(S.try_op(user, target, user.zone_selected, user.get_active_hand(), src)) - return 1 - return 0 + return TRUE + return FALSE /datum/surgery/proc/get_surgery_step() var/step_type = steps[status] @@ -49,8 +41,6 @@ /* SURGERY STEPS */ /datum/surgery_step - var/priority = 0 //steps with higher priority would be attempted first - // type path referencing tools that can be used for this step, and how well are they suited for it var/list/allowed_tools = null var/implement_type = null @@ -59,51 +49,51 @@ var/time = 10 var/name - var/accept_hand = 0 //does the surgery step require an open hand? If true, ignores implements. Compatible with accept_any_item. - var/accept_any_item = 0 + var/accept_hand = FALSE //does the surgery step require an open hand? If true, ignores implements. Compatible with accept_any_item. + var/accept_any_item = FALSE // evil infection stuff that will make everyone hate me - var/can_infect = 0 + var/can_infect = FALSE //How much blood this step can get on surgeon. 1 - hands, 2 - full body. var/blood_level = 0 /datum/surgery_step/proc/try_op(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - var/success = 0 + var/success = FALSE if(accept_hand) if(!tool) - success = 1 + success = TRUE if(accept_any_item) if(tool && tool_quality(tool)) - success = 1 + success = TRUE else for(var/path in allowed_tools) if(istype(tool, path)) implement_type = path if(tool_quality(tool)) - success = 1 + success = TRUE if(success) if(target_zone == surgery.location) initiate(user, target, target_zone, tool, surgery) - return 1//returns 1 so we don't stab the guy in the dick or wherever. - return 0 + return TRUE //returns TRUE so we don't stab the guy in the dick or wherever. + return FALSE /datum/surgery_step/proc/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) if(!can_use(user, target, target_zone, tool, surgery)) return - surgery.step_in_progress = 1 + surgery.step_in_progress = TRUE var/speed_mod = 1 if(begin_step(user, target, target_zone, tool, surgery) == -1) - surgery.step_in_progress = 0 + surgery.step_in_progress = FALSE return if(tool) speed_mod = tool.toolspeed if(do_after(user, time * speed_mod, target = target)) - var/advance = 0 + var/advance = FALSE var/prob_chance = 100 if(implement_type) //this means it isn't a require nd or any item step. @@ -127,17 +117,17 @@ if(prob(prob_chance) || isrobot(user)) if(end_step(user, target, target_zone, tool, surgery)) - advance = 1 + advance = TRUE else if(fail_step(user, target, target_zone, tool, surgery)) - advance = 1 + advance = TRUE if(advance) surgery.status++ if(surgery.status > surgery.steps.len) surgery.complete(target) - surgery.step_in_progress = 0 + surgery.step_in_progress = FALSE //returns how well tool is suited for this step /datum/surgery_step/proc/tool_quality(obj/item/tool) @@ -154,7 +144,7 @@ // checks whether this step can be applied with the given user and target /datum/surgery_step/proc/can_use(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) - return 1 + return TRUE // does stuff to begin the step, usually just printing messages. Moved germs transfering and bloodying here too /datum/surgery_step/proc/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) @@ -215,19 +205,3 @@ O.germ_level += germs E.germ_level += germs - -/proc/sort_surgeries() - var/gap = GLOB.surgery_steps.len - var/swapped = 1 - while(gap > 1 || swapped) - swapped = 0 - if(gap > 1) - gap = round(gap / 1.247330950103979) - if(gap < 1) - gap = 1 - for(var/i = 1; gap + i <= GLOB.surgery_steps.len; i++) - var/datum/surgery_step/l = GLOB.surgery_steps[i] //Fucking hate - var/datum/surgery_step/r = GLOB.surgery_steps[gap+i] //how lists work here - if(l.priority < r.priority) - GLOB.surgery_steps.Swap(i, gap + i) - swapped = 1 diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 2b969320644..eeb8e92d14c 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -52,7 +52,7 @@ materials = list(MAT_METAL=10000, MAT_GLASS=6000) flags = CONDUCT force = 15.0 - sharp = 1 + sharp = TRUE w_class = WEIGHT_CLASS_NORMAL origin_tech = "materials=1;biotech=1" attack_verb = list("drilled") @@ -77,7 +77,7 @@ item_state = "scalpel" flags = CONDUCT force = 10.0 - sharp = 1 + sharp = TRUE w_class = WEIGHT_CLASS_TINY throwforce = 5.0 throw_speed = 3 @@ -141,7 +141,7 @@ mob_throw_hit_sound = 'sound/weapons/pierce.ogg' flags = CONDUCT force = 15.0 - sharp = 1 + sharp = TRUE w_class = WEIGHT_CLASS_NORMAL throwforce = 9.0 throw_speed = 3