cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevents joining with unacked notifications (#11398)

Browse Source
This commit is contained in:
Werner
2021-03-07 22:00:38 +01:00
committed by GitHub
parent 0a80d0053f
commit 39323cc722
5 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/new_player/menu.dm
+1 -3
View File
@@ -156,10 +156,8 @@
sound_to(player, 'sound/effects/menu_click.ogg')
if(SSticker.current_state <= GAME_STATE_SETTING_UP)
if(player.ready)
player.ready = FALSE
player.ready(FALSE)
else
player.ready = TRUE
player.ready(TRUE)
else
player.join_game()
@@ -230,7 +228,7 @@
alert(src, "You have not saved your character yet. Please do so before readying up.")
return
if(client.unacked_warning_count > 0)
alert(src, "You can not ready up, because you have unacknowledged warnings. Acknowledge your warnings in OOC->Warnings and Notifications.")
alert(src, "You can not ready up, because you have unacknowledged warnings or notifications. Acknowledge them in OOC->Warnings and Notifications.")
return
ready = readying
code/modules/mob/abstract/new_player/new_player.dm
+2 -2
View File
@@ -68,7 +68,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
alert(src, "You have not saved your character yet. Please do so before readying up.")
return
if(client.unacked_warning_count > 0)
alert(src, "You can not ready up, because you have unacknowledged warnings. Acknowledge your warnings in OOC->Warnings and Notifications.")
alert(src, "You can not ready up, because you have unacknowledged warnings or notifications. Acknowledge them in OOC->Warnings and Notifications.")
return
ready = text2num(href_list["ready"])
@@ -121,7 +121,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
return
if(client.unacked_warning_count > 0)
alert(usr, "You can not join the game, because you have unacknowledged warnings. Acknowledge your warnings in OOC->Warnings and Notifications.")
alert(usr, "You can not join the game, because you have unacknowledged warnings or notifications. Acknowledge them in OOC->Warnings and Notifications.")
return
var/datum/species/S = all_species[client.prefs.species]