From 157818b9b02ea1a3bb04ad05a381caf5ce275f24 Mon Sep 17 00:00:00 2001 From: MrPerson Date: Wed, 2 Apr 2014 07:56:03 -0700 Subject: [PATCH] Fix the "use mining voucher many times" bug --- code/modules/mining/equipment_locker.dm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index be74be45780..1594a866a81 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -248,9 +248,9 @@ return ..() -/obj/machinery/mineral/equipment_locker/proc/RedeemVoucher(voucher, redeemer) - var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") in list("Resonator", "Kinetic Accelerator", "Mining Drone", "Cancel") - if(!selection || !Adjacent(redeemer) || !voucher) +/obj/machinery/mineral/equipment_locker/proc/RedeemVoucher(obj/item/weapon/mining_voucher/voucher, mob/redeemer) + var/selection = input(redeemer, "Pick your equipment", "Mining Voucher Redemption") as null|anything in list("Resonator", "Kinetic Accelerator", "Mining Drone") + if(!selection || !Adjacent(redeemer) || voucher.gc_destroyed || voucher.loc != redeemer) return switch(selection) if("Resonator") @@ -260,8 +260,6 @@ if("Mining Drone") new /mob/living/simple_animal/hostile/mining_drone(src.loc) new /obj/item/weapon/weldingtool/hugetank(src.loc) - if("Cancel") - return qdel(voucher) /obj/machinery/mineral/equipment_locker/ex_act()