Condensed HUD rewrite commit, do not merge.

NebulaSS13 · Jul 24, 2023 · c000015 · c000015
1 parent 9c7bf4a
commit c000015
Show file tree

Hide file tree

Showing 276 changed files with 2,250 additions and 2,390 deletions.
diff --git a/code/__defines/hud.dm b/code/__defines/hud.dm
@@ -0,0 +1,4 @@
+#define CLEAR_HUD_ALERTS(M)        if(istype(M?.hud_used, /datum/hud) && M.hud_used.alerts)                    { M.hud_used.alerts = null; }
+#define SET_HUD_ALERT(M, A, V)     if(istype(M?.hud_used, /datum/hud))                                         { LAZYSET(M.hud_used.alerts, A, V); }
+#define SET_HUD_ALERT_MIN(M, A, V) if(istype(M?.hud_used, /datum/hud) && V < LAZYACCESS(M.hud_used.alerts, A)) { LAZYSET(M.hud_used.alerts, A, V); }
+#define SET_HUD_ALERT_MAX(M, A, V) if(istype(M?.hud_used, /datum/hud) && V > LAZYACCESS(M.hud_used.alerts, A)) { LAZYSET(M.hud_used.alerts, A, V); }
diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
@@ -351,8 +351,8 @@ var/global/list/click_catchers
 	return global.click_catchers
 
 /obj/screen/click_catcher
-	icon = 'icons/mob/screen_gen.dmi'
-	icon_state = "click_catcher"
+	icon = 'icons/mob/screen/fill.dmi'
+	icon_state = "blank"
 	plane = CLICKCATCHER_PLANE
 	mouse_opacity = 2
 	screen_loc = "CENTER-7,CENTER-7"

diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm
@@ -74,7 +74,6 @@
 #define ui_up_hint "RIGHT-1:28,TOP-1:29"
 #define ui_toxin "RIGHT-1:28,TOP-2:27"
 #define ui_fire "RIGHT-1:28,TOP-3:25"
-#define ui_oxygen "RIGHT-1:28,TOP-4:23"
 #define ui_pressure "RIGHT-1:28,TOP-5:21"
 
 #define ui_alien_toxin "RIGHT-1:28,TOP-2:25"