cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6094 from Heroman3003/anti-magic-markers

Browse Source 
Fixes markers and crayons drawing from a distance
This commit is contained in:
Neerti
2019-04-16 23:07:51 -04:00
committed by VirgoBot
parent 01a7f1083b
commit 860ff31f08
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/game/objects/items/crayons.dm
View File

@@ -69,9 +69,13 @@
if(!proximity) return if(!proximity) return
if(istype(target,/turf/simulated/floor)) if(istype(target,/turf/simulated/floor))
var/drawtype = input("Choose what you'd like to draw.", "Crayon scribbles") in list("graffiti","rune","letter","arrow") var/drawtype = input("Choose what you'd like to draw.", "Crayon scribbles") in list("graffiti","rune","letter","arrow")
if(get_dist(target, user) > 1 || !(user.z == target.z))
return
switch(drawtype) switch(drawtype)
if("letter") 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") 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))
return
to_chat(user, "You start drawing a letter on the [target.name].") to_chat(user, "You start drawing a letter on the [target.name].")
if("graffiti") if("graffiti")
to_chat(user, "You start drawing graffiti on the [target.name].") to_chat(user, "You start drawing graffiti on the [target.name].")
@@ -79,6 +83,8 @@
to_chat(user, "You start drawing a rune on the [target.name].") to_chat(user, "You start drawing a rune on the [target.name].")
if("arrow") if("arrow")
drawtype = input("Choose the arrow.", "Crayon scribbles") in list("left", "right", "up", "down") drawtype = input("Choose the arrow.", "Crayon scribbles") in list("left", "right", "up", "down")
if(get_dist(target, user) > 1 || !(user.z == target.z))
return
to_chat(user, "You start drawing an arrow on the [target.name].") to_chat(user, "You start drawing an arrow on the [target.name].")
if(instant || do_after(user, 50)) if(instant || do_after(user, 50))
new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype) new /obj/effect/decal/cleanable/crayon(target,colour,shadeColour,drawtype)