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

[MIRROR] Fix Kinetic Projectiles in non PKAs breaking (#27059)

Browse Source 
Fix Kinetic Projectiles in non PKAs breaking (#82243)

## About The Pull Request

Kinetic blasts are fired from things which are not PKAs sometimes which
makes this runtime


![image](https://github.com/tgstation/tgstation/assets/51863163/53d3fe5f-7ab8-4e0d-ba81-36d148d671ae)

## Changelog

🆑 Melbert
fix: Non-PKA kinetic blasts should work better
/🆑

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
SkyratBot
2024-04-04 13:43:23 -04:00
committed by GitHub
co-authored by MrMelbert
parent ec1f5fdd7f
commit c33f18d30b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+3 -4
View File
@@ -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