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

fixes parriable projectiles runtimes (#87899)

Browse Source
This commit is contained in:
Ben10Omintrix
2024-11-14 11:22:48 +01:00
committed by GitHub
parent 6cdfe1a868
commit 9ba27165e5
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/bullet_intercepting.dm
+1 -1
View File
@@ -56,7 +56,7 @@
wearer = null
/// Called when wearer is shot, check if we're going to block the hit
/datum/component/bullet_intercepting/proc/on_wearer_shot(mob/living/victim, list/signal_args, obj/projectile/bullet)
/datum/component/bullet_intercepting/proc/on_wearer_shot(mob/living/victim, obj/projectile/bullet)
SIGNAL_HANDLER
if (victim != wearer || victim.stat == DEAD || bullet.armor_flag != block_type)
return NONE
code/datums/components/parry.dm
+1 -2
View File
@@ -86,10 +86,9 @@
return
parriers[user] = world.time + grace_period
/datum/component/parriable_projectile/proc/before_hit(obj/projectile/source, list/bullet_args)
/datum/component/parriable_projectile/proc/before_hit(obj/projectile/source, mob/living/user)
SIGNAL_HANDLER
var/mob/user = bullet_args[2]
if (!istype(user) || !parriers[user] || parried)
return
parriers -= user
code/datums/components/riding/riding_mob.dm
+1 -1
View File
@@ -541,7 +541,7 @@
RegisterSignal(parent, COMSIG_PROJECTILE_PREHIT, PROC_REF(on_bullet_hit))
RegisterSignal(parent, COMSIG_MOB_AFTER_APPLY_DAMAGE, PROC_REF(on_attacked))
/datum/component/riding/creature/raptor/proc/on_bullet_hit(atom/target, list/bullet_args, obj/projectile/hit_projectile)
/datum/component/riding/creature/raptor/proc/on_bullet_hit(atom/target, obj/projectile/hit_projectile)
SIGNAL_HANDLER
if(hit_projectile.armor_flag == ENERGY)