cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into synctesting

Browse Source
This commit is contained in:
deathride58
2018-04-09 21:43:26 +00:00
committed by GitHub
parent d3ba1085bb dab96582bd
commit e0d7630c19
43 changed files with 411 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/controllers/configuration/configuration.dm
View File

@@ -165,7 +165,7 @@
var/datum/config_entry/E = entry_type
var/entry_is_abstract = initial(E.abstract_type) == entry_type
if(entry_is_abstract)
CRASH("Tried to retrieve an abstract config_entry: [entry_type]")
CRASH("Tried to set an abstract config_entry: [entry_type]")
E = entries_by_type[entry_type]
if(!E)
CRASH("Missing config entry for [entry_type]!")

5
code/controllers/configuration/entries/game_options.dm
View File

@@ -226,10 +226,13 @@
/datum/config_entry/keyed_number_list/law_weight
splitter = ","
/datum/config_entry/number/assistant_cap
/datum/config_entry/number/overflow_cap
config_entry_value = -1
min_val = -1
/datum/config_entry/string/overflow_job
config_entry_value = "Assistant"
/datum/config_entry/flag/starlight
/datum/config_entry/flag/grey_assistants