cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Captain's saber help intent slaps with flat of blade (#26869)

Browse Source 
* help intent with the saber slaps

* fix if statements to make papa linter happy

* misc code improvements suggested by contrabang

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
Paul
2024-10-09 06:54:03 -04:00
committed by GitHub
parent 37db29f984
commit 95b2d62e4f
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/melee/melee_misc.dm
+26
View File
@@ -39,6 +39,9 @@
hitsound = 'sound/weapons/rapierhit.ogg'
materials = list(MAT_METAL = 1000)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Theft targets should be hard to destroy
// values for slapping
var/slap_sound = 'sound/effects/woodhit.ogg'
COOLDOWN_DECLARE(slap_cooldown)
/obj/item/melee/saber/examine(mob/user)
. = ..()
@@ -58,6 +61,29 @@
AddComponent(/datum/component/parry, _stamina_constant = 2, _stamina_coefficient = 0.5, _parryable_attack_types = NON_PROJECTILE_ATTACKS)
RegisterSignal(src, COMSIG_PARENT_QDELETING, PROC_REF(alert_admins_on_destroy))
/obj/item/melee/saber/attack(mob/living/target, mob/living/user)
if(user.a_intent != INTENT_HELP || !ishuman(target))
return ..()
if(!COOLDOWN_FINISHED(src, slap_cooldown))
return
var/mob/living/carbon/human/H = target
if(HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
user.visible_message("<span class='danger'>[user] accidentally slaps [user.p_themselves()] with [src]!</span>", \
"<span class='userdanger'>You accidentally slap yourself with [src]!</span>")
slap(user, user)
else
user.visible_message("<span class='danger'>[user] slaps [H] with the flat of the blade!</span>", \
"<span class='userdanger'>You slap [H] with the flat of the blade!</span>")
slap(target, user)
/obj/item/melee/saber/proc/slap(mob/living/carbon/human/target, mob/living/user)
user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
playsound(loc, slap_sound, 50, TRUE, -1)
target.AdjustConfused(4 SECONDS, 0, 4 SECONDS)
target.apply_damage(10, STAMINA)
add_attack_logs(user, target, "Slapped by [src]", ATKLOG_ALL)
COOLDOWN_START(src, slap_cooldown, 4 SECONDS)
/obj/item/melee/saber/suicide_act(mob/user)
user.visible_message(pick("<span class='suicide'>[user] is slitting [user.p_their()] stomach open with [src]! It looks like [user.p_theyre()] trying to commit seppuku!</span>", \
"<span class='suicide'>[user] is falling on [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>"))