cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into 150605-Meteors

Browse Source 
Conflicts:
	code/game/gamemodes/meteor/meteors.dm
This commit is contained in:
PsiOmegaDelta
2015-06-05 14:59:52 +02:00
parent a07d20d657 989f34ad04
commit bad9c103eb
49 changed files with 1063 additions and 1172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/admin/admin.dm
View File

@@ -909,8 +909,8 @@ var/global/floorIsLava = 0
log_admin("[key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].")
message_admins("\blue [key_name(usr)] [ticker.delay_end ? "delayed the round end" : "has made the round end normally"].", 1)
return //alert("Round end delayed", null, null, null, null, null)
going = !( going )
if (!( going ))
round_progressing = !round_progressing
if (!round_progressing)
world << "<b>The game start has been delayed.</b>"
log_admin("[key_name(usr)] delayed the game.")
else