mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-31 20:43:12 +00:00
Adds a Whip. (#7780)
* Adds material-based whips. The chain of command, as a whip-a-like, has reach 2. * Adds the Whip to leather-crafting. * Fix Inhands * Don't test at night kids. * Tweaktweak * Map * Span * Don't spam more than one message on harm. * Ranged Disarm now only occurs in logical context. (Aiming at arms or legs)
This commit is contained in:
Mechoid
GitHub
@@ -93,3 +93,118 @@
|
||||
//icon_state = "reinf-snowball"
|
||||
force_divisor = 0.20
|
||||
thrown_force_divisor = 0.25
|
||||
|
||||
/obj/item/weapon/material/whip
|
||||
name = "whip"
|
||||
desc = "A tool used to discipline animals, or look cool. Mostly the latter."
|
||||
description_info = "Help - Standard attack, no modifiers.<br>\
|
||||
Disarm - Disarming strike. Attempts to disarm the target at range, similar to an unarmed disarm. Additionally, will force the target (if possible) to move away from you.<br>\
|
||||
Grab - Grappling strike. Attempts to pull the target toward you. This can also move objects.<br>\
|
||||
Harm - A standard strike with a small chance to disarm."
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
icon_state = "whip"
|
||||
item_state = "chain"
|
||||
default_material = MAT_LEATHER
|
||||
slot_flags = SLOT_BELT
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
origin_tech = list(TECH_COMBAT = 2)
|
||||
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
|
||||
force_divisor = 0.15
|
||||
thrown_force_divisor = 0.25
|
||||
reach = 2
|
||||
|
||||
item_icons = list(
|
||||
slot_l_hand_str = 'icons/mob/items/lefthand_melee.dmi',
|
||||
slot_r_hand_str = 'icons/mob/items/righthand_melee.dmi',
|
||||
)
|
||||
|
||||
/obj/item/weapon/material/whip/afterattack(atom/A as mob|obj|turf|area, mob/user as mob, proximity)
|
||||
..()
|
||||
|
||||
if(!proximity)
|
||||
return
|
||||
|
||||
if(istype(A, /atom/movable))
|
||||
var/atom/movable/AM = A
|
||||
if(AM.anchored)
|
||||
to_chat(user, "<span class='notice'>\The [AM] won't budge.</span>")
|
||||
return
|
||||
|
||||
else
|
||||
if(!istype(AM, /obj/item))
|
||||
user.visible_message("<span class='warning'>\The [AM] is pulled along by \the [src]!</span>")
|
||||
AM.Move(get_step(AM, get_dir(AM, src)))
|
||||
return
|
||||
|
||||
else
|
||||
user.visible_message("<span class='warning'>\The [AM] is snatched by \the [src]!</span>")
|
||||
AM.throw_at(user, reach, 0.1, user)
|
||||
|
||||
/obj/item/weapon/material/whip/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone)
|
||||
if(user.a_intent)
|
||||
switch(user.a_intent)
|
||||
if(I_HURT)
|
||||
if(prob(10) && istype(target, /mob/living/carbon/human) && 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 class='warning'>\The [src] rips at your hands!</span>")
|
||||
ranged_disarm(target)
|
||||
if(I_DISARM)
|
||||
if(prob(min(90, force * 3)) && istype(target, /mob/living/carbon/human) && 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)
|
||||
else
|
||||
target.visible_message("<span class='danger'>\The [src] sends \the [target] stumbling away.</span>")
|
||||
target.Move(get_step(target,get_dir(user,target)))
|
||||
if(I_GRAB)
|
||||
var/turf/STurf = get_turf(target)
|
||||
spawn(2)
|
||||
playsound(STurf, 'sound/effects/snap.ogg', 60, 1)
|
||||
target.visible_message("<span class='critical'>\The [src] yanks \the [target] towards \the [user]!</span>")
|
||||
target.throw_at(get_turf(get_step(user,get_dir(user,target))), 2, 1, src)
|
||||
|
||||
..()
|
||||
|
||||
/obj/item/weapon/material/whip/proc/ranged_disarm(var/mob/living/carbon/human/H, var/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/weapon/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 class='danger'>[H]'s [W] goes off due to \the [src]!</span>")
|
||||
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 class='danger'>\The [src] has tripped [H]!</span>")
|
||||
else
|
||||
visible_message("<span class='warning'>\The [src] attempted to trip [H]!</span>")
|
||||
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 class='danger'>\The [src] has disarmed [H]!</span>")
|
||||
playsound(src, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
|
||||
return
|
||||
|
||||
/obj/item/weapon/material/whip/suicide_act(mob/user)
|
||||
var/datum/gender/T = gender_datums[user.get_visible_gender()]
|
||||
user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!"))
|
||||
return (OXYLOSS)
|
||||
|
||||
/obj/item/weapon/material/whip/attack_self(mob/user)
|
||||
user.visible_message("<span class='warning'>\The [user] cracks \the [src]!</span>")
|
||||
playsound(src, 'sound/effects/snap.ogg', 50, 1)
|
||||
|
||||
@@ -9,10 +9,12 @@
|
||||
origin_tech = list(TECH_COMBAT = 4)
|
||||
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
|
||||
|
||||
suicide_act(mob/user)
|
||||
var/datum/gender/T = gender_datums[user.get_visible_gender()]
|
||||
user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!"))
|
||||
return (OXYLOSS)
|
||||
reach = 2
|
||||
|
||||
/obj/item/weapon/melee/chainofcommand/suicide_act(mob/user)
|
||||
var/datum/gender/T = gender_datums[user.get_visible_gender()]
|
||||
user.visible_message(span("danger", "\The [user] [T.is] strangling [T.himself] with \the [src]! It looks like [T.he] [T.is] trying to commit suicide."), span("danger", "You start to strangle yourself with \the [src]!"), span("danger", "You hear the sound of someone choking!"))
|
||||
return (OXYLOSS)
|
||||
|
||||
/obj/item/weapon/melee/umbrella
|
||||
name = "umbrella"
|
||||
|
||||
Reference in New Issue
Block a user