From 644ae1e43bf0ee3d63c1803e764b4d096b65f4d5 Mon Sep 17 00:00:00 2001 From: Werner Date: Mon, 3 Sep 2018 01:28:02 +0200 Subject: [PATCH] Adds missing refill cartridges for the recently added vendors. (#5220) --- code/game/machinery/vending_items.dm | 10 +++ code/game/machinery/vending_types.dm | 76 +++++++++++++------ .../items/furniture/dueling_area.dm | 29 +------ 3 files changed, 62 insertions(+), 53 deletions(-) diff --git a/code/game/machinery/vending_items.dm b/code/game/machinery/vending_items.dm index 7f0831db43a..c861d14ba04 100644 --- a/code/game/machinery/vending_items.dm +++ b/code/game/machinery/vending_items.dm @@ -98,3 +98,13 @@ name = "robo-tools resupply canister" vend_id = "robo-tools" charges = 38 + +/obj/item/weapon/vending_refill/zora + name = "Zo'ra Soda resupply canister" + vend_id = "zora" + charges = 40 + +/obj/item/weapon/vending_refill/battlemonsters + name = "Battlemonsters resupply canister" + vend_id = "battlemonsters" + charges = 40 \ No newline at end of file diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index cba179045f7..c6f124bf075 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -17,6 +17,31 @@ */ +//RECURSION +/obj/machinery/vending/vendors + name = "Omni-Vendor" + desc = "The mother of all vendors, from which vending itself comes!" + icon_state = "engivend" + icon_deny = "engivend-deny" + vend_id = "admin" + req_access = list(access_janitor) + products = list( + /obj/item/weapon/vending_refill/booze = 1, + /obj/item/weapon/vending_refill/tools = 1, + /obj/item/weapon/vending_refill/coffee = 1, + /obj/item/weapon/vending_refill/snack = 1, + /obj/item/weapon/vending_refill/cola = 1, + /obj/item/weapon/vending_refill/pda = 1, + /obj/item/weapon/vending_refill/smokes = 1, + /obj/item/weapon/vending_refill/meds = 1, + /obj/item/weapon/vending_refill/robust = 1, + /obj/item/weapon/vending_refill/hydro = 1, + /obj/item/weapon/vending_refill/cutlery = 1, + /obj/item/weapon/vending_refill/robo = 1, + /obj/item/weapon/vending_refill/battlemonsters = 1, + ) + random_itemcount = 0 + /obj/machinery/vending/boozeomat name = "Booze-O-Mat" desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." @@ -781,30 +806,6 @@ restock_items = 1 random_itemcount = 0 -//RECURSION -/obj/machinery/vending/vendors - name = "Omni-Vendor" - desc = "The mother of all vendors, from which vending itself comes!" - icon_state = "engivend" - icon_deny = "engivend-deny" - vend_id = "admin" - req_access = list(access_janitor) - products = list( - /obj/item/weapon/vending_refill/booze = 1, - /obj/item/weapon/vending_refill/tools = 1, - /obj/item/weapon/vending_refill/coffee = 1, - /obj/item/weapon/vending_refill/snack = 1, - /obj/item/weapon/vending_refill/cola = 1, - /obj/item/weapon/vending_refill/pda = 1, - /obj/item/weapon/vending_refill/smokes = 1, - /obj/item/weapon/vending_refill/meds = 1, - /obj/item/weapon/vending_refill/robust = 1, - /obj/item/weapon/vending_refill/hydro = 1, - /obj/item/weapon/vending_refill/cutlery = 1, - /obj/item/weapon/vending_refill/robo = 1 - ) - random_itemcount = 0 - /obj/machinery/vending/zora name = "Zo'ra Soda" desc = "An energy drink vendor provided by the Getmore Corporation in partnership with the brood of Ta'Akaix'Xakt'yagz'isk Zo'ra." @@ -836,4 +837,29 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/zoradrone = 30, ) idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan. - random_itemcount = 1 \ No newline at end of file + +/obj/machinery/vending/battlemonsters + name = "\improper Battlemonsters vendor" + desc = "A good place to dump all your rent money." + icon_state = "battlemonsters" + vend_id = "battlemonsters" + products = list( + /obj/item/weapon/book/manual/battlemonsters = 5, + /obj/item/battle_monsters/wrapped = 20, + /obj/item/battle_monsters/wrapped/pro = 10, + /obj/item/battle_monsters/wrapped/rare = 2 + ) + prices = list( + /obj/item/weapon/book/manual/battlemonsters = 10, + /obj/item/battle_monsters/wrapped = 150, + /obj/item/battle_monsters/wrapped/pro = 75, + /obj/item/battle_monsters/wrapped/rare = 200, + /obj/item/battle_monsters/wrapped/legendary = 400 + ) + contraband = list( + /obj/item/battle_monsters/wrapped/legendary = 1 + ) + premium = list( + /obj/item/weapon/coin/battlemonsters = 10 + ) + restock_items = 0 \ No newline at end of file diff --git a/code/modules/battlemonsters/items/furniture/dueling_area.dm b/code/modules/battlemonsters/items/furniture/dueling_area.dm index 9bfb0926640..1a146dad1ec 100644 --- a/code/modules/battlemonsters/items/furniture/dueling_area.dm +++ b/code/modules/battlemonsters/items/furniture/dueling_area.dm @@ -22,31 +22,4 @@ /obj/structure/dueling_table/attackby(obj/item/W as obj, mob/user as mob) user.drop_item(src.loc) - return - -/obj/machinery/vending/battlemonsters - name = "\improper Battlemonsters vendor" - desc = "A good place to dump all your rent money." - icon_state = "battlemonsters" - vend_id = "battlemonsters" - products = list( - /obj/item/weapon/book/manual/battlemonsters = 5, - /obj/item/battle_monsters/wrapped = 20, - /obj/item/battle_monsters/wrapped/pro = 10, - /obj/item/battle_monsters/wrapped/rare = 2 - ) - prices = list( - /obj/item/weapon/book/manual/battlemonsters = 10, - /obj/item/battle_monsters/wrapped = 150, - /obj/item/battle_monsters/wrapped/pro = 75, - /obj/item/battle_monsters/wrapped/rare = 200, - /obj/item/battle_monsters/wrapped/legendary = 400 - ) - contraband = list( - /obj/item/battle_monsters/wrapped/legendary = 1 - ) - premium = list( - /obj/item/weapon/coin/battlemonsters = 10 - ) - - restock_items = 0 \ No newline at end of file + return \ No newline at end of file