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

2017-08-29 21:19:22 -05:00
parent 6c76ae2395 3a015fc2f0
commit b2114a7b81
5 changed files with 1068 additions and 1056 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()
+ 	..()