Merge pull request tgstation#14362 from Bawhoppen/czechbarmanhelp

Gives barman back his new gear
Derven · Jan 5, 2016 · a9ef058 · a9ef058
2 parents 3108162 + cb50a25
commit a9ef058
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/code/game/jobs/job/cargo_service.dm b/code/game/jobs/job/cargo_service.dm
@@ -116,9 +116,9 @@ Bartender
 	ears = /obj/item/device/radio/headset/headset_srv
 	uniform = /obj/item/clothing/under/rank/bartender
 	suit = /obj/item/clothing/suit/armor/vest
-	backpack_contents = list(/obj/item/ammo_casing/shotgun/beanbag=4)
+	backpack_contents = list(/obj/item/weapon/storage/box/beanbag=1)
 	shoes = /obj/item/clothing/shoes/laceup
-	
+
 /*
 Cook
 */

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
@@ -698,3 +698,12 @@
 	new /obj/item/ammo_casing/shotgun/buckshot(src)
 	new /obj/item/ammo_casing/shotgun/buckshot(src)
 	new /obj/item/ammo_casing/shotgun/buckshot(src)
+
+/obj/item/weapon/storage/box/beanbag/New()
+	..()
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
+	new /obj/item/ammo_casing/shotgun/beanbag(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -23,6 +23,10 @@
 	new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/weapon/reagent_containers/glass/rag(src)
 	new /obj/item/weapon/reagent_containers/glass/rag(src)
+	new /obj/item/weapon/storage/box/beanbag(src)
+	new /obj/item/clothing/suit/armor/vest(src)
+	new /obj/item/clothing/glasses/sunglasses/reagent(src)
+	new /obj/item/weapon/storage/belt/bandolier(src)
 
 /obj/structure/closet/chefcloset
 	name = "\proper chef's closet"