From 204c51597c7454d867b7fe4046f689ae29c46569 Mon Sep 17 00:00:00 2001
From: Datraen <datraen@gmail.com>
Date: Tue, 5 Apr 2016 18:09:38 -0400
Subject: [PATCH] Two-handed items check.

Adds a check to see if the item can be wielded when given or dropped when it is wielded.
---
 code/game/objects/items/weapons/material/twohanded.dm | 6 ++++++
 html/changelogs/datraen-twohanddrop.yml               | 6 ++++++
 2 files changed, 12 insertions(+)
 create mode 100644 html/changelogs/datraen-twohanddrop.yml

diff --git a/code/game/objects/items/weapons/material/twohanded.dm b/code/game/objects/items/weapons/material/twohanded.dm
index b404b69f0b9..52b949cf351 100644
--- a/code/game/objects/items/weapons/material/twohanded.dm
+++ b/code/game/objects/items/weapons/material/twohanded.dm
@@ -68,6 +68,12 @@
 /obj/item/weapon/material/twohanded/update_icon()
 	icon_state = "[base_icon][wielded]"
 	item_state = icon_state
+	
+/obj/item/weapon/material/twohanded/dropped()
+	..()
+	if(wielded)
+		spawn(0)
+			update_held_icon()
 
 /*
  * Fireaxe
diff --git a/html/changelogs/datraen-twohanddrop.yml b/html/changelogs/datraen-twohanddrop.yml
new file mode 100644
index 00000000000..ccb05e07811
--- /dev/null
+++ b/html/changelogs/datraen-twohanddrop.yml
@@ -0,0 +1,6 @@
+author: Datraen
+
+delete-after: True
+
+changes: 
+  - bugfix: "Checks to see if new a two-handed weapon can be wielded when dropped."