shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactors roundstart checks slightly

Browse Source
This commit is contained in:
CitadelStationBot
2017-04-26 17:06:29 -05:00
parent e7df2bc14a
commit 08a01aa11b
19 changed files with 59 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/new_player/new_player.dm
+1 -1
View File
@@ -148,7 +148,7 @@
return 1
if(href_list["late_join"])
if(!SSticker || SSticker.current_state != GAME_STATE_PLAYING)
if(!SSticker || !SSticker.IsRoundInProgress())
to_chat(usr, "<span class='danger'>The round is either not ready, or has already finished...</span>")
return
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -337,7 +337,7 @@
. = 1
/mob/living/simple_animal/proc/make_babies() // <3 <3 <3
if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || SSticker.current_state != GAME_STATE_PLAYING)
if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || !SSticker.IsRoundInProgress())
return
next_scan_time = world.time + 400
var/alone = 1
code/modules/mob/logout.dm.rej
+10
View File
@@ -0,0 +1,10 @@
diff a/code/modules/mob/logout.dm b/code/modules/mob/logout.dm (rejected hunks)
@@ -3,7 +3,7 @@
unset_machine()
GLOB.player_list -= src
if(GLOB.admin_datums[src.ckey])
- if (SSticker && SSticker.current_state == GAME_STATE_PLAYING) //Only report this stuff if we are currently playing.
+ if (SSticker && SSticker.IsRoundInProgress()) //Only report this stuff if we are currently playing.
var/admins_number = GLOB.admins.len
if(admins_number == 0) //Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
var/cheesy_message = pick( list( \