cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes round ending with no players PR more true to name (#32015)

Browse Source 
* Makes round ending after few minutes with no players PR more true to name

* Else if change

Co-authored-by: kanef <kanef9x@protonmail.com>
This commit is contained in:
kane-f
2022-02-08 18:09:06 +00:00
committed by GitHub
parent e995526d52
commit 67a420e5e9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/datums/gamemode/dynamic/dynamic.dm
View File

@@ -46,6 +46,7 @@ var/stacking_limit = 90
var/list/living_antags = list()
var/list/dead_players = list()
var/list/list_observers = list()
var/last_time_of_population = 0
var/latejoin_injection_cooldown = 0
var/midround_injection_cooldown = 0
@@ -658,7 +659,9 @@ var/stacking_limit = 90
continue
dead_players.Add(M)//Players who actually died (and admins who ghosted, would be nice to avoid counting them somehow)
if(!living_players.len && world.time > 15 MINUTES) //if nobody is around and alive in the current round and enough time has passed
if(living_players.len) //if anybody is around and alive in the current round
last_time_of_population = world.time
else if(last_time_of_population && world.time - last_time_of_population > 5 MINUTES && world.time > 15 MINUTES) //if enough time has passed without it
ticker.station_nolife_cinematic()
/datum/gamemode/dynamic/proc/GetInjectionChance()

5
code/datums/gamemode/sandbox.dm
View File

@@ -1,5 +1,6 @@
/datum/gamemode/sandbox
name = "sandbox"
var/last_time_of_players = 0
/datum/gamemode/sandbox/Setup()
@@ -18,6 +19,8 @@
/datum/gamemode/sandbox/process()
. = ..()
if(!player_list.len && world.time > 15 MINUTES) //if nobody is around in the current round and enough time has passed
if(player_list.len) //if anybody is in the current round
last_time_of_players = world.time
if(last_time_of_players && world.time - last_time_of_players > 5 MINUTES && world.time > 15 MINUTES) //if enough time has passed without them
CallHook("Reboot",list())
world.Reboot()