From 9baf3e527df24d96798a64a7a2f3b6cc24fe5cd9 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Thu, 30 Sep 2021 18:16:26 -0400 Subject: [PATCH] tweaks --- code/datums/hud.dm | 44 ++++++++++---------- code/modules/clothing/spacesuits/hardsuit.dm | 8 ++-- code/modules/tgui/modules/ghost_hud_panel.dm | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/code/datums/hud.dm b/code/datums/hud.dm index e600086fb1a..9eeda5fd9f2 100644 --- a/code/datums/hud.dm +++ b/code/datums/hud.dm @@ -2,28 +2,28 @@ GLOBAL_LIST_EMPTY(all_huds) ///GLOBAL HUD LIST -GLOBAL_LIST_INIT(huds, list( \ - DATA_HUD_SECURITY_BASIC = new/datum/atom_hud/data/human/security/basic(), \ - DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/human/security/advanced(), \ - DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), \ - DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(), \ - DATA_HUD_DIAGNOSTIC_BASIC = new/datum/atom_hud/data/diagnostic/basic(), \ - DATA_HUD_DIAGNOSTIC_ADVANCED = new/datum/atom_hud/data/diagnostic/advanced(), \ - DATA_HUD_HYDROPONIC = new/datum/atom_hud/data/hydroponic(), \ - ANTAG_HUD_CULT = new/datum/atom_hud/antag(), \ - ANTAG_HUD_REV = new/datum/atom_hud/antag(), \ - ANTAG_HUD_OPS = new/datum/atom_hud/antag(), \ - ANTAG_HUD_WIZ = new/datum/atom_hud/antag(), \ - ANTAG_HUD_SHADOW = new/datum/atom_hud/antag(), \ - ANTAG_HUD_TRAITOR = new/datum/atom_hud/antag/hidden(),\ - ANTAG_HUD_NINJA = new/datum/atom_hud/antag/hidden(),\ - ANTAG_HUD_CHANGELING = new/datum/atom_hud/antag/hidden(),\ - ANTAG_HUD_VAMPIRE = new/datum/atom_hud/antag/hidden(),\ - ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden(),\ - DATA_HUD_ABDUCTOR = new/datum/atom_hud/abductor(),\ - ANTAG_HUD_EVENTMISC = new/datum/atom_hud/antag/hidden(),\ - ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden()\ -)) +GLOBAL_LIST_INIT(huds, list( + DATA_HUD_SECURITY_BASIC = new/datum/atom_hud/data/human/security/basic(), + DATA_HUD_SECURITY_ADVANCED = new/datum/atom_hud/data/human/security/advanced(), + DATA_HUD_MEDICAL_BASIC = new/datum/atom_hud/data/human/medical/basic(), + DATA_HUD_MEDICAL_ADVANCED = new/datum/atom_hud/data/human/medical/advanced(), + DATA_HUD_DIAGNOSTIC_BASIC = new/datum/atom_hud/data/diagnostic/basic(), + DATA_HUD_DIAGNOSTIC_ADVANCED = new/datum/atom_hud/data/diagnostic/advanced(), + DATA_HUD_HYDROPONIC = new/datum/atom_hud/data/hydroponic(), + ANTAG_HUD_CULT = new/datum/atom_hud/antag(), + ANTAG_HUD_REV = new/datum/atom_hud/antag(), + ANTAG_HUD_OPS = new/datum/atom_hud/antag(), + ANTAG_HUD_WIZ = new/datum/atom_hud/antag(), + ANTAG_HUD_SHADOW = new/datum/atom_hud/antag(), + ANTAG_HUD_TRAITOR = new/datum/atom_hud/antag/hidden(), + ANTAG_HUD_NINJA = new/datum/atom_hud/antag/hidden(), + ANTAG_HUD_CHANGELING = new/datum/atom_hud/antag/hidden(), + ANTAG_HUD_VAMPIRE = new/datum/atom_hud/antag/hidden(), + ANTAG_HUD_ABDUCTOR = new/datum/atom_hud/antag/hidden(), + DATA_HUD_ABDUCTOR = new/datum/atom_hud/abductor(), + ANTAG_HUD_EVENTMISC = new/datum/atom_hud/antag/hidden(), + ANTAG_HUD_BLOB = new/datum/atom_hud/antag/hidden() + )) /datum/atom_hud var/list/atom/hudatoms = list() //list of all atoms which display this hud diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index de2084f21b9..3e851544b65 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -512,8 +512,8 @@ var/mob/living/carbon/human/U = user if(istype(U.glasses, /obj/item/clothing/glasses/hud/diagnostic)) // If they are for some reason wearing a diagnostic hud when they put the helmet on return // already have a hud - var/datum/atom_hud/H = GLOB.huds[DATA_HUD_DIAGNOSTIC] - H.add_hud_to(U) + var/datum/atom_hud/DHUD = GLOB.huds[DATA_HUD_DIAGNOSTIC_BASIC] + DHUD.add_hud_to(user) hud_active = TRUE @@ -521,8 +521,8 @@ ..() if((user.head == src) && hud_active) GLOB.doppler_arrays -= src - var/datum/atom_hud/H = GLOB.huds[DATA_HUD_DIAGNOSTIC] - H.remove_hud_from(user) + var/datum/atom_hud/DHUD = GLOB.huds[DATA_HUD_DIAGNOSTIC_BASIC] + DHUD.remove_hud_from(user) /obj/item/clothing/head/helmet/space/hardsuit/rd/proc/sense_explosion(x0, y0, z0, devastation_range, heavy_impact_range, light_impact_range, took, orig_dev_range, orig_heavy_range, orig_light_range) diff --git a/code/modules/tgui/modules/ghost_hud_panel.dm b/code/modules/tgui/modules/ghost_hud_panel.dm index 712f17909a6..456df088827 100644 --- a/code/modules/tgui/modules/ghost_hud_panel.dm +++ b/code/modules/tgui/modules/ghost_hud_panel.dm @@ -13,7 +13,7 @@ GLOBAL_DATUM_INIT(ghost_hud_panel, /datum/ui_module/ghost_hud_panel, new) var/list/hud_type_lookup = list( "medical" = DATA_HUD_MEDICAL_ADVANCED, "security" = DATA_HUD_SECURITY_ADVANCED, - "diagnostic" = DATA_HUD_DIAGNOSTIC + "diagnostic" = DATA_HUD_DIAGNOSTIC_ADVANCED ) /datum/ui_module/ghost_hud_panel/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.observer_state)