From fe7fbbeb9f5224da08b063c65955ce71cdacf12c Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Fri, 25 Mar 2016 20:13:18 -0400 Subject: [PATCH] Allows voice activators, etc to work in storage items --- code/game/objects/items/weapons/storage/lockbox.dm | 4 ++++ code/game/objects/items/weapons/storage/secure.dm | 3 +++ code/game/objects/items/weapons/storage/storage.dm | 10 ++++++++++ 3 files changed, 17 insertions(+) diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 56b910fac9d..608f111060f 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -69,6 +69,10 @@ origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return +/obj/item/weapon/storage/lockbox/hear_talk(mob/living/M as mob, msg) + +/obj/item/weapon/storage/lockbox/hear_message(mob/living/M as mob, msg) + /obj/item/weapon/storage/lockbox/large name = "Large lockbox" desc = "A large lockbox" diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 1a179cf8cd9..d33f6e2ba7b 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -147,6 +147,9 @@ usr << "[src] is locked!" return 0 +/obj/item/weapon/storage/secure/hear_talk(mob/living/M as mob, msg) + +/obj/item/weapon/storage/secure/hear_message(mob/living/M as mob, msg) // ----------------------------- // Secure Briefcase diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index a300b44971b..1440aa8dcf0 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -462,6 +462,16 @@ O.emp_act(severity) ..() +/obj/item/weapon/storage/hear_talk(mob/living/M as mob, msg) + ..() + for(var/obj/O in contents) + O.hear_talk(M, msg) + +/obj/item/weapon/storage/hear_message(mob/living/M as mob, msg) + ..() + for(var/obj/O in contents) + O.hear_message(M, msg) + // BubbleWrap - A box can be folded up to make card /obj/item/weapon/storage/attack_self(mob/user as mob)