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

Update mecha.dm

Browse Source
This commit is contained in:
Novacat
2020-07-30 14:52:28 -04:00
committed by GitHub
parent 142f0c253f
commit d68f0ece6a
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
-6
View File
@@ -1052,16 +1052,10 @@
var/pass_damage = W.force
pass_damage = (pass_damage*pass_damage_reduc_mod) //Apply the reduction of damage from not having enough armor penetration. This is not regular armor values at play.
for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment)
<<<<<<< HEAD
pass_damage = ME.handle_projectile_contact(W, pass_damage)
src.take_damage(pass_damage,W.damtype)
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
=======
pass_damage = ME.handle_projectile_contact(W, user, pass_damage)
src.take_damage(pass_damage,W.damtype) //The take_damage() proc handles armor values
if(pass_damage > internal_damage_minimum) //Only decently painful attacks trigger a chance of mech damage.
src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
>>>>>>> 55d60d0... Merge pull request #7350 from lbnesquik/Kot-Extra-Mech-branch
return
//////////////////////