Merge pull request #2532 from Citadel-Station-13/upstream-merge-30238

[MIRROR] Fixes ingredients-box sprite.
2017-08-29 02:14:30 -05:00
parent a03f4722e8 292f5d5d35
commit 798c14cc2b
2 changed files with 901 additions and 893 deletions
@@ -0,0 +1,9 @@
+diff a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm	(rejected hunks)
+@@ -732,7 +732,6 @@
+ /obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
+ 	name = "ingredients box"
+ 	illustration = "donk_kit"
+-	icon_state = null
+ 
+ /obj/item/storage/box/ingredients/Initialize()
+ 	..()