Merge branch 'master' into master

2019-07-21 01:50:41 +01:00
parent d73fabffff 39dea966ae
commit 15ab1a26a4
115 changed files with 1351 additions and 473 deletions
@@ -132,7 +132,7 @@
 		else
 			var/list/choice_list = list()
 			for(var/obj/item/I in items_list)
-				choice_list[I] = getFlatIcon(I)
+				choice_list[I] = image(I)
 			var/obj/item/choice = show_radial_menu(owner, owner, choice_list)
 			if(owner && owner == usr && owner.stat != DEAD && (src in owner.internal_organs) && !holder && (choice in contents))
 				// This monster sanity check is a nice example of how bad input is.