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

Sorta implements armor soak, very WIP

Browse Source
This commit is contained in:
Anewbe
2017-03-10 20:26:37 -06:00
parent 59a75f37a2
commit ac79f548e7
17 changed files with 158 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/traps.dm
+5 -1
View File
@@ -77,11 +77,15 @@
//armour
var/blocked = L.run_armor_check(target_zone, "melee")
var/soaked = L.get_armor_soak(target_zone, "melee")
if(blocked >= 100)
return
if(!L.apply_damage(30, BRUTE, target_zone, blocked, used_weapon=src))
if(soaked >= 30)
return
if(!L.apply_damage(30, BRUTE, target_zone, blocked, soaked, used_weapon=src))
return 0
//trap the victim in place