From 309dff6aba10989b5b5d1319638bb6ff00378c5e Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Sat, 27 Jun 2015 23:53:11 -0400
Subject: [PATCH] One less object verb

---
 code/__defines/items_clothing.dm        |  1 +
 code/modules/clothing/head/soft_caps.dm | 30 +++++++++++--------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm
index 103cccf8335..8e403c2e06e 100644
--- a/code/__defines/items_clothing.dm
+++ b/code/__defines/items_clothing.dm
@@ -97,6 +97,7 @@
 
 // Inventory slot strings.
 // since numbers cannot be used as associative list keys.
+//icon_back, icon_l_hand, etc would be much better names for these...
 #define slot_back_str		"slot_back"
 #define slot_l_hand_str		"slot_l_hand"
 #define slot_r_hand_str		"slot_r_hand"
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index f92fb0ca761..5cb23c58ea7 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -11,24 +11,20 @@
 	siemens_coefficient = 0.9
 	body_parts_covered = 0
 
-	dropped()
-		src.icon_state = initial(icon_state)
-		src.flipped=0
-		..()
+/obj/item/clothing/head/soft/dropped()
+	src.icon_state = initial(icon_state)
+	src.flipped=0
+	..()
 
-	verb/flip()
-		set category = "Object"
-		set name = "Flip cap"
-		set src in usr
-		if(usr.canmove && !usr.stat && !usr.restrained())
-			src.flipped = !src.flipped
-			if(src.flipped)
-				icon_state = "[icon_state]_flipped"
-				usr << "You flip the hat backwards."
-			else
-				src.icon_state = initial(icon_state)
-				usr << "You flip the hat back in normal position."
-			update_clothing_icon()	//so our mob-overlays update
+/obj/item/clothing/head/soft/attack_self(mob/user)
+	src.flipped = !src.flipped
+	if(src.flipped)
+		icon_state = "[icon_state]_flipped"
+		user << "You flip the hat backwards."
+	else
+		src.icon_state = initial(icon_state)
+		user << "You flip the hat back in normal position."
+	update_clothing_icon()	//so our mob-overlays update
 
 /obj/item/clothing/head/soft/red
 	name = "red cap"