[MIRROR] Fixes surgeries runtiming constantly when having the surgery…

… initator open, fixes some surgeries missing sounds (#1867) * Fixes surgeries runtiming constantly when having the surgery initator open, fixes some surgeries missing sounds (#81307) Fixes #79318 - See the issue for more information. I fixed the runtimes as expected, and then removed `SURGERY_REQUIRE_LIMB` from some surgeries which don't actually require a limb, such as implant removal, dissection, and living revival. I could've easily missed some, and as a result some surgeries are lost to the void and unselectable, but from what I could tell in testing it seems... fine. - Adds `SHOULD_CALL_PARENT` to surgery `can_start`. Cleans up some surgery `can_start` overrides. - Adds missing sounds to puncture repair surgery. :cl: Melbert fix: Fixed Puncture Repair surgery not having surgical sounds fix: Fixed Surgery Initiator potentially showing invalid surgeries /:cl: * Fixes surgeries runtiming constantly when having the surgery initator open, fixes some surgeries missing sounds * Update robot_brain_surgery.dm --------- Co-authored-by: NovaBot <[email protected]> Co-authored-by: MrMelbert <[email protected]> Co-authored-by: SomeRandomOwl <[email protected]> Co-authored-by: Iajret <[email protected]>
Fluffy-Frontier · Feb 21, 2024 · 62362ad · 62362ad
1 parent 5495bac
commit 62362ad
Show file tree

Hide file tree

Showing 22 changed files with 100 additions and 110 deletions.
diff --git a/code/datums/components/surgery_initiator.dm b/code/datums/components/surgery_initiator.dm
@@ -81,32 +81,31 @@
 /datum/component/surgery_initiator/proc/get_available_surgeries(mob/user, mob/living/target)
 	var/list/available_surgeries = list()
 
-	var/mob/living/carbon/carbon_target
-	var/obj/item/bodypart/affecting
-	if (iscarbon(target))
-		carbon_target = target
-		affecting = carbon_target.get_bodypart(check_zone(user.zone_selected))
+	var/obj/item/bodypart/affecting = target.get_bodypart(check_zone(user.zone_selected))
 
 	for(var/datum/surgery/surgery as anything in GLOB.surgeries_list)
 		if(!surgery.possible_locs.Find(user.zone_selected))
 			continue
-		if(affecting)
-			if(!(surgery.surgery_flags & SURGERY_REQUIRE_LIMB))
+		if(!is_type_in_list(target, surgery.target_mobtypes))
+			continue
+
+		if(isnull(affecting))
+			if(surgery.surgery_flags & SURGERY_REQUIRE_LIMB)
 				continue
+		else
 			if(surgery.requires_bodypart_type && !(affecting.bodytype & surgery.requires_bodypart_type))
 				continue
+			if(surgery.targetable_wound && !affecting.get_wound_type(surgery.targetable_wound))
+				continue
 			if((surgery.surgery_flags & SURGERY_REQUIRES_REAL_LIMB) && (affecting.bodypart_flags & BODYPART_PSEUDOPART))
 				continue
-		else if(carbon_target && (surgery.surgery_flags & SURGERY_REQUIRE_LIMB)) //mob with no limb in surgery zone when we need a limb
-			continue
+
 		if(IS_IN_INVALID_SURGICAL_POSITION(target, surgery))
 			continue
 		if(!surgery.can_start(user, target))
 			continue
-		for(var/path in surgery.target_mobtypes)
-			if(istype(target, path))
-				available_surgeries += surgery
-				break
+
+		available_surgeries += surgery
 
 	return available_surgeries
 
@@ -295,24 +294,20 @@
 		target.balloon_alert(user, "can't start the surgery!")
 		return
 
-	var/obj/item/bodypart/affecting_limb
-
 	var/selected_zone = user.zone_selected
+	var/obj/item/bodypart/affecting_limb = target.get_bodypart(check_zone(selected_zone))
 
-	if (iscarbon(target))
-		var/mob/living/carbon/carbon_target = target
-		affecting_limb = carbon_target.get_bodypart(check_zone(selected_zone))
-
-	if ((surgery.surgery_flags & SURGERY_REQUIRE_LIMB) == isnull(affecting_limb))
-		if (surgery.surgery_flags & SURGERY_REQUIRE_LIMB)
-			target.balloon_alert(user, "patient has no [parse_zone(selected_zone)]!")
-		else
-			target.balloon_alert(user, "patient has \a [parse_zone(selected_zone)]!")
+	if ((surgery.surgery_flags & SURGERY_REQUIRE_LIMB) && isnull(affecting_limb))
+		target.balloon_alert(user, "patient has no [parse_zone(selected_zone)]!")
 		return
 
-	if (!isnull(affecting_limb) && surgery.requires_bodypart_type && !(affecting_limb.bodytype & surgery.requires_bodypart_type))
-		target.balloon_alert(user, "not the right type of limb!")
-		return
+	if (!isnull(affecting_limb))
+		if(surgery.requires_bodypart_type && !(affecting_limb.bodytype & surgery.requires_bodypart_type))
+			target.balloon_alert(user, "not the right type of limb!")
+			return
+		if(surgery.targetable_wound && !affecting_limb.get_wound_type(surgery.targetable_wound))
+			target.balloon_alert(user, "no wound to operate on!")
+			return
 
 	// NOVA EDIT START - Limbs that can't be surgically removed
 	if (surgery.removes_target_bodypart && !isnull(affecting_limb) && !affecting_limb.can_be_surgically_removed)

diff --git a/code/modules/antagonists/abductor/equipment/abduction_surgery.dm b/code/modules/antagonists/abductor/equipment/abduction_surgery.dm
@@ -14,10 +14,12 @@
 /datum/surgery/organ_extraction/can_start(mob/user, mob/living/carbon/target)
 	if(!ishuman(user))
 		return FALSE
-	var/mob/living/carbon/human/H = user
-	if(H.dna.species.id == SPECIES_ABDUCTOR)
+	if(!..())
+		return FALSE
+	if(isabductor(user))
 		return TRUE
-	for(var/obj/item/implant/abductor/A in H.implants)
+	var/mob/living/non_abductor = user
+	if(locate(/obj/item/implant/abductor) in non_abductor.implants)
 		return TRUE
 	return FALSE
 

diff --git a/code/modules/surgery/autopsy.dm b/code/modules/surgery/autopsy.dm
@@ -10,7 +10,8 @@
 	)
 
 /datum/surgery/autopsy/can_start(mob/user, mob/living/patient)
-	. = ..()
+	if(!..())
+		return FALSE
 	if(patient.stat != DEAD)
 		return FALSE
 	if(HAS_TRAIT_FROM(patient, TRAIT_DISSECTED, AUTOPSY_TRAIT))

diff --git a/code/modules/surgery/bone_mending.dm b/code/modules/surgery/bone_mending.dm
@@ -20,13 +20,6 @@
 		/datum/surgery_step/close,
 	)
 
-/datum/surgery/repair_bone_hairline/can_start(mob/living/user, mob/living/carbon/target)
-	. = ..()
-	if(.)
-		var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected)
-		return(targeted_bodypart.get_wound_type(targetable_wound))
-
-
 ///// Repair Compound Fracture (Critical)
 /datum/surgery/repair_bone_compound
 	name = "Repair Compound Fracture"
@@ -49,12 +42,6 @@
 		/datum/surgery_step/close,
 	)
 
-/datum/surgery/repair_bone_compound/can_start(mob/living/user, mob/living/carbon/target)
-	. = ..()
-	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)
@@ -217,14 +204,6 @@
 		/datum/surgery_step/repair_skull
 	)
 
-/datum/surgery/cranial_reconstruction/can_start(mob/living/user, mob/living/carbon/target)
-	. = ..()
-	if(!.)
-		return FALSE
-
-	var/obj/item/bodypart/targeted_bodypart = target.get_bodypart(user.zone_selected)
-	return !isnull(targeted_bodypart.get_wound_type(targetable_wound))
-
 /datum/surgery_step/clamp_bleeders/discard_skull_debris
 	name = "discard skull debris (hemostat)"
 	implements = list(

diff --git a/code/modules/surgery/brain_surgery.dm b/code/modules/surgery/brain_surgery.dm
@@ -24,10 +24,7 @@
 	failure_sound = 'sound/surgery/organ2.ogg'
 
 /datum/surgery/brain_surgery/can_start(mob/user, mob/living/carbon/target)
-	var/obj/item/organ/internal/brain/target_brain = target.get_organ_slot(ORGAN_SLOT_BRAIN)
-	if(!target_brain)
-		return FALSE
-	return TRUE
+	return target.get_organ_slot(ORGAN_SLOT_BRAIN) && ..()
 
 /datum/surgery_step/fix_brain/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(

diff --git a/code/modules/surgery/burn_dressing.dm b/code/modules/surgery/burn_dressing.dm
@@ -20,12 +20,14 @@
 	)
 
 /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/flesh/burn_wound = targeted_bodypart.get_wound_type(targetable_wound)
-		return(burn_wound && burn_wound.infestation > 0)
+	. = ..()
+	if(!.)
+		return .
+
+	var/datum/wound/burn/flesh/burn_wound = target.get_bodypart(user.zone_selected).get_wound_type(targetable_wound)
+	// Should be guaranteed to have the wound by this point
+	ASSERT(burn_wound, "[type] on [target] has no burn wound when it should have been guaranteed to have one by can_start")
+	return burn_wound.infestation > 0
 
 //SURGERY STEPS
 

diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm
@@ -16,9 +16,7 @@
 	)
 
 /datum/surgery/core_removal/can_start(mob/user, mob/living/target)
-	if(target.stat == DEAD)
-		return TRUE
-	return FALSE
+	return target.stat == DEAD && ..()
 
 //extract brain
 /datum/surgery_step/extract_core

diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm
@@ -14,10 +14,9 @@
 
 /datum/surgery/coronary_bypass/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/heart/target_heart = target.get_organ_slot(ORGAN_SLOT_HEART)
-	if(target_heart)
-		if(target_heart.damage > 60 && !target_heart.operated)
-			return TRUE
-	return FALSE
+	if(isnull(target_heart) || target_heart.damage < 60 || target_heart.operated)
+		return FALSE
+	return ..()
 
 
 //an incision but with greater bleed, and a 90% base success chance

diff --git a/code/modules/surgery/ear_surgery.dm b/code/modules/surgery/ear_surgery.dm
@@ -23,10 +23,7 @@
 	time = 64
 
 /datum/surgery/ear_surgery/can_start(mob/user, mob/living/carbon/target)
-	var/obj/item/organ/internal/ears/target_ears = target.get_organ_slot(ORGAN_SLOT_EARS)
-	if(!target_ears)
-		return FALSE
-	return TRUE
+	return target.get_organ_slot(ORGAN_SLOT_EARS) && ..()
 
 /datum/surgery_step/fix_ears/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(

diff --git a/code/modules/surgery/experimental_dissection.dm b/code/modules/surgery/experimental_dissection.dm
@@ -10,16 +10,19 @@
 		/datum/surgery_step/experimental_dissection,
 		/datum/surgery_step/close,
 	)
-	surgery_flags = SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB | SURGERY_MORBID_CURIOSITY
+	surgery_flags = SURGERY_REQUIRE_RESTING | SURGERY_MORBID_CURIOSITY
 	possible_locs = list(BODY_ZONE_CHEST)
 	target_mobtypes = list(/mob/living)
 
 /datum/surgery/advanced/experimental_dissection/can_start(mob/user, mob/living/target)
 	. = ..()
+	if(!.)
+		return .
 	if(HAS_TRAIT_FROM(target, TRAIT_DISSECTED, EXPERIMENTAL_SURGERY_TRAIT))
 		return FALSE
 	if(target.stat != DEAD)
 		return FALSE
+	return .
 
 /datum/surgery_step/experimental_dissection
 	name = "dissection"
@@ -44,8 +47,7 @@
 		var/obj/item/research_notes/hand_dossier = user.get_inactive_held_item()
 		hand_dossier.merge(the_dossier)
 
-	var/obj/item/bodypart/target_chest = target.get_bodypart(BODY_ZONE_CHEST)
-	target.apply_damage(80, BRUTE, target_chest)
+	target.apply_damage(80, BRUTE, BODY_ZONE_CHEST)
 	ADD_TRAIT(target, TRAIT_DISSECTED, EXPERIMENTAL_SURGERY_TRAIT)
 	return ..()
 
@@ -61,8 +63,7 @@
 		var/obj/item/research_notes/hand_dossier = user.get_inactive_held_item()
 		hand_dossier.merge(the_dossier)
 
-	var/obj/item/bodypart/L = target.get_bodypart(BODY_ZONE_CHEST)
-	target.apply_damage(80, BRUTE, L)
+	target.apply_damage(80, BRUTE, BODY_ZONE_CHEST)
 	return TRUE
 
 ///Calculates how many research points dissecting 'target' is worth.

diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
@@ -21,8 +21,7 @@
 	time = 64
 
 /datum/surgery/eye_surgery/can_start(mob/user, mob/living/carbon/target)
-	var/obj/item/organ/internal/eyes/target_eyes = target.get_organ_slot(ORGAN_SLOT_EYES)
-	return !isnull(target_eyes)
+	return target.get_organ_slot(ORGAN_SLOT_EYES) && ..()
 
 /datum/surgery_step/fix_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(

diff --git a/code/modules/surgery/gastrectomy.dm b/code/modules/surgery/gastrectomy.dm
@@ -16,10 +16,9 @@
 
 /datum/surgery/gastrectomy/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/stomach/target_stomach = target.get_organ_slot(ORGAN_SLOT_STOMACH)
-	if(target_stomach)
-		if(target_stomach.damage > 50 && !target_stomach.operated)
-			return TRUE
-	return FALSE
+	if(isnull(target_stomach) || target_stomach.damage < 50 || target_stomach.operated)
+		return FALSE
+	return ..()
 
 ////Gastrectomy, because we truly needed a way to repair stomachs.
 //95% chance of success to be consistent with most organ-repairing surgeries.
@@ -72,4 +71,3 @@
 		span_warning("[user] cuts the wrong part of [target]'s stomach!"),
 	)
 	display_pain(target, "Your stomach throbs with pain; it's not getting any better!")
-
diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm
@@ -2,7 +2,7 @@
 	target_mobtypes = list(/mob/living)
 	requires_bodypart_type = BODYTYPE_ORGANIC //NOVA EDIT CHANGE - ORIGINAL VALUE: requires_bodypart_type = FALSE
 	replaced_by = /datum/surgery
-	surgery_flags = SURGERY_IGNORE_CLOTHES | SURGERY_REQUIRE_RESTING | SURGERY_REQUIRE_LIMB
+	surgery_flags = SURGERY_IGNORE_CLOTHES | SURGERY_REQUIRE_RESTING
 	possible_locs = list(BODY_ZONE_CHEST)
 	steps = list(
 		/datum/surgery_step/incise,
@@ -18,16 +18,20 @@
 
 /datum/surgery/healing/can_start(mob/user, mob/living/patient)
 	. = ..()
+	if(!.)
+		return .
 	if(!(patient.mob_biotypes & (MOB_ORGANIC|MOB_HUMANOID)))
 		return FALSE
+	return .
 
 /datum/surgery/healing/New(surgery_target, surgery_location, surgery_bodypart)
 	..()
 	if(healing_step_type)
 		steps = list(
 			/datum/surgery_step/incise/nobleed,
 			healing_step_type, //hehe cheeky
-			/datum/surgery_step/close)
+			/datum/surgery_step/close,
+		)
 
 /datum/surgery_step/heal
 	name = "repair body (hemostat)"

diff --git a/code/modules/surgery/hepatectomy.dm b/code/modules/surgery/hepatectomy.dm
@@ -15,10 +15,9 @@
 
 /datum/surgery/hepatectomy/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/liver/target_liver = target.get_organ_slot(ORGAN_SLOT_LIVER)
-	if(target_liver)
-		if(target_liver.damage > 50 && !target_liver.operated)
-			return TRUE
-	return FALSE
+	if(isnull(target_liver) || target_liver.damage < 50 || target_liver.operated)
+		return FALSE
+	return ..()
 
 ////hepatectomy, removes damaged parts of the liver so that the liver may regenerate properly
 //95% chance of success, not 100 because organs are delicate

diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
@@ -2,6 +2,7 @@
 	name = "Implant Removal"
 	target_mobtypes = list(/mob/living)
 	possible_locs = list(BODY_ZONE_CHEST)
+	surgery_flags = SURGERY_REQUIRE_RESTING
 	steps = list(
 		/datum/surgery_step/incise,
 		/datum/surgery_step/clamp_bleeders,
@@ -83,6 +84,7 @@
 	name = "Implant Removal"
 	requires_bodypart_type = BODYTYPE_ROBOTIC
 	target_mobtypes = list(/mob/living/carbon/human) // Simpler mobs don't have bodypart types
+	surgery_flags = parent_type::surgery_flags | SURGERY_REQUIRE_LIMB
 	steps = list(
 		/datum/surgery_step/mechanic_open,
 		/datum/surgery_step/open_hatch,

diff --git a/code/modules/surgery/lipoplasty.dm b/code/modules/surgery/lipoplasty.dm
@@ -10,9 +10,9 @@
 	)
 
 /datum/surgery/lipoplasty/can_start(mob/user, mob/living/carbon/target)
-	if(HAS_TRAIT(target, TRAIT_FAT) && target.nutrition >= NUTRITION_LEVEL_WELL_FED)
-		return TRUE
-	return FALSE
+	if(!HAS_TRAIT(target, TRAIT_FAT) || target.nutrition >= NUTRITION_LEVEL_WELL_FED)
+		return FALSE
+	return ..()
 
 
 //cut fat
@@ -24,6 +24,10 @@
 		/obj/item/hatchet = 35,
 		/obj/item/knife/butcher = 25)
 	time = 64
+	preop_sound = list(
+		/obj/item/circular_saw = 'sound/surgery/saw.ogg',
+		/obj/item = 'sound/surgery/scalpel1.ogg',
+	)
 
 /datum/surgery_step/cut_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	user.visible_message(span_notice("[user] begins to cut away [target]'s excess fat."), span_notice("You begin to cut away [target]'s excess fat..."))
@@ -55,6 +59,8 @@
 		TOOL_SCREWDRIVER = 45,
 		TOOL_WIRECUTTER = 35)
 	time = 32
+	preop_sound = 'sound/surgery/retractor1.ogg'
+	success_sound = 'sound/surgery/retractor2.ogg'
 
 /datum/surgery_step/remove_fat/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(

diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm
@@ -13,10 +13,9 @@
 
 /datum/surgery/lobectomy/can_start(mob/user, mob/living/carbon/target)
 	var/obj/item/organ/internal/lungs/target_lungs = target.get_organ_slot(ORGAN_SLOT_LUNGS)
-	if(target_lungs)
-		if(target_lungs.damage > 60 && !target_lungs.operated)
-			return TRUE
-	return FALSE
+	if(isnull(target_lungs) || target_lungs.damage < 60 || target_lungs.operated)
+		return FALSE
+	return ..()
 
 
 //lobectomy, removes the most damaged lung lobe with a 95% base success chance