Merge pull request #6853 from Neerti/holsters_and_webbing

Makes holsters and webbing get along.

code/modules/clothing/clothing_accessories.dm

@@ -121,13 +121,24 @@
 	set name = "Remove Accessory"
 	set category = "Object"
 	set src in usr
-	if(!istype(usr, /mob/living)) return
-	if(usr.stat) return
+
+	if(!istype(usr, /mob/living))
+		return
+
+	if(usr.stat)
+		return
+
 	var/obj/item/clothing/accessory/A
-	if(LAZYLEN(accessories))
-		A = input("Select an accessory to remove from [src]") as null|anything in accessories
+	var/accessory_amount = LAZYLEN(accessories)
+	if(accessory_amount)
+		if(accessory_amount == 1)
+			A = accessories[1] // If there's only one accessory, just remove it without any additional prompts.
+		else
+			A = input("Select an accessory to remove from \the [src]") as null|anything in accessories
+
 	if(A)
 		remove_accessory(usr,A)
+
 	if(!LAZYLEN(accessories))
 		src.verbs -= /obj/item/clothing/proc/removetie_verb
 		accessories = null

code/modules/clothing/under/accessories/holster.dm

@@ -2,7 +2,7 @@
 	name = "shoulder holster"
 	desc = "A handgun holster."
 	icon_state = "holster"
-	slot = ACCESSORY_SLOT_TORSO //Legacy/balance purposes
+	slot = ACCESSORY_SLOT_WEAPON
 	concealed_holster = 1
 	var/obj/item/holstered = null
 	var/holster_in = 'sound/items/holsterin.ogg'