Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fix Kinetic Projectiles in non PKAs breaking #2583

Merged
merged 1 commit into from
Mar 27, 2024
+3 −4
Merged

[MIRROR] Fix Kinetic Projectiles in non PKAs breaking #2583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions code/modules/projectiles/guns/energy/kinetic_accelerator.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,14 +191,13 @@
return ..()

/obj/projectile/kinetic/prehit_pierce(atom/target)
if(is_type_in_typecache(target, kinetic_gun.ignored_mob_types))
if(is_type_in_typecache(target, kinetic_gun?.ignored_mob_types))
return PROJECTILE_PIERCE_PHASE
. = ..()
if(. == PROJECTILE_PIERCE_PHASE)
return
if(kinetic_gun)
for(var/obj/item/borg/upgrade/modkit/modkit_upgrade as anything in kinetic_gun.modkits)
modkit_upgrade.projectile_prehit(src, target, kinetic_gun)
for(var/obj/item/borg/upgrade/modkit/modkit_upgrade as anything in kinetic_gun?.modkits)
modkit_upgrade.projectile_prehit(src, target, kinetic_gun)
if(!pressure_decrease_active && !lavaland_equipment_pressure_check(get_turf(target)))
name = "weakened [name]"
damage = damage * pressure_decrease
Expand Down
Loading