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

2019-12-28 23:41:10 +01:00
parent 37441437d1 7e5e241bd2
commit 7837688426
84 changed files with 15426 additions and 12269 deletions
@@ -63,7 +63,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)