From e443ffd06a8083fde25fcf61c4802332cddb2023 Mon Sep 17 00:00:00 2001 From: Datraen Date: Tue, 22 Dec 2015 15:04:23 -0500 Subject: [PATCH 1/2] Changes time to respawn down to 15 minutes. --- code/modules/mob/mob.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d30e23765e..0f41b859e5 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -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!" From 0b4ed44ce4244f6781cb104520b6fae8d8f74a84 Mon Sep 17 00:00:00 2001 From: Datraen Date: Tue, 22 Dec 2015 15:09:25 -0500 Subject: [PATCH 2/2] Fixes admin verb, also adds changelog. --- code/modules/admin/verbs/randomverbs.dm | 4 +-- html/changelogs/Datraen.yml | 36 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/Datraen.yml diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index ba00a930b3..e9772fe907 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -278,8 +278,8 @@ Ccomp's first proc. G.can_reenter_corpse = 1 G:show_message(text("\blue You may now respawn. You should roleplay as if you learned nothing about the round during your time with the dead."), 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() diff --git a/html/changelogs/Datraen.yml b/html/changelogs/Datraen.yml new file mode 100644 index 0000000000..b342e21d3d --- /dev/null +++ b/html/changelogs/Datraen.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Datraen + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Respawn time moved down from 30 minutes to 15 minutes."