cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-08-23 13:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Dynamic2

Browse Source
This commit is contained in:
JaySparrow
2020-11-03 00:39:13 -06:00
parent 8d1ef78a58 c7bc366210
commit d64ead68ac
580 changed files with 220718 additions and 212806 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/dynamic/dynamic.dm
+6 -6
View File
@@ -445,7 +445,7 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
/// Picks a random roundstart rule from the list given as an argument and executes it.
/datum/game_mode/dynamic/proc/picking_roundstart_rule(list/drafted_rules = list(), forced = FALSE)
var/datum/dynamic_ruleset/roundstart/starting_rule = pickweight(drafted_rules)
var/datum/dynamic_ruleset/roundstart/starting_rule = pickweightAllowZero(drafted_rules)
if(!starting_rule)
return FALSE
@@ -457,7 +457,7 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
drafted_rules -= starting_rule
if(drafted_rules.len <= 0)
return FALSE
starting_rule = pickweight(drafted_rules)
starting_rule = pickweightAllowZero(drafted_rules)
// Check if the ruleset is highlander and if a highlander ruleset has been executed
else if(starting_rule.flags & HIGHLANDER_RULESET)
if(threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
@@ -465,7 +465,7 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
drafted_rules -= starting_rule
if(drafted_rules.len <= 0)
return FALSE
starting_rule = pickweight(drafted_rules)
starting_rule = pickweightAllowZero(drafted_rules)
message_admins("Picking a [istype(starting_rule, /datum/dynamic_ruleset/roundstart/delayed/) ? " delayed " : ""] ruleset [starting_rule.name]")
log_game("DYNAMIC: Picking a [istype(starting_rule, /datum/dynamic_ruleset/roundstart/delayed/) ? " delayed " : ""] ruleset [starting_rule.name]")
@@ -516,7 +516,7 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
/// Picks a random midround OR latejoin rule from the list given as an argument and executes it.
/// Also this could be named better.
/datum/game_mode/dynamic/proc/picking_midround_latejoin_rule(list/drafted_rules = list(), forced = FALSE)
var/datum/dynamic_ruleset/rule = pickweight(drafted_rules)
var/datum/dynamic_ruleset/rule = pickweightAllowZero(drafted_rules)
if(!rule)
return FALSE
@@ -528,7 +528,7 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
drafted_rules -= rule
if(drafted_rules.len <= 0)
return FALSE
rule = pickweight(drafted_rules)
rule = pickweightAllowZero(drafted_rules)
// Check if the ruleset is highlander and if a highlander ruleset has been executed
else if(rule.flags & HIGHLANDER_RULESET)
if(threat < GLOB.dynamic_stacking_limit && GLOB.dynamic_no_stacking)
@@ -536,7 +536,7 @@ GLOBAL_VAR_INIT(dynamic_chaos_level, 1.5)
drafted_rules -= rule
if(drafted_rules.len <= 0)
return FALSE
rule = pickweight(drafted_rules)
rule = pickweightAllowZero(drafted_rules)
if(!rule.repeatable)
if(rule.ruletype == "Latejoin")
code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm
+1 -1
View File
@@ -1,4 +1,4 @@
#define REVENANT_SPAWN_THRESHOLD 20
#define REVENANT_SPAWN_THRESHOLD 15
#define ABDUCTOR_MAX_TEAMS 4 // blame TG for not using the defines files
//////////////////////////////////////////////