Merge branch 'master' into upstream-merge-30113

2017-08-29 20:02:14 -07:00
parent cd11c01c42 0b82132443
commit 1b0bbb8c86
431 changed files with 1841 additions and 5611 deletions
@@ -1400,8 +1400,8 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 		if(crate_value < I.cost)
 			continue
 		crate_value -= I.cost
-		new I.item(C)
-		U.purchase_log += "<big>[icon2base64html(I.item)]</big>"
+		var/obj/goods = new I.item(C)
+		U.purchase_log += "<big>[icon2base64html(goods)]</big>"

 	SSblackbox.add_details("traitor_uplink_items_bought", "[name]|[cost]")
 	return C