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

Update phazon.dm

Browse Source
This commit is contained in:
Heroman3003
2023-02-05 07:04:19 +10:00
committed by GitHub
parent 68022d927c
commit 7ef71b6755
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/combat/phazon.dm
-5
View File
@@ -133,13 +133,8 @@
..()
<<<<<<< HEAD
/obj/mecha/combat/phazon/janus/dynattackby(obj/item/weapon/W as obj, mob/user as mob)
if(prob(max(1, (50 - round((W.force / 2) * damage_absorption["brute"])) * (1 - (W.armor_penetration / 100)))))
=======
/obj/mecha/combat/phazon/janus/dynattackby(obj/item/W as obj, mob/user as mob)
if(prob(max(1, (50 - round((W.force / 2) * inherent_damage_absorption["brute"])) * (1 - (W.armor_penetration / 100)))))
>>>>>>> d29c9fe35a8... Merge pull request #8905 from MistakeNot4892/mechabad
src.occupant_message("<span class='alien'>The armor absorbs the incoming attack's force, negating it!</span>")
src.visible_message("<span class='alien'>The [src.name] absorbs the incoming attack's force, negating it!</span>")
src.log_append_to_last("Armor absorbed.")