From ff7c4fe45acac634945aa3edfcd226765b3e3820 Mon Sep 17 00:00:00 2001
From: Anewbe <matthwledder@gmail.com>
Date: Sat, 7 Oct 2017 17:21:01 -0500
Subject: [PATCH] Makes a bunch of things fit in holsters

---
 code/defines/obj/weapon.dm                   | 2 ++
 code/game/objects/items/toys.dm              | 5 +++--
 code/modules/paperwork/stamps.dm             | 1 +
 code/modules/projectiles/guns/energy/stun.dm | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index c40c5db48c..1750a1b7c6 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -31,6 +31,7 @@
 	icon = 'icons/obj/items.dmi'
 	icon_state = "soap"
 	w_class = ITEMSIZE_SMALL
+	slot_flags = SLOT_HOLSTER
 	throwforce = 0
 	throw_speed = 4
 	throw_range = 20
@@ -58,6 +59,7 @@
 	item_state = "bike_horn"
 	throwforce = 3
 	w_class = ITEMSIZE_SMALL
+	slot_flags = SLOT_HOLSTER
 	throw_speed = 3
 	throw_range = 15
 	attack_verb = list("HONKED")
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 2c27e35010..2611fb51aa 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -141,6 +141,7 @@
 		icon_l_hand = 'icons/mob/items/lefthand_guns.dmi',
 		icon_r_hand = 'icons/mob/items/righthand_guns.dmi',
 		)
+	slot_flags = SLOT_HOLSTER
 	w_class = ITEMSIZE_SMALL
 	attack_verb = list("attacked", "struck", "hit")
 	var/bullets = 5
@@ -343,7 +344,7 @@
 	icon_state = "sunflower"
 	item_state = "sunflower"
 	var/empty = 0
-	flags
+	slot_flags = SLOT_HOLSTER
 
 /obj/item/toy/waterflower/New()
 	var/datum/reagents/R = new/datum/reagents(10)
@@ -412,7 +413,7 @@
 	icon_state = "bosunwhistle"
 	var/cooldown = 0
 	w_class = ITEMSIZE_TINY
-	slot_flags = SLOT_EARS
+	slot_flags = SLOT_EARS | SLOT_HOLSTER
 
 /obj/item/toy/bosunwhistle/attack_self(mob/user as mob)
 	if(cooldown < world.time - 35)
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index acfd20df47..9e2cb6bce8 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -6,6 +6,7 @@
 	item_state = "stamp"
 	throwforce = 0
 	w_class = ITEMSIZE_TINY
+	slot_flags = SLOT_HOLSTER
 	throw_speed = 7
 	throw_range = 15
 	matter = list(DEFAULT_WALL_MATERIAL = 60)
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 07b78fc2ea..c8bba19087 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -36,7 +36,7 @@
 	item_state = "crossbow"
 	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 2, TECH_ILLEGAL = 5)
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
-	slot_flags = SLOT_BELT
+	slot_flags = SLOT_BELT | SLOT_HOLSTER
 	silenced = 1
 	fire_sound = 'sound/weapons/Genhit.ogg'
 	projectile_type = /obj/item/projectile/energy/bolt
@@ -54,6 +54,7 @@
 	w_class = ITEMSIZE_LARGE
 	force = 10
 	matter = list(DEFAULT_WALL_MATERIAL = 200000)
+	slot_flags = SLOT_BELT
 	projectile_type = /obj/item/projectile/energy/bolt/large
 
 /obj/item/weapon/gun/energy/plasmastun