Merge remote-tracking branch 'upstream/master' into AnPrimAssistants

2020-08-24 09:36:36 +10:00
parent bd5848a0e3 b2ee58e229
commit f2a7c2599d
22 changed files with 247 additions and 127 deletions
@@ -54,7 +54,7 @@
 	REMOVE_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude")
 	REMOVE_TRAIT(user, TRAIT_NODISMEMBER, "fortitude")
 	REMOVE_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude")
-	REMOVE_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude")
+	REMOVE_TRAIT(user, TRAIT_NORUNNING, "fortitude")
 	if(!ishuman(owner))
 		return
 	var/mob/living/carbon/human/H = owner