cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes mech HUD's not being properly removed (#4486)

Browse Source 
* Fixes mech HUD's not being properly removed (#57964)

Fixes mech hud's not being removed when leaving the odysseus or clarke

* Fixes mech HUD's not being properly removed

Co-authored-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-03-28 18:38:46 +01:00
committed by GitHub
co-authored by MLGTASTICa
parent 13fb3efed4
commit 6919b442b2
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vehicles/mecha/medical/odysseus.dm
+5 -4
View File
@@ -18,12 +18,13 @@
if(. && !HAS_TRAIT(H, TRAIT_MEDICAL_HUD))
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
hud.add_hud_to(H)
ADD_TRAIT(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
/obj/vehicle/sealed/mecha/medical/odysseus/remove_occupant(mob/M)
if(isliving(M) && HAS_TRAIT_FROM(M, TRAIT_MEDICAL_HUD, src))
var/mob/living/L = M
/obj/vehicle/sealed/mecha/medical/odysseus/remove_occupant(mob/living/carbon/human/H)
if(isliving(H) && HAS_TRAIT_FROM(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT))
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
hud.remove_hud_from(L)
hud.remove_hud_from(H)
REMOVE_TRAIT(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
return ..()
/obj/vehicle/sealed/mecha/medical/odysseus/mmi_moved_inside(obj/item/mmi/M, mob/user)
code/modules/vehicles/mecha/working/clarke.dm
+5 -4
View File
@@ -33,12 +33,13 @@
if(. && !HAS_TRAIT(H, TRAIT_DIAGNOSTIC_HUD))
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_DIAGNOSTIC_ADVANCED]
hud.add_hud_to(H)
ADD_TRAIT(H, TRAIT_DIAGNOSTIC_HUD, VEHICLE_TRAIT)
/obj/vehicle/sealed/mecha/working/clarke/remove_occupant(mob/M)
if(isliving(M) && HAS_TRAIT_FROM(M, TRAIT_DIAGNOSTIC_HUD, src))
var/mob/living/L = M
/obj/vehicle/sealed/mecha/working/clarke/remove_occupant(mob/living/carbon/H)
if(isliving(H) && HAS_TRAIT_FROM(H, TRAIT_DIAGNOSTIC_HUD, VEHICLE_TRAIT))
var/datum/atom_hud/hud = GLOB.huds[DATA_HUD_DIAGNOSTIC_ADVANCED]
hud.remove_hud_from(L)
hud.remove_hud_from(H)
REMOVE_TRAIT(H, TRAIT_DIAGNOSTIC_HUD, VEHICLE_TRAIT)
return ..()
/obj/vehicle/sealed/mecha/working/clarke/mmi_moved_inside(obj/item/mmi/M, mob/user)