From 8ceae6c7d528fc9f41178e03111dd3d5fdd45b2a Mon Sep 17 00:00:00 2001
From: Casper3667 <8396443+Casper3667@users.noreply.github.com>
Date: Tue, 11 Jan 2022 18:45:09 +0100
Subject: [PATCH] Fixes meteors ignoring shields (#12907)

Co-authored-by: TGW <mc-casper@hotmail.dk>
---
 code/game/gamemodes/meteor/meteors.dm | 8 ++++++++
 html/changelogs/MeteorFix.yml         | 6 ++++++
 2 files changed, 14 insertions(+)
 create mode 100644 html/changelogs/MeteorFix.yml

diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm
index d30821024c9..27412b7ce3e 100644
--- a/code/game/gamemodes/meteor/meteors.dm
+++ b/code/game/gamemodes/meteor/meteors.dm
@@ -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
diff --git a/html/changelogs/MeteorFix.yml b/html/changelogs/MeteorFix.yml
new file mode 100644
index 00000000000..d06f510b030
--- /dev/null
+++ b/html/changelogs/MeteorFix.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "Meteors will no longer ignore shields."