From c922c71fa1abadfd4313c326a0db4e18f16b3ea4 Mon Sep 17 00:00:00 2001 From: Pinta <124479862+deertools@users.noreply.github.com> Date: Mon, 6 Feb 2023 21:30:27 -0500 Subject: [PATCH] nerf --- code/modules/mob/dead/new_player/new_player.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 2 +- code/modules/mob/mob.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 10ffdd92..cff9bad7 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -288,7 +288,7 @@ observer.started_as_observer = TRUE src.client.respawn_observing = 1 - src.client.lastrespawn = world.time + 1800 SECONDS //reset respawn. + src.client.lastrespawn = world.time + 180 SECONDS //reset respawn. close_spawn_windows() var/obj/effect/landmark/observer_start/O = locate(/obj/effect/landmark/observer_start) in GLOB.landmarks_list to_chat(src, "Now teleporting.") diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index b6cd8be8..1fea2126 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -289,7 +289,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(istype(loc, /obj/machinery/cryopod)) var/response = alert(src, "Are you -sure- you want to ghost?\n(If you ghost now, you will have to wait 30 minutes before you are able to respawn!)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost")//darn copypaste - client.lastrespawn = world.time + 1800 SECONDS //set respawn time + client.lastrespawn = world.time + 180 SECONDS //set respawn time return var/obj/machinery/cryopod/C = loc C.despawn_occupant() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index f3ca2844..ab20dc2d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -471,7 +471,7 @@ mob/visible_message(message, self_message, blind_message, vision_distance = DEFA qdel(M) return - usr.client.lastrespawn = world.time + 1800 SECONDS + usr.client.lastrespawn = world.time + 180 SECONDS usr.client.respawn_observing = 0 message_admins("[client.ckey] respawned.") M.ckey = ckey //shamelessly copied to