Merge branch 'master' into tinytweaks

2019-12-01 23:24:56 -08:00
parent e7523862eb f1ae57b626
commit 8d09f5a082
594 changed files with 4654 additions and 2602 deletions
@@ -759,9 +759,9 @@
 	STR.can_hold = typecacheof(fitting_swords)

 /obj/item/storage/belt/sabre/examine(mob/user)
-	..()
+	. = ..()
 	if(length(contents))
-		to_chat(user, "<span class='notice'>Alt-click it to quickly draw the blade.</span>")
+		. += "<span class='notice'>Alt-click it to quickly draw the blade.</span>"

 /obj/item/storage/belt/sabre/AltClick(mob/user)
 	if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))