cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separates the continuous round config options to be round-specific. For example, one can config wizard rounds don't have to end upon the wizard's death, while Rev rounds will still end upon one side's defeat.

Browse Source
This commit is contained in:
Cheridan
2013-06-04 18:39:36 -05:00
parent df681bed40
commit d8ec1ba9c9
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/controllers/configuration.dm
View File

@@ -79,7 +79,9 @@
var/traitor_scaling = 0 //if amount of traitors scales based on amount of players
var/protect_roles_from_antagonist = 0// If security and such can be tratior/cult/other
var/allow_latejoin_antagonists = 0 // If late-joining players can be traitor/changeling
var/continous_rounds = 0 // Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
var/continuous_round_rev = 0 // Gamemodes which end instantly will instead keep on going until the round ends by escape shuttle or nuke.
var/continuous_round_wiz = 0
var/continuous_round_malf = 0
var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
var/alert_desc_blue_upto = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted."
@@ -315,8 +317,12 @@
config.jobs_have_maint_access |= EVERYONE_HAS_MAINT_ACCESS
if("gateway_delay")
config.gateway_delay = text2num(value)
if("continuous_rounds")
config.continous_rounds = 1
if("continuous_round_rev")
config.continuous_round_rev = 1
if("continuous_round_wiz")
config.continuous_round_wiz = 1
if("continuous_round_malf")
config.continuous_round_malf = 1
if("ghost_interaction")
config.ghost_interaction = 1
if("traitor_scaling")

2
code/game/gamemodes/malfunction/malfunction.dm
View File

@@ -134,7 +134,7 @@
if (station_captured && !to_nuke_or_not_to_nuke)
return 1
if (is_malf_ai_dead())
if(config.continous_rounds)
if(config.continuous_round_malf)
if(emergency_shuttle)
emergency_shuttle.always_fake_recall = 0
malf_mode_declared = 0

2
code/game/gamemodes/revolution/revolution.dm
View File

@@ -168,7 +168,7 @@
//Checks if the round is over//
///////////////////////////////
/datum/game_mode/revolution/check_finished()
if(config.continous_rounds)
if(config.continuous_round_rev)
if(finished != 0)
if(emergency_shuttle)
emergency_shuttle.always_fake_recall = 0

2
code/game/gamemodes/wizard/wizard.dm
View File

@@ -183,7 +183,7 @@
/datum/game_mode/wizard/check_finished()
if(config.continous_rounds)
if(config.continuous_round_wiz)
return ..()
var/wizards_alive = 0

5
config/game_options.txt
View File

@@ -92,7 +92,10 @@ PROBABILITY SANDBOX 0
## Uncomment to make rounds which end instantly (Rev, Wizard, Malf) continue until
## the shuttle is called or the station is nuked.
## Malf and Rev will let the shuttle be called when the antags/protags are dead.
#CONTINUOUS_ROUNDS
#CONTINUOUS_ROUND_REV
#CONTINUOUS_ROUND_WIZ
#CONTINUOUS_ROUND_MALF
## Uncomment to scale the number of antagonists to crew population. Doesn't
## affect all gamemodes.