From a3e29da443dc2f8cc3d5d6b1dd826fa21bbe9ed9 Mon Sep 17 00:00:00 2001
From: xxalpha <xxnoob@live.com>
Date: Tue, 21 Jul 2015 03:17:28 +0100
Subject: [PATCH] Fixed changeling shields dropping when ling is prone.

Fixed pathing

Better fix

Nevermind, back to what it was
---
 code/game/gamemodes/changeling/powers/mutations.dm | 4 ++--
 code/modules/mob/inventory.dm                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm
index 5d8ef2f8963..ca3ba2594de 100644
--- a/code/game/gamemodes/changeling/powers/mutations.dm
+++ b/code/game/gamemodes/changeling/powers/mutations.dm
@@ -200,13 +200,13 @@
 /obj/item/weapon/shield/changeling
 	name = "shield-like mass"
 	desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield."
-	flags = NODROP
+	flags = ABSTRACT | NODROP
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "ling_shield"
 
 	var/remaining_uses //Set by the changeling ability.
 
-/obj/item/weapon/melee/shield/New()
+/obj/item/weapon/shield/changeling/New()
 	..()
 	if(ismob(loc))
 		loc.visible_message("<span class='warning'>The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!</span>", "<span class='warning'>We inflate our hand into a strong shield.</span>", "<span class='italics'>You hear organic matter ripping and tearing!</span>")
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 4e0a620168d..bd84cfe6ca0 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -56,8 +56,8 @@
 	return 0
 
 /mob/proc/put_in_hand_check(obj/item/W)
-	if(lying && !(W.flags&ABSTRACT))			return 0
-	if(!istype(W))		return 0
+	if(lying && !(W.flags&ABSTRACT))	return 0
+	if(!istype(W))	return 0
 	return 1
 
 //Puts the item into our active hand if possible. returns 1 on success.