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

unify ranged_disarm procs (#19613)

Browse Source 
* unify ranged_disarm procs

* clarity

* shoot at that
This commit is contained in:
Will
2026-07-16 22:39:56 -04:00
committed by GitHub
parent 12b3d80872
commit 036a7450d3
3 changed files with 55 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+51
View File
@@ -1216,3 +1216,54 @@ Note: This proc can be overwritten to allow for different types of auto-alignmen
name = cleanname
if(cleandesc)
desc = cleandesc
/obj/item/proc/ranged_disarm(mob/living/carbon/human/target, mob/living/user, zone_override = null)
if(!ishuman(target))
return
var/target_zone
var/list/holding
if(istype(src,/obj/item/projectile))
// Projectiles use their aim, and always disarm
var/obj/item/projectile/bullet = src
target_zone = bullet.def_zone
holding = list(target.get_active_hand() = 100, target.get_inactive_hand() = 100)
else
// Melee attacks use user's targeting zone, and have a decent chance to disarm main hand
target_zone = user.zone_sel.selecting
holding = list(target.get_active_hand() = 40, target.get_inactive_hand() = 20)
if(zone_override) // Argument override
target_zone = zone_override
if(target_zone in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)) // Guns are complex devices, both of a mechanical and electronic nature. A weird gravity ball or other type of object trying to pull or grab it is likely not safe.
for(var/obj/item/gun/W in holding)
if(W && prob(holding[W]))
var/list/turfs = list()
for(var/turf/T in view())
turfs += T
if(turfs.len)
var/turf/shoot_at_turf = pick(turfs)
visible_message(span_danger("[target]'s [W] goes off due to \the [src]!"))
return W.afterattack(shoot_at_turf,target)
if(!(target.species.flags & NO_SLIP) && prob(10) && (target_zone in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)))
var/armor_check = target.run_armor_check(target_zone, "melee")
target.apply_effect(3, WEAKEN, armor_check)
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if(armor_check < 60)
visible_message(span_danger("\The [src] has tripped [target]!"))
else
visible_message(span_warning("\The [src] attempted to trip [target]!"))
return
if(target.break_all_grabs(user))
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
return
if(target_zone in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND))
for(var/obj/item/I in holding)
if(I && prob(holding[I]))
target.drop_from_inventory(I)
visible_message(span_danger("\The [src] has disarmed [target]!"))
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
return
code/game/objects/items/weapons/material/misc.dm
+2 -40
View File
@@ -142,10 +142,10 @@
if(I_HURT)
if(prob(10) && ishuman(target) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)))
to_chat(target, span_warning("\The [src] rips at your hands!"))
ranged_disarm(target)
ranged_disarm(target, user)
if(I_DISARM)
if(prob(min(90, force * 3)) && ishuman(target) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT, BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND)))
ranged_disarm(target)
ranged_disarm(target, user)
else
target.visible_message(span_danger("\The [src] sends \the [target] stumbling away."))
target.Move(get_step(target,get_dir(user,target)))
@@ -158,44 +158,6 @@
..()
/obj/item/material/whip/proc/ranged_disarm(mob/living/carbon/human/H, mob/living/user)
if(istype(H))
var/list/holding = list(H.get_active_hand() = 40, H.get_inactive_hand() = 20)
if(user.zone_sel in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND))
for(var/obj/item/gun/W in holding)
if(W && prob(holding[W]))
var/list/turfs = list()
for(var/turf/T in view())
turfs += T
if(turfs.len)
var/turf/target = pick(turfs)
visible_message(span_danger("[H]'s [W] goes off due to \the [src]!"))
return W.afterattack(target,H)
if(!(H.species.flags & NO_SLIP) && prob(10) && (user.zone_sel in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT)))
var/armor_check = H.run_armor_check(user.zone_sel, "melee")
H.apply_effect(3, WEAKEN, armor_check)
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if(armor_check < 60)
visible_message(span_danger("\The [src] has tripped [H]!"))
else
visible_message(span_warning("\The [src] attempted to trip [H]!"))
return
else
if(H.break_all_grabs(user))
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
return
if(user.zone_sel in list(BP_L_ARM, BP_R_ARM, BP_L_HAND, BP_R_HAND))
for(var/obj/item/I in holding)
if(I && prob(holding[I]))
H.drop_from_inventory(I)
visible_message(span_danger("\The [src] has disarmed [H]!"))
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
return
/obj/item/material/whip/attack_self(mob/user)
. = ..(user)
if(.)