Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Hawk_v3
2019-11-07 19:54:10 +00:00
215 changed files with 2053 additions and 888 deletions

View File

@@ -12,7 +12,7 @@
M.aiming = new(src)
M.aiming.toggle_active()
else
src << "<span class='warning'>This verb may only be used by living mobs, sorry.</span>"
to_chat(src, "<span class='warning'>This verb may only be used by living mobs, sorry.</span>")
return
/mob/living/proc/stop_aiming(var/obj/item/thing, var/no_message = 0)