Merge upstream

This commit is contained in:
Cyberboss
2017-03-30 19:18:59 -04:00
102 changed files with 8157 additions and 382 deletions
+2 -5
View File
@@ -49,11 +49,8 @@
if(length(A.name) + length(label) > 64)
to_chat(user, "<span class='warning'>Label too big!</span>")
return
if(ishuman(A))
to_chat(user, "<span class='warning'>You can't label humans!</span>")
return
if(issilicon(A))
to_chat(user, "<span class='warning'>You can't label cyborgs!</span>")
if(ismob(A))
to_chat(user, "<span class='warning'>You can't label creatures!</span>") // use a collar
return
user.visible_message("[user] labels [A] as [label].", \