shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating spraycans and crayons code.

Browse Source
This commit is contained in:
Ghommie
2019-07-17 15:45:48 +02:00
parent 8c1b7c4f22
commit b818b1eedd
7 changed files with 115 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/paint.dm
+7 -5
View File
@@ -90,14 +90,14 @@
add_fingerprint(user)
/obj/item/paint/afterattack(turf/target, mob/user, proximity)
/obj/item/paint/afterattack(atom/target, mob/user, proximity)
. = ..()
if(!proximity)
return
if(paintleft <= 0)
icon_state = "paint_empty"
return
if(!istype(target) || isspaceturf(target))
if(!isturf(target) || isspaceturf(target))
return
var/newcolor = "#" + item_color
target.add_atom_colour(newcolor, WASHABLE_COLOUR_PRIORITY)
@@ -105,12 +105,14 @@
/obj/item/paint/paint_remover
gender = PLURAL
name = "paint remover"
desc = "Used to remove color from floors and walls."
desc = "Used to remove color from anything."
icon_state = "paint_neutral"
/obj/item/paint/paint_remover/afterattack(turf/target, mob/user, proximity)
/obj/item/paint/paint_remover/afterattack(atom/target, mob/user, proximity)
. = ..()
if(!proximity)
return
if(istype(target) && target.color != initial(target.color))
if(!isturf(target) || !isobj(target))
return
if(target.color != initial(target.color))
target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)