Merge branch 'master' into Ghommie-cit222

2019-10-12 11:20:32 -04:00
parent fce6f13471 f57fa7f471
commit 0c8b82168d
445 changed files with 61756 additions and 57805 deletions
@@ -39,6 +39,8 @@

 /datum/config_entry/flag/log_game	// log game events

+/datum/config_entry/flag/log_virus	// log virology data
+
 /datum/config_entry/flag/log_vote	// log voting

 /datum/config_entry/flag/log_whisper	// log client whisper
@@ -294,7 +294,7 @@ Versioning
 	var/lakey = L.lastattackerckey
 	var/sqlbrute = L.getBruteLoss()
 	var/sqlfire = L.getFireLoss()
-	var/sqlbrain = L.getBrainLoss()
+	var/sqlbrain = L.getOrganLoss(ORGAN_SLOT_BRAIN)
 	var/sqloxy = L.getOxyLoss()
 	var/sqltox = L.getToxLoss()
 	var/sqlclone = L.getCloneLoss()
@@ -308,7 +308,7 @@ Versioning

 	if(!SSdbcore.Connect())
 		return
-	
+
 	sqlname = sanitizeSQL(sqlname)
 	sqlkey = sanitizeSQL(sqlkey)
 	sqljob = sanitizeSQL(sqljob)