From 463d078cd4d7741619500d5915f2d2d57bbc3fc3 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Thu, 9 Feb 2012 10:53:09 -0700 Subject: [PATCH] Added chemistry's big beakers to the supply pack. Security vending machines now have Evidence Bag boxes. --- code/defines/obj/supplypacks.dm | 7 ++++--- code/defines/obj/vending.dm | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index a64ea20d0a6..4aa5b528987 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -322,7 +322,7 @@ containertype = "/obj/structure/closet/crate" containername = "Replacement lights" -/*/datum/supply_packs/costume +/datum/supply_packs/costume name = "Standard Costume crate" contains = list("/obj/item/weapon/storage/backpack/clown", "/obj/item/clothing/shoes/clown_shoes", @@ -340,7 +340,7 @@ containertype = "/obj/structure/closet/crate/secure" containername = "Standard Costumes" access = access_theatre - group = "Clothing" */ + group = "Clothing" /datum/supply_packs/wizard name = "Wizard costume" @@ -421,7 +421,8 @@ "/obj/item/weapon/reagent_containers/glass/bottle/antitoxin", "/obj/item/weapon/reagent_containers/glass/bottle/inaprovaline", "/obj/item/weapon/reagent_containers/glass/bottle/stoxin", - "/obj/item/weapon/storage/syringes") + "/obj/item/weapon/storage/syringes", + "/obj/item/weapon/reagent_containers/glass/large") cost = 10 containertype = "/obj/structure/closet/crate/medical" containername = "Medical crate" diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index abd5e107907..6289fb1db55 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -168,7 +168,7 @@ icon_state = "sec" icon_deny = "sec-deny" req_access_txt = "1" - product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut;/obj/item/weapon/evidencebag" + product_paths = "/obj/item/weapon/handcuffs;/obj/item/weapon/flashbang;/obj/item/device/flash;/obj/item/weapon/reagent_containers/food/snacks/donut;/obj/item/weapon/storage/box/evidence" product_amounts = "8;4;5;12;6" product_hidden = "/obj/item/clothing/glasses/sunglasses;/obj/item/kitchen/donut_box" product_hideamt = "2;2"