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

2019-12-30 00:32:25 -08:00
parent e3844ee1f9 5a8380f77b
commit 24e3b88a34
663 changed files with 34689 additions and 15450 deletions
@@ -64,7 +64,8 @@
 	emitterhealth = CLAMP((emitterhealth - amount), -50, emittermaxhealth)
 	if(emitterhealth < 0)
 		fold_in(force = TRUE)
-	to_chat(src, "<span class='userdanger'>The impact degrades your holochassis!</span>")
+	if(amount > 0)
+		to_chat(src, "<span class='userdanger'>The impact degrades your holochassis!</span>")
 	return amount

 /mob/living/silicon/pai/adjustBruteLoss(amount, updating_health = TRUE, forced = FALSE)