No. Just no.

iWuna · Apr 25, 2022 · 50aed78 · 50aed78
1 parent 548db41
commit 50aed78
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
@@ -66,10 +66,13 @@
 		plane_masters["[instance.plane]"] = instance
 		instance.backdrop(mymob)
 
-/datum/hud/Destroy(mob/user)
-	qdel(hide_actions_toggle)
-	qdel(module_store_icon)
-	qdel(static_inventory)
+/datum/hud/Destroy()
+	if(mymob.hud_used == src)
+		mymob.hud_used = null
+
+	QDEL_NULL(hide_actions_toggle)
+	QDEL_NULL(module_store_icon)
+	QDEL_LIST(static_inventory)
 
 	inv_slots.Cut()
 	action_intent = null

diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
@@ -88,14 +88,14 @@
 	if(client)
 		client.move_delay = initial(client.move_delay)
 		client.screen += new /obj/screen/fullscreen/death
-	if(getToxLoss() > 20)
-		switch(rand(1,2))
-			if(1)
-				to_chat(src, sound('sound/f13effects/NAR_7.ogg',0,1,90))
-			else
-				to_chat(src, sound('sound/f13effects/NAR_5.ogg',0,1,90))
-	else
-		to_chat(src, sound('sound/f13effects/NAR_6.ogg',0,1,90))
+		if(getToxLoss() > 20)
+			switch(rand(1,2))
+				if(1)
+					to_chat(src, sound('sound/f13effects/NAR_7.ogg',0,1,90))
+				else
+					to_chat(src, sound('sound/f13effects/NAR_5.ogg',0,1,90))
+		else
+			to_chat(src, sound('sound/f13effects/NAR_6.ogg',0,1,90))
 	for(var/s in ownedSoullinks)
 		var/datum/soullink/S = s
 		S.ownerDies(gibbed)