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

Energy dagger is quieter, and can backstab (#19963)

Browse Source 
* edagger buffs

* Charlie's changes

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* Sean's Changes

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* rewrite most of this nonsense

* re-adds parent proc, makes parent proc silent

* the things charlie asked for

* Apply faerie's changes

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
This commit is contained in:
BiancaWilkson
2023-01-12 13:32:23 -05:00
committed by GitHub
parent a1959e799c
commit a69a8fc64a
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/pen.dm
+25 -2
View File
@@ -147,8 +147,31 @@
var/on = FALSE
var/brightness_on = 2
light_color = LIGHT_COLOR_RED
var/backstab_sound = 'sound/items/unsheath.ogg'
var/backstab_damage = 12
armour_penetration_flat = 20
/obj/item/pen/edagger/attack(mob/living/M, mob/living/user, def_zone)
var/extra_force_applied = FALSE
if(on && user.dir == M.dir && !HAS_TRAIT(M, TRAIT_FLOORED) && user != M)
force += backstab_damage
extra_force_applied = TRUE
add_attack_logs(user, M, "Backstabbed with [src]", ATKLOG_ALL)
M.apply_damage(40, STAMINA) //Just enough to slow
M.KnockDown(2 SECONDS)
M.visible_message("<span class='warning'>[user] stabs [M] in the back!</span>", "<span class='userdanger'>[user] stabs you in the back! The energy blade makes you collapse in pain!</span>")
playsound(loc, backstab_sound, 5, TRUE, ignore_walls = FALSE, falloff_distance = 0)
else
playsound(loc, hitsound, 5, TRUE, ignore_walls = FALSE, falloff_distance = 0)
. = ..()
if(extra_force_applied)
force -= backstab_damage
/obj/item/pen/edagger/get_clamped_volume() //So the parent proc of attack isn't the loudest sound known to man
return 0
/obj/item/pen/edagger/attack_self(mob/living/user)
if(on)
on = FALSE
@@ -159,7 +182,7 @@
hitsound = initial(hitsound)
embed_chance = initial(embed_chance)
throwforce = initial(throwforce)
playsound(user, 'sound/weapons/saberoff.ogg', 5, 1)
playsound(user, 'sound/weapons/saberoff.ogg', 2, 1)
to_chat(user, "<span class='warning'>[src] can now be concealed.</span>")
set_light(0)
else
@@ -171,7 +194,7 @@
hitsound = 'sound/weapons/blade1.ogg'
embed_chance = 100 //rule of cool
throwforce = 35
playsound(user, 'sound/weapons/saberon.ogg', 5, 1)
playsound(user, 'sound/weapons/saberon.ogg', 2, 1)
to_chat(user, "<span class='warning'>[src] is now active.</span>")
set_light(brightness_on, 1)
set_sharpness(on)