Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
realforest2001 committed Aug 2, 2024
1 parent 6dacc27 commit 83e1539
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions code/__DEFINES/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@
#define NOTIFY_JOIN_XENO "join_xeno"
#define NOTIFY_XENO_TACMAP "xeno_tacmap"
#define NOTIFY_USCM_TACMAP "uscm_tacmap"

#define INHERENT_HUD_MEDICAL "med"
#define INHERENT_HUD_SECURITY "sec"
#define INHERENT_HUD_NEW_PLAYER "new"
10 changes: 5 additions & 5 deletions code/modules/admin/verbs/mentorhud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,20 @@
if(!ishuman(mentor))
to_chat(src, SPAN_WARNING("You cannot use this power as a non-human!"))
return FALSE
if(!mentor.looc_overhead)

if(!mentor.looc_overhead && !(mentor.inherent_huds_toggled[INHERENT_HUD_NEW_PLAYER]))
to_chat(src, SPAN_WARNING("You are not in a mentor role! (Overhead LOOC is disabled!)"))
return FALSE

var/datum/mob_hud/the_hud
var/chosen_HUD = 3
the_hud = GLOB.huds[MOB_HUD_NEW_PLAYER]

if(mentor.inherent_huds_toggled[chosen_HUD])
mentor.inherent_huds_toggled[chosen_HUD] = FALSE
if(mentor.inherent_huds_toggled[INHERENT_HUD_NEW_PLAYER])
mentor.inherent_huds_toggled[INHERENT_HUD_NEW_PLAYER] = FALSE
the_hud.remove_hud_from(mentor, mentor)
to_chat(mentor, SPAN_INFO("<B>New Player Markers Disabled</B>"))
else
mentor.inherent_huds_toggled[chosen_HUD] = TRUE
mentor.inherent_huds_toggled[INHERENT_HUD_NEW_PLAYER] = TRUE
the_hud.add_hud_to(mentor, mentor)
to_chat(mentor, SPAN_INFO("<B>New Player Markers Enabled</B>"))
return TRUE
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/human_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
/// A list of all the shrapnel currently embedded in the human
var/list/atom/movable/embedded_items = list()

var/list/inherent_huds_toggled = list(FALSE,FALSE, FALSE)
var/list/inherent_huds_toggled = list(INHERENT_HUD_MEDICAL = FALSE, INHERENT_HUD_SECURITY = FALSE, INHERENT_HUD_NEW_PLAYER = FALSE)

var/default_lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE

Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/human/powers/human_powers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -270,13 +270,13 @@
return

var/datum/mob_hud/the_hud
var/chosen_HUD = 1
var/chosen_HUD = INHERENT_HUD_MEDICAL
switch(hud_choice)
if("Medical HUD")
the_hud = GLOB.huds[MOB_HUD_MEDICAL_ADVANCED]
if("Security HUD")
the_hud = GLOB.huds[MOB_HUD_SECURITY_ADVANCED]
chosen_HUD = 2
chosen_HUD = INHERENT_HUD_SECURITY
else
return

Expand Down

0 comments on commit 83e1539

Please sign in to comment.