From 0f13b89457f6eeaf10b1212b6f2dd5050df911c8 Mon Sep 17 00:00:00 2001 From: Odairu <39929315+Odairu@users.noreply.github.com> Date: Mon, 7 Apr 2025 17:35:25 -0400 Subject: [PATCH] 30 minute grace period to respawn (world time, not round time) (#3457) ## About The Pull Request from when the server starts to 30 minutes after, respawning is free of charge ## Why It's Good For The Game item #1 on the list ## Proof Of Testing it works dude trust me
Screenshots/Videos
## Changelog :cl: code: respawn enabled until 30 min (world time) /:cl: --- code/modules/mob/mob.dm | 5 +++++ config/bubbers/bubbers_config.txt | 3 +++ modular_zubbers/code/controllers/configuration/general.dm | 2 ++ tgstation.dme | 1 + 4 files changed, 11 insertions(+) create mode 100644 modular_zubbers/code/controllers/configuration/general.dm diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 57e28ff9a9f..04ea7484503 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -845,6 +845,11 @@ /mob/proc/check_respawn_delay(override_delay = 0) if(!override_delay && !CONFIG_GET(number/respawn_delay)) return TRUE + //BUBBER EDIT 30 minute grace period + var/respawn_grace_period = CONFIG_GET(number/respawn_grace_period) + if(world.time < respawn_grace_period) + return TRUE + //BUBBER EDIT END var/death_time = world.time - persistent_client.time_of_death diff --git a/config/bubbers/bubbers_config.txt b/config/bubbers/bubbers_config.txt index 3dc613b9e17..9626e2b805c 100644 --- a/config/bubbers/bubbers_config.txt +++ b/config/bubbers/bubbers_config.txt @@ -16,3 +16,6 @@ INTERN_THRESHOLD_COMMAND 20 # Vetted player system ## If enabled, it will use checks to determine if a player is vetted or not in different parts of the game #CHECK_VETTED + +## Respawn grace period (deciseconds), which allows to return to the lobby some amount of time after the world loads - default 30 minutes +RESPAWN_GRACE_PERIOD 18000 diff --git a/modular_zubbers/code/controllers/configuration/general.dm b/modular_zubbers/code/controllers/configuration/general.dm new file mode 100644 index 00000000000..8d4690d3cf8 --- /dev/null +++ b/modular_zubbers/code/controllers/configuration/general.dm @@ -0,0 +1,2 @@ +/datum/config_entry/number/respawn_grace_period + default = 30 MINUTES diff --git a/tgstation.dme b/tgstation.dme index d3496d628a5..46a0f52d8c6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8781,6 +8781,7 @@ #include "modular_zubbers\code\_globalvars\lists\quirks.dm" #include "modular_zubbers\code\_globalvars\lists\~maintenance_loot.dm" #include "modular_zubbers\code\_onclick\hud\screen_objects\hud_timer.dm" +#include "modular_zubbers\code\controllers\configuration\general.dm" #include "modular_zubbers\code\controllers\configuration\entries\nsfw.dm" #include "modular_zubbers\code\controllers\subsystem\air.dm" #include "modular_zubbers\code\controllers\subsystem\job.dm"