From 6bae66a53a2f2d586bde063bb89f1691f3eff48b Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Sun, 29 Dec 2013 17:04:18 -0500
Subject: [PATCH] Small bugfixes

---
 code/datums/supplypacks.dm      | 14 +++++++++++++-
 code/game/objects/items/toys.dm |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index 66ac81c7424..ffae276c10c 100755
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -1008,7 +1008,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	contains = list(/obj/item/weapon/vending_refill/boozeomat,
 					/obj/item/weapon/vending_refill/coffee)
 	cost = 15
+	containertype = /obj/structure/closet/crate
 	containername = "bartending supply crate"
+	group = "Operations"
 
 /datum/supply_packs/organic/vending/snack
 	name = "Snack Supply Crate"
@@ -1016,27 +1018,35 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 					/obj/item/weapon/vending_refill/snack,
 					/obj/item/weapon/vending_refill/snack)
 	cost = 15
+	containertype = /obj/structure/closet/crate
 	containername = "snacks supply crate"
+	group = "Operations"
 
 /datum/supply_packs/organic/vending/cola
 	name = "Softdrinks Supply Crate"
 	contains = list(/obj/item/weapon/vending_refill/cola,
 					/obj/item/weapon/vending_refill/cola)
 	cost = 15
+	containertype = /obj/structure/closet/crate
 	containername = "softdrinks supply crate"
+	group = "Operations"
 
 /datum/supply_packs/organic/vending/cigarette
 	name = "Cigarette Supply Crate"
 	contains = list(/obj/item/weapon/vending_refill/cigarette)
 	cost = 15
+	containertype = /obj/structure/closet/crate
 	containername = "cigarette supply crate"
+	group = "Operations"
 
 /datum/supply_packs/misc/autodrobe
 	name = "Autodrobe Supply crate"
 	contains = list(/obj/item/weapon/vending_refill/autodrobe,
 					/obj/item/weapon/vending_refill/autodrobe)
 	cost = 15
+	containertype = /obj/structure/closet/crate
 	containername = "autodrobe supply crate"
+	group = "Operations"
 
 /datum/supply_packs/misc/mafia
 	name = "Mafia Supply crate"
@@ -1044,4 +1054,6 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 					/obj/item/clothing/head/fedora/brownfedora =1,/obj/item/clothing/head/fedora =1,/obj/item/clothing/under/flappers =1,/obj/item/clothing/under/mafia =1,/obj/item/clothing/under/mafia/vest =1,/obj/item/clothing/under/mafia/white =1,
 					/obj/item/clothing/under/mafia/sue =1,/obj/item/clothing/under/mafia/tan =1, /obj/item/toy/crossbow/tommygun =2,/obj/item/clothing/tie/accessory/gunholster =1,)
 	cost = 15
-	containername = "mafia supply crate"
\ No newline at end of file
+	containertype = /obj/structure/closet/crate
+	containername = "mafia supply crate"
+	group = "Operations"
\ No newline at end of file
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 287e071c1d8..991b582dc4f 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -246,7 +246,7 @@
 					for(var/mob/living/M in D.loc)
 						if(!istype(M,/mob/living)) continue
 						if(M == user) continue
-						D.visible_message("<span class='danger'>[] was hit by the foam dart!</span>")
+						D.visible_message("<span class='danger'>[M] was hit by the foam dart!</span>")
 						new /obj/item/toy/ammo/crossbow(M.loc)
 						del(D)
 						return