cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-16 10:35:41 +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 22:41:01 +02:00
committed by GitHub
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/escape_menu/details.dm
+1 -1
View File
@@ -13,7 +13,7 @@ GLOBAL_DATUM(escape_menu_details, /atom/movable/screen/escape_menu/details)
maptext_height = 100
maptext_width = 200
/atom/movable/screen/escape_menu/details/Initialize(mapload)
/atom/movable/screen/escape_menu/details/Initialize(mapload, datum/hud/hud_owner)
. = ..()
update_text()
code/modules/escape_menu/home_page.dm
+7 -1
View File
@@ -2,6 +2,7 @@
page_holder.give_screen_object(
new /atom/movable/screen/escape_menu/home_button(
null,
/* hud_owner = */ src,
src,
"Resume",
/* offset = */ 0,
@@ -12,6 +13,7 @@
page_holder.give_screen_object(
new /atom/movable/screen/escape_menu/home_button(
null,
/* hud_owner = */ null,
src,
"Settings",
/* offset = */ 1,
@@ -22,6 +24,7 @@
page_holder.give_screen_object(
new /atom/movable/screen/escape_menu/home_button/admin_help(
null,
/* hud_owner = */ src,
src,
"Admin Help",
/* offset = */ 2,
@@ -32,6 +35,7 @@
page_holder.give_screen_object(
new /atom/movable/screen/escape_menu/home_button/leave_body(
null,
/* hud_owner = */ src,
src,
"Leave Body",
/* offset = */ 3,
@@ -58,6 +62,7 @@
/atom/movable/screen/escape_menu/home_button/Initialize(
mapload,
datum/hud/hud_owner,
datum/escape_menu/escape_menu,
button_text,
offset,
@@ -70,6 +75,7 @@
home_button_text = new /atom/movable/screen/escape_menu/home_button_text(
src,
/* hud_owner = */ src,
button_text,
)
@@ -112,7 +118,7 @@
button_text
hovered = FALSE
/atom/movable/screen/escape_menu/home_button_text/Initialize(mapload, button_text)
/atom/movable/screen/escape_menu/home_button_text/Initialize(mapload, datum/hud/hud_owner, button_text)
. = ..()
src.button_text = button_text
code/modules/escape_menu/title.dm
+1 -1
View File
@@ -13,7 +13,7 @@ GLOBAL_DATUM(escape_menu_title, /atom/movable/screen/escape_menu/title)
maptext_height = 100
maptext_width = 500
/atom/movable/screen/escape_menu/title/Initialize(mapload)
/atom/movable/screen/escape_menu/title/Initialize(mapload, datum/hud/hud_owner)
. = ..()
update_text()