Crayons are now children of pens.

This commit is contained in:
PsiOmega
2015-05-05 08:40:52 +02:00
parent ca5ed9109d
commit 1c38be5cfd
13 changed files with 63 additions and 90 deletions

View File

@@ -487,8 +487,8 @@
qdel(src)
/obj/item/weapon/reagent_containers/food/snacks/egg/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype( W, /obj/item/toy/crayon ))
var/obj/item/toy/crayon/C = W
if(istype( W, /obj/item/weapon/pen/crayon ))
var/obj/item/weapon/pen/crayon/C = W
var/clr = C.colourName
if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow")))