From b02b2e4e6e90fd4a442b0171e0cc59a84ca1d262 Mon Sep 17 00:00:00 2001
From: Ryll-Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Date: Sat, 29 Feb 2020 06:29:45 -0500
Subject: [PATCH] fixes harmless embeds doing jostle messages
---
code/datums/components/embedded.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/datums/components/embedded.dm b/code/datums/components/embedded.dm
index 6cdfa8352b3..a2425456f76 100644
--- a/code/datums/components/embedded.dm
+++ b/code/datums/components/embedded.dm
@@ -149,7 +149,7 @@
if(victim.m_intent == MOVE_INTENT_WALK || victim.lying)
chance *= 0.5
- if(prob(chance))
+ if(harmful && prob(chance))
var/damage = weapon.w_class * jostle_pain_mult
L.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage)
to_chat(victim, "[weapon] embedded in your [L.name] jostles and stings!")
@@ -223,7 +223,7 @@
if(victim.stat == DEAD)
return
- if(harmful && prob(pain_chance))
+ if(harmful && prob(pain_chance))
var/damage = weapon.w_class * pain_mult
L.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage)
to_chat(victim, "[weapon] embedded in your [L.name] hurts!")