shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into semi-sync

Browse Source
This commit is contained in:
Letter N
2020-12-21 21:19:06 +08:00
parent 2966f985a3 ce3cfca619
commit abd94d1c03
189 changed files with 10453 additions and 8486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/input.dm
+1
View File
@@ -98,6 +98,7 @@ SUBSYSTEM_DEF(input)
var/client/C = clients[i]
C.keyLoop()
#define NONSENSICAL_VERB "NONSENSICAL_VERB_THAT_DOES_NOTHING"
/// *sigh
/client/verb/NONSENSICAL_VERB_THAT_DOES_NOTHING()
set name = "NONSENSICAL_VERB_THAT_DOES_NOTHING"
code/controllers/subsystem/persistence.dm
+1 -1
View File
@@ -422,7 +422,7 @@ SUBSYSTEM_DEF(persistence)
saved_storytellers[3] = saved_storytellers[2]
saved_storytellers[2] = saved_storytellers[1]
saved_storytellers[1] = mode.storyteller.name
average_dynamic_threat = (mode.threat_average + average_dynamic_threat) / 2
average_dynamic_threat = (mode.max_threat + average_dynamic_threat) / 2
var/json_file = file("data/RecentStorytellers.json")
var/list/file_data = list()
file_data["data"] = saved_storytellers + average_dynamic_threat
code/controllers/subsystem/vote.dm
+1 -1
View File
@@ -492,7 +492,7 @@ SUBSYSTEM_DEF(vote)
if("dynamic")
GLOB.master_mode = "dynamic"
var/list/probabilities = CONFIG_GET(keyed_list/storyteller_weight)
for(var/T in config.storyteller_cache)
for(var/T in config.get_runnable_storytellers())
var/datum/dynamic_storyteller/S = T
var/probability = ((initial(S.config_tag) in probabilities) ? probabilities[initial(S.config_tag)] : initial(S.weight))
if(probability > 0)