cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 02:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

KA Leftovers Fix (#10165)

Browse Source 
KAs no longer leave behind phantom projectiles that injure people.
    KAs no longer recursively destroy rocks when one breaks, but still retain AoE effects.
    KAs now have at least one tile of AoE on all modules.

Also fixes a runtime with pin attackby.
This commit is contained in:
Geeves
2020-10-06 14:06:10 +02:00
committed by GitHub
parent 9621bb75f7
commit d19cf6e3d6
5 changed files with 30 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
code/modules/custom_ka/projectiles.dm
View File

@@ -19,53 +19,26 @@
damage = 25
/obj/item/projectile/kinetic/on_impact(var/atom/A)
var/turf/target_turf = get_turf(A)
if(!target_turf)
target_turf = get_turf(src)
if(istype(target_turf) && !aoe_shot)
aoe_shot = TRUE
strike_thing(A)
else if(aoe_shot)
do_damage(A)
/obj/item/projectile/kinetic/proc/do_damage(var/atom/A)
var/turf/target_turf = get_turf(A)
if(!target_turf)
target_turf = get_turf(src)
if(istype(target_turf))
var/datum/gas_mixture/environment = target_turf.return_air()
damage *= max(1 - (environment.return_pressure() / 100) * 0.75, 0)
if(isliving(A)) //Never do more than 50 damage to a living being per shot.
damage = min(damage, 50)
if(istype(target_turf, /turf/simulated/mineral))
var/turf/simulated/mineral/M = target_turf
M.kinetic_hit(base_damage, dir)
strike_thing(target_turf)
/obj/item/projectile/kinetic/proc/strike_thing(atom/target)
/obj/item/projectile/kinetic/proc/do_damage(var/turf/T, var/living_damage = 1, var/mineral_damage = 1)
var/datum/gas_mixture/environment = T.return_air()
living_damage *= max(1 - (environment.return_pressure() / 100) * 0.75, 0)
new /obj/effect/overlay/temp/kinetic_blast(T)
for(var/mob/living/L in T)
L.take_overall_damage(min(living_damage, 50))
L.visible_message(SPAN_DANGER("\The [L] is hit by \the [src]!"), SPAN_DANGER("You are hit by \the [src]!"))
if(istype(T, /turf/simulated/mineral))
var/turf/simulated/mineral/M = T
M.kinetic_hit(mineral_damage)
var/turf/target_turf = get_turf(target)
if(istype(target_turf, /turf/simulated/mineral))
var/turf/simulated/mineral/M = target_turf
M.kinetic_hit(base_damage, dir)
new /obj/effect/overlay/temp/kinetic_blast(target_turf)
for(var/new_target in orange(aoe, target_turf))
new /obj/effect/overlay/temp/kinetic_blast(get_turf(new_target))
var/obj/item/projectile/kinetic/spread = new /obj/item/projectile/kinetic
if(istype(get_turf(new_target), /turf/simulated/mineral))
spread.aoe_shot = TRUE
spread.damage = max(base_damage - base_damage * get_dist(new_target, target_turf) * 0.25, 0)
spread.base_damage = base_damage
var/turf/simulated/mineral/M = new_target
M.kinetic_hit(spread.base_damage, dir)
qdel(spread)
CHECK_TICK
continue
else
spread.aoe_shot = TRUE
spread.damage = max(base_damage - base_damage * get_dist(new_target, target_turf) * 0.25, 0)
spread.base_damage = base_damage
spread.do_damage(new_target)
spread.Collide(new_target)
CHECK_TICK
/obj/item/projectile/kinetic/proc/strike_thing(var/turf/target_turf)
for(var/new_target in RANGE_TURFS(aoe, target_turf))
var/turf/aoe_turf = new_target
do_damage(aoe_turf, max(base_damage - base_damage * get_dist(aoe_turf, target_turf) * 0.25, 0), base_damage)
if(!QDELETED(src))
qdel(src)