cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fingerprints on showers and crayon graffiti.

Browse Source 
fixes #4076
as well as admin request on crayons.
This commit is contained in:
Ccomp5950
2014-01-02 20:26:14 -06:00
parent e642b3e7e7
commit f0563911cb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/items/crayons.dm
View File

@@ -80,6 +80,7 @@
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)
user << "You finish drawing." user << "You finish drawing."
target.add_fingerprint(user) // Adds their fingerprints to the floor the crayon is drawn on.
if(uses) if(uses)
uses-- uses--
if(!uses) if(!uses)
@@ -97,4 +98,4 @@
user << "\red You ate your crayon!" user << "\red You ate your crayon!"
del(src) del(src)
else else
..() ..()

3
code/game/objects/structures/watercloset.dm
View File

@@ -163,6 +163,7 @@
if("boiling") if("boiling")
watertemp = "normal" watertemp = "normal"
user.visible_message("<span class='notice'>[user] adjusts the shower with the [I].</span>", "<span class='notice'>You adjust the shower with the [I].</span>") user.visible_message("<span class='notice'>[user] adjusts the shower with the [I].</span>", "<span class='notice'>You adjust the shower with the [I].</span>")
add_fingerprint(user)
/obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up /obj/machinery/shower/update_icon() //this is terribly unreadable, but basically it makes the shower mist up
overlays.Cut() //once it's been on for a while, in addition to handling the water overlay. overlays.Cut() //once it's been on for a while, in addition to handling the water overlay.
@@ -412,4 +413,4 @@
/obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob) /obj/structure/sink/puddle/attackby(obj/item/O as obj, mob/user as mob)
icon_state = "puddle-splash" icon_state = "puddle-splash"
..() ..()
icon_state = "puddle" icon_state = "puddle"