merge join and ready button

PMC-Unga-Marines · Nov 14, 2024 · 964572c · 964572c
1 parent 3feb010
commit 964572c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm
@@ -28,6 +28,9 @@
 
 #define COMSIG_GLOB_SHIP_SELF_DESTRUCT_ACTIVATED "!ship_self_destruct_activated"
 
+///Gamemode has successfully loaded
+#define COMSIG_GLOB_GAMEMODE_LOADED "!gamemode_loaded"
+
 /// from /obj/machinery/setAnchored(): (machine, anchoredstate)
 #define COMSIG_GLOB_MACHINERY_ANCHORED_CHANGE "!machinery_anchored_change"
 

diff --git a/code/_onclick/hud/screen_objects/menu_text_objects.dm b/code/_onclick/hud/screen_objects/menu_text_objects.dm
@@ -73,11 +73,24 @@
 	maptext = "<span class='maptext' style=font-size:8px>ПРИСОЕДИНИТЬСЯ</span>"
 	icon_state = "join"
 
+/atom/movable/screen/text/lobby/clickable/join_game/Initialize(mapload, datum/hud/hud_owner)
+	. = ..()
+	update_text()
+	RegisterSignal(SSdcs, COMSIG_GLOB_GAMEMODE_LOADED, TYPE_PROC_REF(/atom/movable/screen/text/lobby, update_text))
+
 /atom/movable/screen/text/lobby/clickable/join_game/Click()
 	. = ..()
 	var/mob/new_player/player = hud.mymob
 	player.attempt_late_join()
 
+/atom/movable/screen/text/lobby/clickable/join_game/update_text()
+	var/mob/new_player/player = hud.mymob
+	if(SSticker?.current_state > GAME_STATE_PREGAME)
+		maptext = "<span class='maptext' style=font-size:8px>ПРИСОЕДИНИТЬСЯ</span>"
+		icon_state = "join"
+		return
+	maptext = "<span class='maptext' style=font-size:8px>ВЫ: [player.ready ? "" : "НЕ "]ГОТОВЫ</span>"
+	icon_state = player.ready ? "ready" : "unready"
 
 /atom/movable/screen/text/lobby/clickable/observe
 	maptext = "<span class='maptext' style=font-size:8px>НАБЛЮДАТЬ</span>"
@@ -88,21 +101,6 @@
 	var/mob/new_player/player = hud.mymob
 	player.try_to_observe()
 
-/atom/movable/screen/text/lobby/clickable/ready
-	maptext = "<span class='maptext' style=font-size:8px>ВЫ: НЕ ГОТОВЫ</span>"
-	icon_state = "unready"
-
-/atom/movable/screen/text/lobby/clickable/ready/update_text()
-	var/mob/new_player/player = hud.mymob
-	maptext = "<span class='maptext' style=font-size:8px>ВЫ: [player.ready ? "" : "НЕ "]ГОТОВЫ</span>"
-
-/atom/movable/screen/text/lobby/clickable/ready/Click()
-	. = ..()
-	var/mob/new_player/player = hud.mymob
-	player.toggle_ready()
-	icon_state = player.ready ? "ready" : "unready"
-	update_text()
-
 /atom/movable/screen/text/lobby/clickable/manifest
 	maptext = "<span class='maptext' style=font-size:8px>МАНИФЕСТ</span>"
 	icon_state = "manifest"

diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm
@@ -178,9 +178,9 @@ SUBSYSTEM_DEF(ticker)
 
 	CHECK_TICK
 	PostSetup()
+	SEND_GLOBAL_SIGNAL(COMSIG_GLOB_GAMEMODE_LOADED)
 	return TRUE
 
-
 /datum/controller/subsystem/ticker/proc/PostSetup()
 	set waitfor = FALSE
 	mode.post_setup()

diff --git a/icons/UI_Icons/lobby_button.dmi b/icons/UI_Icons/lobby_button.dmi