From 70d201b312e4fe5906c1cbf79fb7745b5e06d0dd Mon Sep 17 00:00:00 2001
From: joep van der velden <farie82@users.noreply.github.com>
Date: Mon, 26 Apr 2021 21:07:27 +0200
Subject: [PATCH 1/2] Fix 3 runtimes. Air alarms should be made to just use
 Init later on

---
 .../atmospherics/machinery/airalarm.dm        | 19 +++++++++----------
 code/modules/client/client_procs.dm           |  2 +-
 .../reagents/reagent_containers/spray.dm      |  2 ++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 13e2d7bcb16..18bbcc4cb81 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -197,13 +197,7 @@
 		apply_mode()
 
 /obj/machinery/alarm/New(loc, direction, building = 0)
-	. = ..()
-	GLOB.air_alarms += src
-	GLOB.air_alarms = sortAtom(GLOB.air_alarms)
-
-	wires = new(src)
-
-	if(building)
+	if(building) // Do this first since the Init uses this later on. TODO refactor to just use an Init
 		if(loc)
 			src.loc = loc
 
@@ -213,10 +207,15 @@
 		buildstage = 0
 		wiresexposed = 1
 		set_pixel_offsets_from_dir(-24, 24, -24, 24)
-		update_icon()
-		return
 
-	first_run()
+	. = ..()
+	GLOB.air_alarms += src
+	GLOB.air_alarms = sortAtom(GLOB.air_alarms)
+
+	wires = new(src)
+
+	if(!building)
+		first_run()
 
 /obj/machinery/alarm/Destroy()
 	SStgui.close_uis(wires)
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index fe1799b5048..455d7a38aff 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -680,7 +680,7 @@
 	if(query_find_link.NextRow())
 		if(query_find_link.item[1])
 			if(!fromban)
-				to_chat(src, "Your forum account is already set. (" + query_find_link.item[1] + ")")
+				to_chat(src, "Your forum account is already set. ([query_find_link.item[1]])")
 			qdel(query_find_link)
 			return
 	qdel(query_find_link)
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index 828040aae80..421824c73f0 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -78,6 +78,8 @@
 		for(var/atom/T in get_turf(D))
 			D.reagents.reaction(T)
 		sleep(3)
+		if(QDELETED(D))
+			return
 	qdel(D)
 
 

From d550a8379bee17e236db396d81ddc9ec44f03f16 Mon Sep 17 00:00:00 2001
From: joep van der velden <farie82@users.noreply.github.com>
Date: Mon, 26 Apr 2021 21:14:41 +0200
Subject: [PATCH 2/2] And another one!

---
 code/_onclick/hud/alert.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index 35c250abc32..b511fb40032 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -611,7 +611,7 @@ so as to remain in compliance with the most up-to-date laws."
 	if(stone)
 		if(alert(usr, "Do you want to be captured by [stoner]'s soul stone? This will destroy your corpse and make it \
 		impossible for you to get back into the game as your regular character.",, "No", "Yes") ==  "Yes")
-			stone.opt_in = TRUE
+			stone?.opt_in = TRUE
 
 /obj/screen/alert/notify_soulstone/Destroy()
 	stone = null