From cc487ceebfbb4bed7e798ee5b1f940207c3d4520 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Mon, 24 Feb 2020 13:18:55 -0800 Subject: [PATCH] Merge pull request #6737 from listerla/penclick Makes pen click when you click on them --- code/game/objects/items/crayons.dm | 7 +++++-- code/modules/paperwork/pen.dm | 3 +++ sound/items/penclick.ogg | Bin 0 -> 7880 bytes 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 sound/items/penclick.ogg diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 66d5fb1176..45ad1fa5b8 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -95,12 +95,12 @@ if(instant || do_after(user, 50)) new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype) to_chat(user, "You finish drawing.") - + if(config.log_graffiti) var/msg = "[user.client.key] ([user]) has drawn [drawtype] (with [src]) at [target.x],[target.y],[target.z]." message_admins(msg) log_game(msg) - + target.add_fingerprint(user) // Adds their fingerprints to the floor the crayon is drawn on. if(uses) uses-- @@ -207,3 +207,6 @@ qdel(src) else ..() + +/obj/item/weapon/pen/crayon/attack_self(var/mob/user) + return \ No newline at end of file diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 19fe452021..fa5ee051e5 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -24,6 +24,9 @@ var/colour = "black" //what colour the ink is! pressure_resistance = 2 +/obj/item/weapon/pen/attack_self(var/mob/user) + to_chat(user, "Click.") + playsound(loc, 'sound/items/penclick.ogg', 50, 1) /obj/item/weapon/pen/blue desc = "It's a normal blue ink pen." diff --git a/sound/items/penclick.ogg b/sound/items/penclick.ogg new file mode 100644 index 0000000000000000000000000000000000000000..ec9d793ec2ba11e74a5ee456310f4ed21a793362 GIT binary patch literal 7880 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 literal 0 HcmV?d00001