code/game/objects, code/game/machinery merge fix

This commit is contained in:
GinjaNinja32
2015-06-02 20:18:45 +01:00
parent 314a28fa75
commit c77605265c
76 changed files with 524 additions and 520 deletions

View File

@@ -84,7 +84,7 @@
if(uses)
uses--
if(!uses)
user << "\red You used up your crayon!"
user << "<span class='warning'>You used up your crayon!</span>"
qdel(src)
return
@@ -96,7 +96,7 @@
if(uses)
uses -= 5
if(uses <= 0)
user << "\red You ate your crayon!"
user << "<span class='warning'>You ate your crayon!</span>"
qdel(src)
else
..()