From b22ec2191186ea770883710f018f9457d5a2d139 Mon Sep 17 00:00:00 2001 From: PrismaticGynoid Date: Fri, 13 Dec 2019 14:00:59 -0800 Subject: [PATCH] Graffiti selection (#6562) * Lets you choose what type of graffiti or rune to draw when vandalizing the floor with crayons or markers. No more drawing and erasing a dozen times to get the exact graffiti you want. * Puts in Mechoid's suggestion --- code/game/objects/items/crayons.dm | 10 ++++++++-- .../changelogs/PrismaticGynoid - GraffitiSelection.yml | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/PrismaticGynoid - GraffitiSelection.yml diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index ff47cab3ca..1e31744e26 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -74,16 +74,22 @@ switch(drawtype) if("letter") drawtype = input("Choose the letter.", "Crayon scribbles") in 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") - if(get_dist(target, user) > 1 || !(user.z == target.z)) + if(get_dist(target, user) > 1 || !(user.z == target.z) || !drawtype) return to_chat(user, "You start drawing a letter on the [target.name].") if("graffiti") + drawtype = input("Choose the graffiti.", "Crayon scribbles") in list("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa") + if(get_dist(target, user) > 1 || !(user.z == target.z) || !drawtype) + return to_chat(user, "You start drawing graffiti on the [target.name].") if("rune") + drawtype = input("Choose the rune.", "Crayon scribbles") in list("rune1", "rune2", "rune3", "rune4", "rune5", "rune6") + if(get_dist(target, user) > 1 || !(user.z == target.z) || !drawtype) + return to_chat(user, "You start drawing a rune on the [target.name].") if("arrow") drawtype = input("Choose the arrow.", "Crayon scribbles") in list("left", "right", "up", "down") - if(get_dist(target, user) > 1 || !(user.z == target.z)) + if(get_dist(target, user) > 1 || !(user.z == target.z) || !drawtype) return to_chat(user, "You start drawing an arrow on the [target.name].") if(instant || do_after(user, 50)) diff --git a/html/changelogs/PrismaticGynoid - GraffitiSelection.yml b/html/changelogs/PrismaticGynoid - GraffitiSelection.yml new file mode 100644 index 0000000000..52394316af --- /dev/null +++ b/html/changelogs/PrismaticGynoid - GraffitiSelection.yml @@ -0,0 +1,6 @@ +author: PrismaticGynoid + +delete-after: True + +changes: + - tweak: "You can now choose what type of graffiti or rune to draw when using crayons/markers."