[MIRROR] Corrects a few surgery moods [MDB IGNORE] (#2956)

* Corrects a few surgery moods (#83826) Missed these * Corrects a few surgery moods --------- Co-authored-by: Afevis <[email protected]> Co-authored-by: NovaBot13 <[email protected]>
Fluffy-Frontier · Jun 10, 2024 · b976e2d · b976e2d
1 parent cb9df0b
commit b976e2d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm
@@ -58,7 +58,11 @@
 		span_notice("[user] severs [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
 		span_notice("[user] severs [target]'s [target.parse_zone_with_bodypart(target_zone)]!"),
 	)
+<<<<<<< HEAD
 	display_pain(target, "You can no longer feel your severed [target.parse_zone_with_bodypart(target_zone)]!")
+=======
+	display_pain(target, "You can no longer feel your severed [target.parse_zone_with_bodypart(target_zone)]!", mood_event_type = /datum/mood_event/surgery/success)
+>>>>>>> 87348e1ba3e ([MIRROR] Corrects a few surgery moods [MDB IGNORE] (#2956))
 
 	if(HAS_MIND_TRAIT(user, TRAIT_MORBID) && ishuman(user))
 		var/mob/living/carbon/human/morbid_weirdo = user

diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm
@@ -68,6 +68,7 @@
 			span_warning("[user] screws up, causing blood to spurt out of [target_human]'s chest!"),
 			span_warning("[user] screws up, causing blood to spurt out of [target_human]'s chest!"),
 		)
+		display_pain(target, mood_event_type = /datum/mood_event/surgery/failure)
 		var/obj/item/bodypart/target_bodypart = target_human.get_bodypart(target_zone)
 		target_bodypart.adjustBleedStacks(10)
 		target_human.adjustOrganLoss(ORGAN_SLOT_HEART, 10)

diff --git a/code/modules/surgery/organic_steps.dm b/code/modules/surgery/organic_steps.dm
@@ -44,6 +44,13 @@
 				target_bodypart.adjustBleedStacks(10)
 	return ..()
 
+<<<<<<< HEAD
+=======
+/datum/surgery_step/incise/failure(mob/user, mob/living/target, target_zone, obj/item/tool, datum/surgery/surgery, fail_prob)
+	display_pain(target, mood_event_type = /datum/mood_event/surgery/failure)
+	return ..()
+
+>>>>>>> 87348e1ba3e ([MIRROR] Corrects a few surgery moods [MDB IGNORE] (#2956))
 /datum/surgery_step/incise/nobleed/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	display_results(
 		user,