From b60fa8b57b5b3591ee21f17729d3fa0656d50108 Mon Sep 17 00:00:00 2001 From: phil235 Date: Wed, 24 Dec 2014 20:07:49 +0100 Subject: [PATCH] Fixes the resonator being activated when placed on a table/closet/storage. Also fixes beaker being splashed when put inside the vault's safe. --- code/modules/mining/equipment_locker.dm | 10 ++++++++++ code/modules/reagents/reagent_containers/glass.dm | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 4874f04a838..f62ecdb49b7 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -471,6 +471,13 @@ force = 10 throwforce = 10 var/cooldown = 0 + var/list/can_be_placed_into = list( + /obj/structure/table, + /obj/structure/closet, + /obj/item/weapon/storage, + /obj/structure/safe, + /obj/machinery/disposal + ) /obj/item/weapon/resonator/proc/CreateResonance(var/target, var/creator) if(cooldown <= 0) @@ -489,6 +496,9 @@ if(target in user.contents) return if(proximity_flag) + for(var/type in can_be_placed_into) + if(istype(target, type)) + return CreateResonance(target, user) /obj/effect/resonance diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 92c325faedf..ab30aa772f6 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -24,7 +24,7 @@ /obj/item/weapon/grenade/chem_grenade, /obj/machinery/bot/medbot, /obj/machinery/computer/pandemic, - /obj/item/weapon/storage/secure/safe, + /obj/structure/safe, /obj/machinery/disposal, /obj/machinery/hydroponics, /obj/machinery/biogenerator,