cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-23 21:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] initial throw fixing (#12231)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: C.L. <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-01-08 22:45:27 +01:00
committed by GitHub
co-authored by Kashargul C.L.
parent 4693238765
commit 441ee14971
43 changed files with 219 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/kinetic_crusher.dm
+2 -2
View File
@@ -136,13 +136,13 @@
else
L.apply_damage(detonation_damage + thrown_bonus, BRUTE, blocked = def_check)
/obj/item/kinetic_crusher/throw_impact(atom/hit_atom, speed)
/obj/item/kinetic_crusher/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatumd)
. = ..()
if(!isliving(hit_atom))
return
var/mob/living/L = hit_atom
if(L.has_modifier_of_type(/datum/modifier/crusher_mark))
detonate(L, thrower, TRUE)
detonate(L, throwingdatumd?.get_thrower(), TRUE)
/obj/item/kinetic_crusher/proc/Recharge()
if(!charged)