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

This commit is contained in:
Letter N
2020-12-29 10:37:06 +08:00
36 changed files with 236 additions and 49 deletions
+2 -2
View File
@@ -133,12 +133,12 @@
return TRUE
/datum/job/proc/GetAntagRep()
. = CONFIG_GET(keyed_list/antag_rep)[lowertext(title)]
. = CONFIG_GET(keyed_list/antag_rep)[ckey(title)]
if(. == null)
return antag_rep
/datum/job/proc/GetThreat()
. = CONFIG_GET(keyed_list/job_threat)[lowertext(title)]
. = CONFIG_GET(keyed_list/job_threat)[ckey(title)]
if(. == null)
return threat