From d3f0d63daa126fa78f3fb71c85bec424be22cbef Mon Sep 17 00:00:00 2001
From: Tetr4 <13362609+TetraK1@users.noreply.github.com>
Date: Sun, 23 Jun 2019 23:46:59 +0100
Subject: [PATCH] Fixes suiciding with anomaly cores (#44704)

About The Pull Request

Previously suiciding with an anomaly core would swallow it like a radio signaller, but you wouldn't die when signalled. Now you get gibbed when the anomaly core is signalled.
Why It's Good For The Game

Current is disappointing.
Changelog

clTetr4
fix: Suiciding with an anomaly core kills you properly
/cl
---
 code/modules/assembly/signaler.dm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index c78a16f1de3..29ab83e2cb7 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -24,7 +24,7 @@
 	return MANUAL_SUICIDE_NONLETHAL
 
 /obj/item/assembly/signaler/proc/manual_suicide(mob/living/carbon/user)
-	user.visible_message("<span class='suicide'>[user]'s \the [src] receives a signal, killing [user.p_them()] instantly!</span>")
+	user.visible_message("<span class='suicide'>[user]'s [src] receives a signal, killing [user.p_them()] instantly!</span>")
 	user.adjustOxyLoss(200)//it sends an electrical pulse to their heart, killing them. or something.
 	user.death(0)
 	user.set_suicide(TRUE)
@@ -196,10 +196,23 @@ Code:
 		return FALSE
 	if(signal.data["code"] != code)
 		return FALSE
+	if(suicider)
+		manual_suicide(suicider)
 	for(var/obj/effect/anomaly/A in get_turf(src))
 		A.anomalyNeutralize()
 	return TRUE
 
+/obj/item/assembly/signaler/anomaly/manual_suicide(mob/living/carbon/user)
+	user.visible_message("<span class='suicide'>[user]'s [src] is reacting to the radio signal, warping [user.p_their()] body!</span>")
+	user.set_suicide(TRUE)
+	user.suicide_log()
+	user.gib()
+
+/obj/item/assembly/signaler/anomaly/attackby(obj/item/I, mob/user, params)
+	if(I.tool_behaviour == TOOL_ANALYZER)
+		to_chat(user, "<span class='notice'>Analyzing... [src]'s stabilized field is fluctuating along frequency [format_frequency(frequency)], code [code].</span>")
+	..()
+
 /obj/item/assembly/signaler/anomaly/attack_self()
 	return