Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450

2019-12-11 21:10:24 +01:00
parent 7a3cb3bd58 f2fc50119d
commit 651370c5b4
102 changed files with 296 additions and 181 deletions
@@ -150,11 +150,13 @@
 		ui.open()

 /obj/item/toy/crayon/spraycan/AltClick(mob/user)
+	. = ..()
 	if(user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
 		if(has_cap)
 			is_capped = !is_capped
 			to_chat(user, "<span class='notice'>The cap on [src] is now [is_capped ? "on" : "off"].</span>")
 			update_icon()
+			return TRUE

 /obj/item/toy/crayon/proc/staticDrawables()