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

Dswords now return melee attack on parry. Eswords reflect lasers on parry. Throwing bodies at a dsword user may not work well (#21463)

Browse Source
This commit is contained in:
Qwertytoforty
2023-07-01 10:42:44 +02:00
committed by GitHub
parent eee90b49d8
commit 04e1792d0d
3 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/carbon.dm
+9
View File
@@ -625,6 +625,15 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
hit_atom.hit_by_thrown_carbon(src, throwingdatum, damage, FALSE, FALSE)
/mob/living/carbon/hit_by_thrown_carbon(mob/living/carbon/human/C, datum/thrownthing/throwingdatum, damage, mob_hurt, self_hurt)
for(var/obj/item/twohanded/dualsaber/D in contents)
if(D.wielded)
visible_message("<span class='danger'>[src] impales [C] with [D], before dropping them on the ground!</span>")
C.apply_damage(100, BRUTE, "chest", sharp = TRUE, used_weapon = "Impaled on [D].")
C.Stun(2 SECONDS) //Punishment. This could also be used by a traitor to throw someone into a dsword to kill them, but hey, teamwork!
C.KnockDown(6 SECONDS)
D.melee_attack_chain(src, C) //attack animation / jedi spin
C.emote("scream")
return
. = ..()
KnockDown(3 SECONDS)