cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #7330.

Browse Source
This commit is contained in:
Segrain
2014-12-09 07:39:38 +03:00
parent 827a14ca69
commit a311da90fb
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
code/game/mecha/mecha.dm
View File

@@ -506,14 +506,17 @@
src.visible_message("The [src.name] armor deflects the projectile") src.visible_message("The [src.name] armor deflects the projectile")
src.log_append_to_last("Armor saved.") src.log_append_to_last("Armor saved.")
return return
var/ignore_threshold
if(Proj.flag == "taser") if(Proj.damage_type == HALLOSS)
use_power(200) use_power(Proj.agony * 5)
return
if(istype(Proj, /obj/item/projectile/beam/pulse)) if(!(Proj.nodamage))
ignore_threshold = 1 var/ignore_threshold
src.take_damage(Proj.damage,Proj.flag) if(istype(Proj, /obj/item/projectile/beam/pulse))
src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),ignore_threshold) ignore_threshold = 1
src.take_damage(Proj.damage,Proj.flag)
src.check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT),ignore_threshold)
Proj.on_hit(src) Proj.on_hit(src)
return return