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

Soakn't (#18647)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Reo Lozzot
2025-10-27 02:58:37 -04:00
committed by GitHub
co-authored by Cameron Lennox
parent c42dfc3efc
commit ceb33e3e7d
56 changed files with 75 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/HolodeckObjects.dm
+1 -5
View File
@@ -172,7 +172,6 @@
return TRUE
var/obj/item/organ/external/affecting = target.get_organ(ran_zone(user.zone_sel.selecting))
var/armor_block = target.run_armor_check(affecting, "melee")
var/armor_soak = target.get_armor_soak(affecting, "melee")
if(HULK in user.mutations)
damage += 5
@@ -181,10 +180,7 @@
target.visible_message(span_bolddanger("[user] has punched [target]!"))
if(armor_soak >= damage)
return TRUE
target.apply_damage(damage, HALLOSS, affecting, armor_block, armor_soak)
target.apply_damage(damage, HALLOSS, affecting, armor_block)
if(damage >= 9)
target.visible_message(span_bolddanger("[user] has weakened [target]!"))
target.apply_effect(4, WEAKEN, armor_block)