From 892d796ca3dd668472af940c0afccc4a3075d3d4 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Wed, 3 Aug 2016 19:25:53 -0400 Subject: [PATCH] Fixes Two Destroys --- code/_onclick/hud/alert.dm | 5 ++--- code/_onclick/hud/fullscreen.dm | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 543f02e8a79..f6b0e839e73 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -165,7 +165,7 @@ The box in your backpack has an oxygen tank and gas mask in it." name = "Too Cold" desc = "You're freezing cold! Get somewhere warmer and take off any insulating clothing like a space suit." icon_state = "cold" - + /obj/screen/alert/cold/drask name = "Cold" desc = "You're breathing supercooled gas! It's stimulating your metabolism to regenerate damaged tissue." @@ -400,8 +400,7 @@ so as to remain in compliance with the most up-to-date laws." return usr.client.Click(master, location, control, params) /obj/screen/alert/Destroy() - ..() severity = 0 master = null screen_loc = "" - return QDEL_HINT_QUEUE + return ..() diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 8ab49788e5b..fd0c91ded3a 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -63,9 +63,8 @@ var/severity = 0 /obj/screen/fullscreen/Destroy() - ..() severity = 0 - return QDEL_HINT_HARDDEL_NOW + return ..() /obj/screen/fullscreen/brute icon_state = "brutedamageoverlay"