cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14604 from VOREStation/upstream-merge-8975

Browse Source 
[MIRROR] fixes a runtime in huds deleting and the gun deletion on login issue
This commit is contained in:
Heroman3003
2023-03-15 07:18:37 +10:00
committed by CHOMPStation2
parent 5d0a8ee8fb
commit 04b32c7886
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/_onclick/hud/hud.dm
View File

@@ -205,7 +205,7 @@ var/list/global_huds = list(
/datum/hud/Destroy() /datum/hud/Destroy()
. = ..() . = ..()
qdel_null(minihuds) QDEL_NULL_LIST(minihuds)
grab_intent = null grab_intent = null
hurt_intent = null hurt_intent = null
disarm_intent = null disarm_intent = null
@@ -224,7 +224,9 @@ var/list/global_huds = list(
other_important = null other_important = null
hotkeybuttons = null hotkeybuttons = null
// item_action_list = null // ? // item_action_list = null // ?
QDEL_LIST(ammo_hud_list) for (var/x in ammo_hud_list)
remove_ammo_hud(mymob, x)
ammo_hud_list = null
mymob = null mymob = null
/datum/hud/proc/hidden_inventory_update() /datum/hud/proc/hidden_inventory_update()
@@ -502,4 +504,4 @@ var/list/global_huds = list(
///Update the ammo hud related to the gun G ///Update the ammo hud related to the gun G
/datum/hud/proc/update_ammo_hud(mob/living/user, obj/item/weapon/gun/G) /datum/hud/proc/update_ammo_hud(mob/living/user, obj/item/weapon/gun/G)
var/obj/screen/ammo/ammo_hud = ammo_hud_list[G] var/obj/screen/ammo/ammo_hud = ammo_hud_list[G]
ammo_hud?.update_hud(user, G) ammo_hud?.update_hud(user, G)