From 2fe2418c0feedde744408b2cd214e19f75798772 Mon Sep 17 00:00:00 2001
From: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Date: Fri, 22 Sep 2023 13:39:00 -0700
Subject: [PATCH] Fix ghosts/godmode mobs causing supermatter resonance
 (#78492)

## About The Pull Request

Adds the incorporeal/godmode check to living mob interactions with the
supermatter. Already in hand_hit() but there are other procs that can be
triggered as well.

## Why It's Good For The Game

Ghost animals, revenants, mobs with godmode enabled should not cause
supermatter resonance messages when interacting with it.

Fixes https://github.com/tgstation/tgstation/issues/78490

## Changelog

:cl: LT3
fix: Ghosts and godmode mobs will no longer create resonance when
touching the supermatter crystal
/:cl:
---
 code/datums/components/supermatter_crystal.dm | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/code/datums/components/supermatter_crystal.dm b/code/datums/components/supermatter_crystal.dm
index bfb29593269..a9bdfc5b154 100644
--- a/code/datums/components/supermatter_crystal.dm
+++ b/code/datums/components/supermatter_crystal.dm
@@ -60,6 +60,10 @@
 
 /datum/component/supermatter_crystal/proc/paw_hit(datum/source, mob/user, list/modifiers)
 	SIGNAL_HANDLER
+	if(isliving(user))
+		var/mob/living/living_mob = user
+		if(living_mob.incorporeal_move || living_mob.status_flags & GODMODE)
+			return
 	if(isalien(user))
 		dust_mob(source, user, cause = "alien attack")
 		return
@@ -67,6 +71,8 @@
 
 /datum/component/supermatter_crystal/proc/animal_hit(datum/source, mob/living/simple_animal/user, list/modifiers)
 	SIGNAL_HANDLER
+	if(user.incorporeal_move || user.status_flags & GODMODE)
+		return
 	var/atom/atom_source = source
 	var/murder
 	if(!user.melee_damage_upper && !user.melee_damage_lower)
@@ -84,6 +90,10 @@
 
 /datum/component/supermatter_crystal/proc/unarmed_hit(datum/source, mob/user, list/modifiers)
 	SIGNAL_HANDLER
+	if(isliving(user))
+		var/mob/living/living_mob = user
+		if(living_mob.incorporeal_move || living_mob.status_flags & GODMODE)
+			return
 	var/atom/atom_source = source
 	if(iscyborg(user) && atom_source.Adjacent(user))
 		dust_mob(source, user, cause = "cyborg attack")
@@ -96,14 +106,12 @@
 
 /datum/component/supermatter_crystal/proc/hand_hit(datum/source, mob/living/user, list/modifiers)
 	SIGNAL_HANDLER
-	var/atom/atom_source = source
 	if(user.incorporeal_move || user.status_flags & GODMODE)
 		return
-
 	if(user.zone_selected != BODY_ZONE_PRECISE_MOUTH)
 		dust_mob(source, user, cause = "hand")
 		return
-
+	var/atom/atom_source = source
 	if(!user.is_mouth_covered())
 		if(user.combat_mode)
 			dust_mob(source, user,
@@ -185,6 +193,8 @@
 		return
 
 	if(atom_source.Adjacent(user)) //if the item is stuck to the person, kill the person too instead of eating just the item.
+		if(user.incorporeal_move || user.status_flags & GODMODE)
+			return
 		var/vis_msg = span_danger("[user] reaches out and touches [atom_source] with [item], inducing a resonance... [item] starts to glow briefly before the light continues up to [user]'s body. [user.p_They()] burst[user.p_s()] into flames before flashing into dust!")
 		var/mob_msg = span_userdanger("You reach out and touch [atom_source] with [item]. Everything starts burning and all you can hear is ringing. Your last thought is \"That was not a wise decision.\"")
 		dust_mob(source, user, vis_msg, mob_msg)
@@ -198,6 +208,10 @@
 
 /datum/component/supermatter_crystal/proc/bumped_hit(datum/source, atom/movable/hit_object)
 	SIGNAL_HANDLER
+	if(isliving(hit_object))
+		var/mob/living/hit_mob = hit_object
+		if(hit_mob.incorporeal_move || hit_mob.status_flags & GODMODE)
+			return
 	var/atom/atom_source = source
 	var/obj/machinery/power/supermatter_crystal/our_supermatter = parent // Why is this a component?
 	if(istype(our_supermatter))
@@ -224,9 +238,9 @@
 	return FALL_INTERCEPTED | FALL_NO_MESSAGE
 
 /datum/component/supermatter_crystal/proc/dust_mob(datum/source, mob/living/nom, vis_msg, mob_msg, cause)
-	var/atom/atom_source = source
 	if(nom.incorporeal_move || nom.status_flags & GODMODE) //try to keep supermatter sliver's + hemostat's dust conditions in sync with this too
 		return
+	var/atom/atom_source = source
 	if(!vis_msg)
 		vis_msg = span_danger("[nom] reaches out and touches [atom_source], inducing a resonance... [nom.p_their()] body starts to glow and burst into flames before flashing into dust!")
 	if(!mob_msg)