From 65326915638aabfbeaad4753f7ebcef609893ec4 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Tue, 24 Apr 2012 01:19:09 +0100 Subject: [PATCH] Reduces adminspam and adds knocking on windows. --- code/game/objects/window.dm | 9 ++++++++- code/modules/recycling/disposal.dm | 6 +++--- sound/effects/glassknock.ogg | Bin 0 -> 11893 bytes 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 sound/effects/glassknock.ogg diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index f1cd181fc4f..34c42f24bb7 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -100,7 +100,14 @@ if(reinf) new /obj/item/stack/rods( src.loc) src.density = 0 del(src) - return + return + else + playsound(src.loc, 'Glassknock.ogg', 80, 1) + usr.visible_message("[usr.name] knocks on the [src.name].", \ + "You knock on the [src.name].", \ + "You hear a knocking sound.") + return + /obj/structure/window/attack_paw() if ((usr.mutations & HULK)) diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 5e0e3b818dc..f3a6f807225 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -105,7 +105,7 @@ log_attack("[usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.") log_admin("ATTACK: [usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.") - message_admins("ATTACK: [usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.") + // message_admins("ATTACK: [usr] ([usr.ckey]) placed [GM] ([GM.ckey]) in a disposals unit.") C.show_message("\red [GM.name] has been placed in the [src] by [user].", 3) del(G) @@ -151,7 +151,7 @@ log_attack("[user] ([user.ckey]) climbed into a disposals unit.") log_admin("ATTACK: [user] ([user.ckey]) climbed into in a disposals unit.") - message_admins("ATTACK: [user] ([user.ckey]) climbed into in a disposals unit.") + //message_admins("ATTACK: [user] ([user.ckey]) climbed into in a disposals unit.") msg = "[user.name] climbs into the [src]." user << "You climb into the [src]." @@ -159,7 +159,7 @@ log_attack("[user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.") log_admin("ATTACK: [user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.") - message_admins("ATTACK: [user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.") + //message_admins("ATTACK: [user] ([user.ckey]) placed [target] ([target.ckey]) in a disposals unit.") msg = "[user.name] stuffs [target.name] into the [src]!" user << "You stuff [target.name] into the [src]!" diff --git a/sound/effects/glassknock.ogg b/sound/effects/glassknock.ogg new file mode 100644 index 0000000000000000000000000000000000000000..efdb198fd391daa147ffe73c6015a028bb692848 GIT binary patch literal 11893 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