cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #648 from Datraen/Respawn-Time-Change

Browse Source 
Respawn time change
This commit is contained in:
Neerti
2015-12-23 02:59:59 -05:00
parent 1418dd98b9 0b4ed44ce4
commit 650396af6f
3 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -278,8 +278,8 @@ Ccomp's first proc.
G.can_reenter_corpse = 1
G:show_message(text("\blue <B>You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead.</B>"), 1)
log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the 30 minute respawn limit")
message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the 30 minute respawn limit", 1)
log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the 15 minute respawn limit")
message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the 15 minute respawn limit", 1)
/client/proc/toggle_antagHUD_use()

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

@@ -406,8 +406,8 @@
var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1)
usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds."
if (deathtime < 18000)
usr << "You must wait 30 minutes to respawn!"
if (deathtime < (15 * 600))
usr << "You must wait 15 minutes to respawn!"
return
else
usr << "You can respawn now, enjoy your new life!"