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

Merge branch 'master' into movespeed_modifiers_take_two

Browse Source
This commit is contained in:
kevinz000
2020-02-21 01:38:09 -07:00
committed by GitHub
parent 851f5f2939 6d8bd8405f
commit df38abf7a1
365 changed files with 4129 additions and 4231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration/config_entry.dm
+1 -1
View File
@@ -98,7 +98,7 @@
return FALSE
var/temp = text2num(trim(str_val))
if(!isnull(temp))
config_entry_value = CLAMP(integer ? round(temp) : temp, min_val, max_val)
config_entry_value = clamp(integer ? round(temp) : temp, min_val, max_val)
if(config_entry_value != temp && !(datum_flags & DF_VAR_EDITED))
log_config("Changing [name] from [temp] to [config_entry_value]!")
return TRUE
code/controllers/configuration/entries/general.dm
+10
View File
@@ -484,3 +484,13 @@
/datum/config_entry/flag/reopen_roundstart_suicide_roles_command_report
/datum/config_entry/flag/auto_profile
// DISCORD ROLE STUFFS
// Using strings for everything because BYOND does not like numbers this big
/datum/config_entry/flag/enable_discord_autorole
/datum/config_entry/string/discord_token
/datum/config_entry/string/discord_guildid
/datum/config_entry/string/discord_roleid