From 572c17c440e39cc0fc165938211f585b181b5b78 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 25 Nov 2016 21:59:30 -0600 Subject: [PATCH] Fixes some incorrect times for respawn things. --- code/modules/admin/verbs/randomverbs.dm | 6 ++-- code/modules/mob/new_player/new_player.dm | 2 +- html/changelogs/Anewbe - Respawn.yml | 36 +++++++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/Anewbe - Respawn.yml diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index d4b05091471..662b945b33b 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -256,7 +256,7 @@ Ccomp's first proc. /client/proc/allow_character_respawn() set category = "Special Verbs" set name = "Allow player to respawn" - set desc = "Let's the player bypass the 15 minute wait to respawn or allow them to re-enter their corpse." + set desc = "Let's the player bypass the wait to respawn or allow them to re-enter their corpse." if(!holder) src << "Only administrators and moderators may use this command." var/list/ghosts= get_ghosts(1,1) @@ -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 15 minute respawn limit") - message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the 15 minute respawn limit", 1) + log_admin("[key_name(usr)] allowed [key_name(G)] to bypass the respawn time limit") + message_admins("Admin [key_name_admin(usr)] allowed [key_name_admin(G)] to bypass the respawn time limit", 1) /client/proc/toggle_antagHUD_use() diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 80a9769f4ec..76226220b48 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -108,7 +108,7 @@ if(href_list["observe"]) - if(alert(src,"Are you sure you wish to observe? You will have to wait 15 minutes before being able to respawn!","Player Setup","Yes","No") == "Yes") + if(alert(src,"Are you sure you wish to observe? You will have to wait 5 minutes before being able to respawn!","Player Setup","Yes","No") == "Yes") if(!client) return 1 var/mob/observer/dead/observer = new() diff --git a/html/changelogs/Anewbe - Respawn.yml b/html/changelogs/Anewbe - Respawn.yml new file mode 100644 index 00000000000..40c39e6dd83 --- /dev/null +++ b/html/changelogs/Anewbe - Respawn.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: Anewbe + +# 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: + - bugfix: "Observe warning should properly show how long you have before you can join." \ No newline at end of file