mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 21:40:55 +01:00
Fixes meteors ignoring shields (#12907)
Co-authored-by: TGW <mc-casper@hotmail.dk>
This commit is contained in:
@@ -135,6 +135,14 @@
|
||||
|
||||
/obj/effect/meteor/Collide(atom/A)
|
||||
..()
|
||||
if(istype(A, /obj/effect/energy_field))
|
||||
hitpwr *= 0.5
|
||||
A.ex_act(hitpwr)
|
||||
visible_message(SPAN_DANGER("\The [src] breaks into dust!"))
|
||||
make_debris()
|
||||
msg_admin_attack("Meteor collided with shields at (<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
|
||||
qdel(src)
|
||||
|
||||
if(A && !QDELETED(src)) // Prevents explosions and other effects when we were deleted by whatever we Bumped() - currently used by shields.
|
||||
ram_turf(get_turf(A))
|
||||
get_hit() //should only get hit once per move attempt
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
author: TheGreyWolf
|
||||
|
||||
delete-after: True
|
||||
|
||||
changes:
|
||||
- bugfix: "Meteors will no longer ignore shields."
|
||||
Reference in New Issue
Block a user