mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge pull request #6737 from listerla/penclick
Makes pen click when you click on them
This commit is contained in:
@@ -95,12 +95,12 @@
|
|||||||
if(instant || do_after(user, 50))
|
if(instant || do_after(user, 50))
|
||||||
new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype)
|
new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype)
|
||||||
to_chat(user, "You finish drawing.")
|
to_chat(user, "You finish drawing.")
|
||||||
|
|
||||||
if(config.log_graffiti)
|
if(config.log_graffiti)
|
||||||
var/msg = "[user.client.key] ([user]) has drawn [drawtype] (with [src]) at [target.x],[target.y],[target.z]."
|
var/msg = "[user.client.key] ([user]) has drawn [drawtype] (with [src]) at [target.x],[target.y],[target.z]."
|
||||||
message_admins(msg)
|
message_admins(msg)
|
||||||
log_game(msg)
|
log_game(msg)
|
||||||
|
|
||||||
target.add_fingerprint(user) // Adds their fingerprints to the floor the crayon is drawn on.
|
target.add_fingerprint(user) // Adds their fingerprints to the floor the crayon is drawn on.
|
||||||
if(uses)
|
if(uses)
|
||||||
uses--
|
uses--
|
||||||
@@ -207,3 +207,6 @@
|
|||||||
qdel(src)
|
qdel(src)
|
||||||
else
|
else
|
||||||
..()
|
..()
|
||||||
|
|
||||||
|
/obj/item/weapon/pen/crayon/attack_self(var/mob/user)
|
||||||
|
return
|
||||||
@@ -24,6 +24,9 @@
|
|||||||
var/colour = "black" //what colour the ink is!
|
var/colour = "black" //what colour the ink is!
|
||||||
pressure_resistance = 2
|
pressure_resistance = 2
|
||||||
|
|
||||||
|
/obj/item/weapon/pen/attack_self(var/mob/user)
|
||||||
|
to_chat(user, "<span class='notice'>Click.</span>")
|
||||||
|
playsound(loc, 'sound/items/penclick.ogg', 50, 1)
|
||||||
|
|
||||||
/obj/item/weapon/pen/blue
|
/obj/item/weapon/pen/blue
|
||||||
desc = "It's a normal blue ink pen."
|
desc = "It's a normal blue ink pen."
|
||||||
|
|||||||
BIN
sound/items/penclick.ogg
Normal file
BIN
sound/items/penclick.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user