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

[MIRROR] Hud screens now set hud owner in Initialize. [MDB IGNORE] (#22501)

Browse Source 
* Hud screens now set hud owner in Initialize.

* Merge conflicts

* modular adjustments

* Missed one

* Make this easier to spot

---------

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
This commit is contained in:
SkyratBot
2023-07-18 16:41:01 -04:00
committed by GitHub
co-authored by John Willard Giz
parent 7d80e387d0
commit daba1d93ae
43 changed files with 257 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/changeling/changeling.dm
+4 -8
View File
@@ -165,12 +165,10 @@
if(living_mob.hud_used)
var/datum/hud/hud_used = living_mob.hud_used
lingchemdisplay = new /atom/movable/screen/ling/chems()
lingchemdisplay.hud = hud_used
lingchemdisplay = new /atom/movable/screen/ling/chems(null, hud_used)
hud_used.infodisplay += lingchemdisplay
lingstingdisplay = new /atom/movable/screen/ling/sting()
lingstingdisplay.hud = hud_used
lingstingdisplay = new /atom/movable/screen/ling/sting(null, hud_used)
hud_used.infodisplay += lingstingdisplay
hud_used.show_hud(hud_used.hud_version)
@@ -204,12 +202,10 @@
var/datum/hud/ling_hud = owner.current.hud_used
lingchemdisplay = new
lingchemdisplay.hud = ling_hud
lingchemdisplay = new(null, ling_hud)
ling_hud.infodisplay += lingchemdisplay
lingstingdisplay = new
lingstingdisplay.hud = ling_hud
lingstingdisplay = new(null, ling_hud)
ling_hud.infodisplay += lingstingdisplay
ling_hud.show_hud(ling_hud.hud_version)
code/modules/antagonists/cult/blood_magic.dm
+1 -1
View File
@@ -18,7 +18,7 @@
/datum/action/innate/cult/blood_magic/proc/Positioning()
for(var/datum/hud/hud as anything in viewers)
var/our_view = hud.mymob?.client?.view || "15x15"
var/our_view = hud.mymob?.canon_client?.view || "15x15"
var/atom/movable/screen/movable/action_button/button = viewers[hud]
var/position = screen_loc_to_offset(button.screen_loc)
var/list/position_list = list()