Merge pull request #9212 from dapnee/plasmaglass-tables-spears

Plasmaglass Tables, Spears, Shards (Take 2)
2019-09-02 18:37:22 -05:00
parent 67f4276aab 7a7c810e7b
commit 2fe5571887
14 changed files with 119 additions and 18 deletions
@@ -255,7 +255,9 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 		var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear

 		remove_item_from_storage(user)
-		qdel(I)
+		if (!user.transferItemToLoc(I, S))
+			return
+		S.CheckParts(list(I))
 		qdel(src)

 		user.put_in_hands(S)