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

2019-12-06 20:09:35 +01:00
parent 6484eea339 0598c35d70
commit 542c9007ee
1029 changed files with 34299 additions and 143444 deletions
@@ -348,9 +348,9 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
 	pixel_y = rand(0,8)-8

 /obj/item/coin/examine(mob/user)
-	..()
+	. = ..()
 	if(value)
-		to_chat(user, "<span class='info'>It's worth [value] credit\s.</span>")
+		. += "<span class='info'>It's worth [value] credit\s.</span>"

 /obj/item/coin/gold
 	name = "gold coin"