cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 14:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes continuous_rounds config option and the ability of the game to trigger ending based on antagonist death. (#13645)

Browse Source
This commit is contained in:
mikomyazaki
2022-04-24 15:06:29 +01:00
committed by GitHub
parent c2e921ba6a
commit 9ae2efba53
32 changed files with 19 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration.dm
View File

@@ -43,7 +43,6 @@ var/list/gamemode_cache = list()
var/traitor_scaling = 0 //if amount of traitors scales based on amount of players
var/objectives_disabled = 0 //if objectives are disabled or not
var/protect_roles_from_antagonist = 0// If security and such can be traitor/cult/other
var/continous_rounds = 0 // Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
var/allow_Metadata = 0 // Metadata is supported.
var/popup_admin_pm = 0 //adminPMs to non-admins show in a pop-up 'reply' window when set to 1.
var/Ticklag = 0.4
@@ -711,9 +710,6 @@ var/list/gamemode_cache = list()
if("gateway_delay")
config.gateway_delay = text2num(value)
if("continuous_rounds")
config.continous_rounds = 1
if("ghost_interaction")
config.ghost_interaction = 1

18
code/controllers/subsystems/ticker.dm
View File

@@ -174,12 +174,9 @@ var/datum/controller/subsystem/ticker/SSticker
if(force_end)
game_finished = TRUE
mode_finished = TRUE
else if(config.continous_rounds)
else
game_finished = (evacuation_controller.round_over() || mode.station_was_nuked)
mode_finished = (!post_game && mode.check_finished())
else
game_finished = (mode.check_finished() || (evacuation_controller.round_over() && evacuation_controller.emergency_evacuation)) || universe_has_ended
mode_finished = game_finished
if(!mode.explosion_in_progress && game_finished && (mode_finished || post_game))
current_state = GAME_STATE_FINISHED
@@ -227,19 +224,6 @@ var/datum/controller/subsystem/ticker/SSticker
to_world("<span class='notice'><b>An admin has delayed the round end</b></span>")
else if(!delay_notified)
to_world("<span class='notice'><b>An admin has delayed the round end</b></span>")
else if (mode_finished)
post_game = 1
mode.cleanup()
//call a transfer shuttle vote
spawn(50)
if(!round_end_announced && !config.continous_rounds) // Spam Prevention. Now it should announce only once.
to_world("<span class='danger'>The round has ended!</span>")
round_end_announced = 1
SSvote.autotransfer()
return 1
/datum/controller/subsystem/ticker/proc/declare_completion()