From f3ea0ab2236fcd4e93ed56e10636f54ecf785516 Mon Sep 17 00:00:00 2001
From: Mike <mwerezak@gmail.com>
Date: Sat, 10 May 2014 20:37:15 -0400
Subject: [PATCH] Fixed accessories becoming improperly detached...

when the host suit was clicked on. It is also now clearer who has the
responsibility for attaching and removing accessories.
---
 code/modules/clothing/clothing.dm   | 24 ++++++++++++++----------
 code/modules/clothing/under/ties.dm | 19 +++++++++++++++----
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 3b1108b55b..ae3dc94e8d 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -248,7 +248,6 @@ BLIND     // can't see anything
 	var/rolled_down = 0
 	var/basecolor
 
-
 /obj/item/clothing/under/attackby(obj/item/I, mob/user)
 	if(hastie)
 		hastie.attackby(I, user)
@@ -257,7 +256,7 @@ BLIND     // can't see anything
 	if(!hastie && istype(I, /obj/item/clothing/tie))
 		user.drop_item()
 		hastie = I
-		hastie.attach_to(src, user)
+		hastie.on_attached(src, user)
 
 		if(istype(loc, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = loc
@@ -274,7 +273,7 @@ BLIND     // can't see anything
 		return
 	..()
 
-//This is to allow people to take off suits when there is an attached accessory
+//This is to ensure people can take off suits when there is an attached accessory
 /obj/item/clothing/under/MouseDrop(obj/over_object as obj)
 	if (ishuman(usr) || ismonkey(usr))
 		//makes sure that the clothing is equipped so that we can't drag it into our hand from miles away.
@@ -352,6 +351,17 @@ BLIND     // can't see anything
 	else
 		usr << "<span class='notice'>You cannot roll down the uniform!</span>"
 
+/obj/item/clothing/under/proc/remove_accessory(mob/user as mob)
+	if(!hastie)
+		return
+	
+	hastie.on_removed(user)
+	hastie = null
+
+	if(istype(loc, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = loc
+		H.update_inv_w_uniform()
+
 /obj/item/clothing/under/verb/removetie()
 	set name = "Remove Accessory"
 	set category = "Object"
@@ -359,13 +369,7 @@ BLIND     // can't see anything
 	if(!istype(usr, /mob/living)) return
 	if(usr.stat) return
 
-	if(hastie)
-		hastie.remove(usr)
-		hastie = null
-
-		if(istype(loc, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = loc
-			H.update_inv_w_uniform()
+	src.remove_accessory(usr)
 
 /obj/item/clothing/under/rank/New()
 	sensor_mode = pick(0,1,2,3)
diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm
index 9f45d7a53d..aedd7839ce 100644
--- a/code/modules/clothing/under/ties.dm
+++ b/code/modules/clothing/under/ties.dm
@@ -11,7 +11,7 @@
 	var/obj/item/clothing/under/has_suit = null		//the suit the tie may be attached to
 
 //when user attached an accessory to S
-/obj/item/clothing/tie/proc/attach_to(obj/item/clothing/under/S, mob/user as mob)
+/obj/item/clothing/tie/proc/on_attached(obj/item/clothing/under/S, mob/user as mob)
 	if(!istype(S))
 		return
 	has_suit = S
@@ -19,13 +19,24 @@
 	user << "<span class='notice'>You attach [src] to [has_suit].</span>"
 	src.add_fingerprint(user)
 
-/obj/item/clothing/tie/proc/remove(mob/user as mob)
+/obj/item/clothing/tie/proc/on_removed(mob/user as mob)
 	if(!has_suit)
 		return
 	has_suit = null
 	usr.put_in_hands(src)
 	src.add_fingerprint(user)
 
+//default attackby behaviour
+/obj/item/clothing/tie/attackby(obj/item/I, mob/user)
+	..()
+
+//default attack_hand behaviour
+/obj/item/clothing/tie/attack_hand(mob/user as mob)
+	if(has_suit)
+		has_suit.remove_accessory(user)
+		return	//we aren't an object on the ground so don't call parent
+	..()
+
 /obj/item/clothing/tie/blue
 	name = "blue tie"
 	icon_state = "bluetie"
@@ -244,11 +255,11 @@
 	else
 		usr << "It is empty."
 
-/obj/item/clothing/tie/holster/attach_to(obj/item/clothing/under/S, mob/user as mob)
+/obj/item/clothing/tie/holster/on_attached(obj/item/clothing/under/S, mob/user as mob)
 	..()
 	has_suit.verbs += /obj/item/clothing/tie/holster/verb/holster_verb
 
-/obj/item/clothing/tie/holster/remove(mob/user as mob)
+/obj/item/clothing/tie/holster/on_removed(mob/user as mob)
 	has_suit.verbs -= /obj/item/clothing/tie/holster/verb/holster_verb
 	..()