Merge pull request #7686 from xxalpha/newgraffiti

New graffiti.
This commit is contained in:
phil235
2015-02-21 12:46:45 +01:00
3 changed files with 10 additions and 1 deletions
+4 -1
View File
@@ -434,7 +434,7 @@
attack_verb = list("attacked", "coloured")
var/colour = "#FF0000" //RGB
var/drawtype = "rune"
var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body")
var/list/graffiti = list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","body","cyka")
var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
var/uses = 30 //0 for unlimited uses
var/instant = 0
@@ -449,6 +449,9 @@
..()
name = "[colourName] crayon" //Makes crayons identifiable in things like grinders
drawtype = pick(pick(graffiti), pick(letters), "rune[rand(1,6)]")
if(config.mutant_races == 1)
graffiti += "antilizard"
graffiti += "prolizard"
/obj/item/toy/crayon/attack_self(mob/living/user as mob)
update_window(user)