From 7a5497bb40f908f59ca16e2a6f670edf3bc95dc0 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Mon, 21 Aug 2017 20:12:22 -0700 Subject: [PATCH] FUCK (#2452) FUCK - Fixes Vending Machines --- code/game/machinery/vending.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 6ed28fb457..4390aaebf6 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -61,11 +61,13 @@ var/refill_count = 3 //The number of canisters the vending machine uses /obj/machinery/vending/Initialize() - if(refill_canister) - circuit = null - . = ..() + var/build_inv = FALSE + if(!refill_canister) + circuit = null + build_inv = TRUE + . = ..() wires = new /datum/wires/vending(src) - if(!refill_canister) //constructable vending machine + if(build_inv) //non-constructable vending machine build_inventory(products) build_inventory(contraband, 1) build_inventory(premium, 0, 1) @@ -85,9 +87,7 @@ /obj/machinery/vending/snack/Destroy() for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents) - S.loc = get_turf(src) - qdel(wires) - wires = null + S.forceMove(get_turf(src)) return ..() /obj/machinery/vending/RefreshParts() //Better would be to make constructable child