cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes harmless embeds doing jostle messages

Browse Source
This commit is contained in:
Ryll-Ryll
2020-02-29 06:29:45 -05:00
parent e21e317a0f
commit b02b2e4e6e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/embedded.dm
+2 -2
View File
@@ -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, "<span class='userdanger'>[weapon] embedded in your [L.name] jostles and stings!</span>")
@@ -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, "<span class='userdanger'>[weapon] embedded in your [L.name] hurts!</span>")