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

2019-11-27 21:16:20 +01:00
parent d5e7f77c13 8cec8fa506
commit af0110db40
696 changed files with 5347 additions and 3094 deletions
@@ -334,8 +334,8 @@
 		update_light()

 /obj/item/melee/transforming/energy/sword/cx/examine(mob/user)
-	..()
-	to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")
+	. = ..()
+	. += "<span class='notice'>Alt-click to recolor it.</span>"

 /obj/item/melee/transforming/energy/sword/cx/worn_overlays(isinhands, icon_file)
 	. = ..()