cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 23:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

More armor touchups. I think I found all the relevant calls, but... mob code.

Browse Source
This commit is contained in:
sirbayer
2014-01-07 15:27:30 -08:00
parent b39dcc949c
commit 6f0447ffa2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+1 -1
View File
@@ -172,7 +172,7 @@ emp_act
"<span class='userdanger'>[src] has been attacked in the [hit_area] with [I] by [user]!</span>")
var/armor = run_armor_check(affecting, "melee", "<span class='warning'>Your armour has protected your [hit_area].</span>", "<span class='warning'>Your armour has softened a hit to your [hit_area].</span>")
if(armor >= 2) return 0
if(armor <= 0) return 0
if(!I.force) return 0
var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -6,7 +6,7 @@
else
src << "<span class='userdanger'>Your armor absorbs the blow!</span>"
else if(armor < 1)
if(absorb_text)
if(soften_text)
src << "<span class='userdanger'>[soften_text]</span>"
else
src << "<span class='userdanger'>Your armor softens the blow!</span>"