cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5949 from Kyep/mechdisablers

Browse Source 
Fixes #3628 - Disablers no longer blow up mechs
This commit is contained in:
Fox McCloud
2016-12-08 19:04:58 -05:00
committed by GitHub
parent def08f87ed 9e7a30d786
commit 7be4dcc72c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+3 -1
View File
@@ -563,7 +563,9 @@
dam_coeff = B.damage_coeff
break
if(prob(deflect_chance * deflection) && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
if(Proj.damage_type != BRUTE && Proj.damage_type != BURN)
visible_message("<span class='danger'>[src]'s armour is undamaged by [Proj]!</span>")
else if(prob(deflect_chance * deflection))
visible_message("<span class='danger'>[src]'s armour deflects [Proj]!</span>")
else
visible_message("<span class='danger'>[src] is hit by [Proj].</span>")