From f5bc4b6b4f1ea8589c307ae2dacee39842c95745 Mon Sep 17 00:00:00 2001 From: Lularian Date: Sun, 3 Jan 2016 17:50:20 -0600 Subject: [PATCH] woops --- code/game/jobs/job/cargo_service.dm | 2 +- code/game/objects/items/weapons/storage/boxes.dm | 15 +++++++++++++++ .../crates_lockers/closets/job_closets.dm | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/code/game/jobs/job/cargo_service.dm b/code/game/jobs/job/cargo_service.dm index 6425e2f5cef..f22bd2daed4 100644 --- a/code/game/jobs/job/cargo_service.dm +++ b/code/game/jobs/job/cargo_service.dm @@ -116,7 +116,7 @@ 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/weapon/storage/box/rubbershot=1) + backpack_contents = list(/obj/item/weapon/storage/box/beanbag=1) shoes = /obj/item/clothing/shoes/laceup /* diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index c08715a561e..8bfecb60cea 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -698,3 +698,18 @@ 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 + name = "box of beanbag slugs" + desc = "A box full of beanbag slugs." + icon_state = "rubbershot_box" + + +/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 index 6f7d18f2a50..79e583d6ba5 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -23,9 +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/rubbershot(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"