cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-07-20 12:42:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

glove attack refactor

Browse Source
This commit is contained in:
Screemonster
2019-08-28 07:56:23 +01:00
parent 95d6dd7eb6
commit d808286f3c
4 changed files with 58 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/HolodeckObjects.dm
+32
View File
@@ -126,6 +126,38 @@
slot_r_hand_str = 'icons/mob/items/righthand_gloves.dmi',
)
item_state = "boxing"
special_attack_type = /datum/unarmed_attack/holopugilism
datum/unarmed_attack/holopugilism
sparring_variant_type = /datum/unarmed_attack/holopugilism
datum/unarmed_attack/holopugilism/unarmed_override(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/zone)
user.do_attack_animation(src)
var/damage = rand(0, 9)
if(!damage)
playsound(target.loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
target.visible_message("<font color='red'><B>[user] has attempted to punch [target]!</B></font>")
return 1
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
playsound(target.loc, "punch", 25, 1, -1)
target.visible_message("<font color='red'><B>[user] has punched [target]!</B></font>")
if(armor_soak >= damage)
return
target.apply_damage(damage, HALLOSS, affecting, armor_block, armor_soak)
if(damage >= 9)
target.visible_message("<font color='red'><B>[user] has weakened [target]!</B></font>")
target.apply_effect(4, WEAKEN, armor_block)
return 1
/obj/structure/window/reinforced/holowindow/attackby(obj/item/W as obj, mob/user as mob)
if(!istype(W))