Merge pull request #6586 from phil235/ResonatorTableFix

Fixes the resonator being activated when placed on a table/closet/storage
This commit is contained in:
tkdrg
2014-12-27 15:06:36 -03:00
2 changed files with 11 additions and 1 deletions
+10
View File
@@ -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