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

Merge branch 'master' into the-fuck-am-i-doing

Browse Source
This commit is contained in:
Fabian
2021-03-15 14:09:30 +01:00
parent 03bd073cb5 60c4d77f08
commit 7e50d878ca
730 changed files with 29789 additions and 21946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration/configuration.dm
+2 -2
View File
@@ -415,7 +415,7 @@ Example config:
while(recent_round)
adjustment += repeated_mode_adjust[recent_round]
recent_round = SSpersistence.saved_modes.Find(name,recent_round+1,0)
probability *= ((100-adjustment)/100)
probability *= max(0,((100-adjustment)/100))
runnable_storytellers[S] = probability
return runnable_storytellers
@@ -448,7 +448,7 @@ Example config:
while(recent_round)
adjustment += repeated_mode_adjust[recent_round]
recent_round = SSpersistence.saved_modes.Find(M.config_tag,recent_round+1,0)
final_weight *= ((100-adjustment)/100)
final_weight *= max(0,((100-adjustment)/100))
runnable_modes[M] = final_weight
return runnable_modes
code/controllers/configuration/entries/comms.dm
+3 -4
View File
@@ -22,11 +22,10 @@
/datum/config_entry/string/cross_comms_name
/datum/config_entry/string/medal_hub_address
/datum/config_entry/string/medal_hub_password
protection = CONFIG_ENTRY_HIDDEN
/datum/config_entry/string/cross_comms_network
protection = CONFIG_ENTRY_LOCKED
/// cit config
/datum/config_entry/keyed_list/cross_server_bunker_override
key_mode = KEY_MODE_TEXT
value_mode = VALUE_MODE_TEXT