Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IDB IGNORE] [MDB IGNORE] HUD datum cleanup. #3114

Closed
wants to merge 32 commits into from
Closed

[IDB IGNORE] [MDB IGNORE] HUD datum cleanup. #3114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fc9ef41
Adding get_max_health() to mobs.
MistakeNot4892 Jul 24, 2023
74de147
Condensing updatehealth().
MistakeNot4892 Jul 24, 2023
1b02408
Removing unneeded health var setting.
MistakeNot4892 Jul 24, 2023
c2d4bf4
mob health > current_health.
MistakeNot4892 Jul 24, 2023
545294f
Post-rebase update.
MistakeNot4892 Aug 12, 2023
4eada00
updatehealth() => update_health()
MistakeNot4892 Aug 12, 2023
dead6e4
Adding update health skips to human organ init.
MistakeNot4892 Aug 12, 2023
97f8141
Reviewing calls to update_health().
MistakeNot4892 Aug 12, 2023
1fb2b67
Wrapping update_health() with adjustFooLoss() where possible.
MistakeNot4892 Aug 12, 2023
4b05e1a
Removing hivebot telebeacon and preventing drones from sparking in qdel.
MistakeNot4892 Aug 23, 2023
6b6aa24
Fixing runtimes in /mob/living creation/qdel.
MistakeNot4892 Aug 30, 2023
9623a75
Splitting up borer Life() proc.
MistakeNot4892 Jul 1, 2023
f725f56
Splitting up Ascent nymph Life() proc.
MistakeNot4892 Jul 1, 2023
f547224
Removing construct Life() overrides.
MistakeNot4892 Jul 2, 2023
da63fed
Collapsed deity life proc.
MistakeNot4892 Jul 2, 2023
0384393
Collapsing other Life() overrides.
MistakeNot4892 Jul 2, 2023
6384fed
Tweaking robot life() overrides.
MistakeNot4892 Jul 2, 2023
261f335
Collapsing more life overrides.
MistakeNot4892 Jul 2, 2023
ef668e9
Slime life override broken up.
MistakeNot4892 Jul 2, 2023
a7a75e8
Collapsing carbon/Life() into living/Life().
MistakeNot4892 Jul 2, 2023
cb2e54c
Dismantling simple_animal Life().
MistakeNot4892 Jul 2, 2023
2ff07e8
Dismantling exosuit Life().
MistakeNot4892 Jul 2, 2023
0b69a97
Further refinement of various life procs and processes.
MistakeNot4892 Jul 2, 2023
d7a3463
Cleaning up, condensing blinded status.
MistakeNot4892 Jul 2, 2023
0f33314
Dismantling human life().
MistakeNot4892 Jul 2, 2023
905a73d
Further refining status updates.
MistakeNot4892 Jul 2, 2023
a44a017
Dismantling pAI Life().
MistakeNot4892 Jul 2, 2023
817450b
Dismantling robot life().
MistakeNot4892 Jul 2, 2023
5640831
Dismantling AI life().
MistakeNot4892 Jul 2, 2023
a15e1be
Reverting some status changes.
MistakeNot4892 Jul 2, 2023
c536508
Post-rebase update.
MistakeNot4892 Jul 2, 2023
df08fd4
Condensed HUD rewrite commit, do not merge.
MistakeNot4892 Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions code/__defines/hud.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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); }
2 changes: 1 addition & 1 deletion code/__defines/mob_status.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
#define GET_STATUS(MOB, COND) (LAZYACCESS(MOB.status_counters, COND))
#define HAS_STATUS(MOB, COND) (GET_STATUS(MOB, COND) > 0)
#define ADJ_STATUS(MOB, COND, AMT) (MOB.set_status(COND, PENDING_STATUS(MOB, COND) + AMT))
#define SET_STATUS_MAX(MOB, COND, AMT) (MOB.set_status(COND, max(PENDING_STATUS(MOB, COND), AMT)))
#define SET_STATUS_MAX(MOB, COND, AMT) (MOB.set_status(COND, max(PENDING_STATUS(MOB, COND), AMT)))
4 changes: 2 additions & 2 deletions code/_onclick/click.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = MOUSE_OPACITY_PRIORITY
screen_loc = "CENTER-7,CENTER-7"
Expand Down
1 change: 0 additions & 1 deletion code/_onclick/hud/_defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading