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

2019-07-15 17:23:01 +02:00
parent 8df59b0b5c 8c1b7c4f22
commit 4df4cbd721
478 changed files with 4954 additions and 2477 deletions
@@ -265,7 +265,7 @@
 	var/list/datum/brain_trauma/possible_traumas = list()
 	for(var/T in subtypesof(brain_trauma_type))
 		var/datum/brain_trauma/BT = T
-		if(can_gain_trauma(BT, resilience))
+		if(can_gain_trauma(BT, resilience) && initial(BT.random_gain))
 			possible_traumas += BT

 	if(!LAZYLEN(possible_traumas))