From 1424c3f6cd0be5460a51033803ed4cdacfd1c59c Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Wed, 23 Nov 2016 22:20:47 +0000
Subject: [PATCH] Regardless of what I'm doing next, this removal of limits in
 this place still should've been done a while ago.

---
 src/p_user.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/p_user.c b/src/p_user.c
index 7acb37093..94e565214 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -6982,12 +6982,8 @@ static void P_MovePlayer(player_t *player)
 							break;
 						// Armageddon shield activation
 						case SH_ARMAGEDDON:
-							// Don't let Super Sonic or invincibility use it
-							if (!(player->powers[pw_super] || player->powers[pw_invulnerability]))
-							{
-								player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
-								P_BlackOw(player);
-							}
+							player->pflags |= PF_THOKKED|PF_SHIELDABILITY;
+							P_BlackOw(player);
 							break;
 						// Attract shield activation
 						case SH_ATTRACT: