From a74ec39eeda9b5ce297b45684864ecf613f63fb5 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 13 Oct 2018 14:15:04 -0700 Subject: [PATCH] Merge pull request #5655 from lbnesquik/Kates-Wax-Fix Wax can stacxk --- code/modules/hydroponics/beekeeping/beehive.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/hydroponics/beekeeping/beehive.dm b/code/modules/hydroponics/beekeeping/beehive.dm index 7f95ac306c..e3da347908 100644 --- a/code/modules/hydroponics/beekeeping/beehive.dm +++ b/code/modules/hydroponics/beekeeping/beehive.dm @@ -179,7 +179,7 @@ qdel(H) spawn(50) new /obj/item/honey_frame(loc) - new /obj/item/stack/wax(loc) + new /obj/item/stack/material/wax(loc) honey += processing processing = 0 icon_state = "centrifuge" @@ -234,14 +234,14 @@ qdel(src) return -/obj/item/stack/wax +/obj/item/stack/material/wax name = "wax" singular_name = "wax piece" desc = "Soft substance produced by bees. Used to make candles." icon = 'icons/obj/beekeeping.dmi' icon_state = "wax" -/obj/item/stack/wax/New() +/obj/item/stack/material/wax/New() ..() recipes = wax_recipes