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

Merge remote-tracking branch 'citadel/master' into combat_rework_experimental

Browse Source
This commit is contained in:
silicons
2020-10-10 22:23:22 -07:00
parent 1b1efce556 376f59c8cd
commit 7f611a98e1
215 changed files with 7532 additions and 2391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/configuration/entries/general.dm
+3
View File
@@ -468,6 +468,9 @@
/datum/config_entry/string/default_view
config_entry_value = "15x15"
/datum/config_entry/string/default_view_square
config_entry_value = "15x15"
/datum/config_entry/flag/log_pictures
/datum/config_entry/flag/picture_logging_camera