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

2019-11-27 21:44:56 +01:00
parent 66a97cb224 8cec8fa506
commit a5298dac7e
486 changed files with 3423 additions and 1975 deletions
@@ -80,9 +80,9 @@
 				user.regenerate_icons()

 /obj/item/clothing/examine(mob/user)
-	..()
+	. = ..()
 	if(hasprimary | hassecondary | hastertiary)
-		to_chat(user, "<span class='notice'>Alt-click to recolor it.</span>")	// so people don't "OOC how do you use polychromic clothes????"
+		. += "<span class='notice'>Alt-click to recolor it.</span>"

 /obj/item/clothing/Initialize()
 	..()