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

Sleeping Carp and Cain & Abel no longer tell you about armor penetration when you reflect projectiles with them (#93275)

Browse Source 
## About The Pull Request

Projectile refactor pulled armor check above the pre-hit comsig, this
fixes that. No need to check armor before you're hit when you
potentially will not be.

## Changelog
🆑
fix: Sleeping Carp and Cain & Abel no longer tell you about armor
penetration when you reflect projectiles with them
/🆑
This commit is contained in:
SmArtKar
2025-10-12 05:39:43 +02:00
committed by GitHub
parent b47de18bfb
commit 4d648d016c
19 changed files with 81 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mod/modules/modules_timeline.dm
+8 -8
View File
@@ -401,15 +401,15 @@
timetokill += seconds_per_tick
/obj/structure/chrono_field/bullet_act(obj/projectile/projectile)
if(istype(projectile, /obj/projectile/energy/chrono_beam))
var/obj/projectile/energy/chrono_beam/beam = projectile
var/obj/item/mod/module/tem/linked_tem = beam.tem_weakref.resolve()
if(linked_tem && istype(linked_tem))
linked_tem.field_connect(src)
return BULLET_ACT_HIT
/obj/structure/chrono_field/projectile_hit(obj/projectile/hitting_projectile, def_zone, piercing_hit, blocked)
if(!istype(hitting_projectile, /obj/projectile/energy/chrono_beam))
return ..()
return ..()
var/obj/projectile/energy/chrono_beam/beam = hitting_projectile
var/obj/item/mod/module/tem/linked_tem = beam.tem_weakref.resolve()
if(linked_tem && istype(linked_tem))
linked_tem.field_connect(src)
return BULLET_ACT_HIT
/obj/structure/chrono_field/assume_air()
return FALSE