Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

2020-01-18 22:14:06 +01:00
parent 9c0b78bc09 4d06c2d2d3
commit 3ee855ab77
54 changed files with 4114 additions and 2584 deletions
@@ -43,6 +43,8 @@

 /datum/config_entry/flag/log_vote	// log voting

+/datum/config_entry/flag/log_craft	// log crafting
+
 /datum/config_entry/flag/log_whisper	// log client whisper

 /datum/config_entry/flag/log_attack	// log attack messages