cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-13 17:14:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] mob/dead/new_player harddel fix (#6803)

Browse Source 
* mob/dead/new_player harddel fix (#60072)

* mob/dead/new_player harddel fix

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-07-09 01:28:53 +01:00
committed by GitHub
parent 6e6536da37
commit 14d5cdadde
3 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/dynamic/dynamic.dm
+6 -5
View File
@@ -32,8 +32,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/// Running information about the threat. Can store text or datum entries.
var/list/threat_log = list()
/// List of roundstart rules used for selecting the rules.
var/list/roundstart_rules
/// List of latejoin rules used for selecting the rules.
var/list/latejoin_rules
/// List of midround rules used for selecting the rules.
@@ -364,6 +362,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
setup_shown_threat()
setup_rulesets()
//We do this here instead of with the midround rulesets and such because these rules can hang refs
//To new_player and such, and we want the datums to just free when the roundstart work is done
var/list/roundstart_rules = init_rulesets(/datum/dynamic_ruleset/roundstart)
for(var/i in GLOB.new_player_list)
var/mob/dead/new_player/player = i
if(player.ready == PLAYER_READY_TO_PLAY && player.mind && player.check_preferences())
@@ -378,7 +380,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
if(GLOB.dynamic_forced_roundstart_ruleset.len > 0)
rigged_roundstart()
else
roundstart()
roundstart(roundstart_rules)
log_game("DYNAMIC: [round_start_budget] round start budget was left, donating it to midrounds.")
threat_log += "[worldtime2text()]: [round_start_budget] round start budget was left, donating it to midrounds."
@@ -403,7 +405,6 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
/// Initializes the internal ruleset variables
/datum/game_mode/dynamic/proc/setup_rulesets()
roundstart_rules = init_rulesets(/datum/dynamic_ruleset/roundstart)
midround_rules = init_rulesets(/datum/dynamic_ruleset/midround)
latejoin_rules = init_rulesets(/datum/dynamic_ruleset/latejoin)
@@ -446,7 +447,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
spend_roundstart_budget(picking_roundstart_rule(rule, scaled_times, forced = TRUE))
/datum/game_mode/dynamic/proc/roundstart()
/datum/game_mode/dynamic/proc/roundstart(list/roundstart_rules)
if (GLOB.dynamic_forced_extended)
log_game("DYNAMIC: Starting a round of forced extended.")
return TRUE
code/game/gamemodes/dynamic/dynamic_simulations.dm
-15
View File
@@ -119,19 +119,4 @@
return export
/client/proc/export_dynamic_json()
set name = "Export dynamic.json"
set category = "Debug"
var/datum/game_mode/dynamic/dynamic = SSticker.mode
var/list/export = list()
export["Roundstart"] = export_dynamic_json_of(dynamic.roundstart_rules)
export["Midround"] = export_dynamic_json_of(dynamic.midround_rules)
export["Latejoin"] = export_dynamic_json_of(dynamic.latejoin_rules)
message_admins("Writing file...")
WRITE_FILE(file("[GLOB.log_directory]/dynamic.json"), json_encode(export))
message_admins("Writing complete.")
#endif
code/modules/admin/admin_verbs.dm
-1
View File
@@ -196,7 +196,6 @@ GLOBAL_PROTECT(admin_verbs_debug)
/client/proc/print_cards,
#ifdef TESTING
/client/proc/check_missing_sprites,
/client/proc/export_dynamic_json,
/client/proc/run_dynamic_simulations,
#endif
/client/proc/display_sendmaps,