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.

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

[PORT] Follows up TG's atom_hud system #10897

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8332f45
Full ports
EvilDragonfiend Apr 17, 2024
6bcd034
Fixes alt appearance
EvilDragonfiend Apr 17, 2024
1d863f2
More TG fixes
EvilDragonfiend Apr 17, 2024
9287460
Corrects errors
EvilDragonfiend Apr 17, 2024
b42a6a9
Merge branch 'master' into portatomhud
EvilDragonfiend Apr 23, 2024
af47fea
Merge remote-tracking branch 'BeeStation/master' into portatomhud
EvilDragonfiend Jul 8, 2024
f8a96d1
delete mecha code
EvilDragonfiend Jul 8, 2024
92267bd
up to date Master
EvilDragonfiend Jul 8, 2024
647c62c
Merge branch 'master' into portatomhud
EvilDragonfiend Jul 10, 2024
b2a8578
atom hud update with dynamic z update
EvilDragonfiend Jul 10, 2024
683fd7c
antag stash fix
EvilDragonfiend Jul 10, 2024
40844f1
Merge branch 'master' into portatomhud
EvilDragonfiend Aug 6, 2024
5e14b19
error fix
EvilDragonfiend Aug 16, 2024
3889196
Merge remote-tracking branch 'BeeStation/master' into portatomhud
EvilDragonfiend Aug 16, 2024
617a918
properly update branch
EvilDragonfiend Aug 16, 2024
d9874c1
Merge branch 'master' into portatomhud
EvilDragonfiend Sep 15, 2024
c3e7c91
Merge branch 'master' into portatomhud
EvilDragonfiend Sep 20, 2024
e29eebf
begone space indent
EvilDragonfiend Sep 21, 2024
7400351
Merge branch 'master' into portatomhud
EvilDragonfiend Oct 20, 2024
c29a9f5
Merge remote-tracking branch 'BeeStation/master' into portatomhud
EvilDragonfiend Oct 27, 2024
51e1a46
Better explanation
EvilDragonfiend Oct 27, 2024
641aea4
Merge remote-tracking branch 'BeeStation/master' into portatomhud
EvilDragonfiend Nov 10, 2024
cdcc3dc
Merge branch 'master' into portatomhud
EvilDragonfiend Nov 22, 2024
51f8ede
Fixes sec hud
EvilDragonfiend Nov 25, 2024
e4fe414
Merge remote-tracking branch 'BeeStation/master' into portatomhud
EvilDragonfiend Dec 10, 2024
8aebb9e
Auto stash before merge of "portatomhud" and "BeeStation/master"
EvilDragonfiend Dec 10, 2024
1cd1b1d
fixes stash
EvilDragonfiend Dec 10, 2024
fa6bb7b
god
EvilDragonfiend Dec 10, 2024
364dad7
wwwwooo fucky
EvilDragonfiend Dec 10, 2024
47e9086
Merge branch 'master' into portatomhud
EvilDragonfiend Dec 24, 2024
e9fd54e
Merge branch 'BeeStation:master' into portatomhud
EvilDragonfiend Dec 30, 2024
1f985d8
this will prolly work
EvilDragonfiend Dec 30, 2024
29eac7d
more failsafe
EvilDragonfiend Dec 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
error fix
  • Loading branch information
EvilDragonfiend committed Aug 16, 2024
commit 5e14b191cd27a04afe4c1854670fe274ee42bebc
2 changes: 1 addition & 1 deletion code/game/alternate_appearance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
..()
for(var/mob in GLOB.player_list)
if(mobShouldSee(mob))
add_hud_to(mob)
show_to(mob)

/datum/atom_hud/alternate_appearance/basic/mimites/mobShouldSee(mob/M)
return ismimite(M) || isobserver(M)
2 changes: 1 addition & 1 deletion code/modules/vehicles/mecha/medical/odysseus.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/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.hide_from(L)
hud.hide_from(H)
REMOVE_TRAIT(H, TRAIT_MEDICAL_HUD, VEHICLE_TRAIT)
return ..()

Expand Down
Loading