diff --git a/code/game/objects/effects/spawners/depot_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm index efebffdd04b..e2e38083192 100644 --- a/code/game/objects/effects/spawners/depot_spawners.dm +++ b/code/game/objects/effects/spawners/depot_spawners.dm @@ -37,14 +37,14 @@ name = "33pc trap pizza" icon_state = "pizzabox" loot = list( - /obj/item/pizzabox/pepperoni = 7, // Higher weight as a pizza bomb looks like pepperoni by default - /obj/item/pizzabox/pizza_bomb/autoarm = 7, + /obj/item/pizzabox/pizza_bomb/autoarm = 4, /obj/item/pizzabox/firecracker = 1, /obj/item/pizzabox/garlic = 1, /obj/item/pizzabox/hawaiian = 1, /obj/item/pizzabox/margherita = 1, /obj/item/pizzabox/meat = 1, /obj/item/pizzabox/mushroom = 1, + /obj/item/pizzabox/pepperoni = 1, /obj/item/pizzabox/vegetable = 1, ) diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index 8a62b48fd3a..3b9c7a5d13c 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -271,10 +271,16 @@ var/is_messy = FALSE // Fancy mess on the lid var/obj/item/food/sliceable/pizza/pizza // Content pizza var/list/boxes = list() // If the boxes are stacked, they come here + /// The name that shows on the box lid, describing the pizza type. var/box_tag = "" + /// The type of pizza that's spawned in the box. + var/pizza_type /obj/item/pizzabox/Initialize(mapload) . = ..() + if(!isnull(pizza_type)) + pizza = new pizza_type(src) + update_appearance(UPDATE_DESC|UPDATE_ICON) /obj/item/pizzabox/update_desc() @@ -409,46 +415,37 @@ return ..() - -/obj/item/pizzabox/margherita/Initialize(mapload) - pizza = new /obj/item/food/sliceable/pizza/margheritapizza(src) +/obj/item/pizzabox/margherita + pizza_type = /obj/item/food/sliceable/pizza/margheritapizza box_tag = "margherita deluxe" - . = ..() -/obj/item/pizzabox/vegetable/Initialize(mapload) - pizza = new /obj/item/food/sliceable/pizza/vegetablepizza(src) +/obj/item/pizzabox/vegetable + pizza_type = /obj/item/food/sliceable/pizza/vegetablepizza box_tag = "gourmet vegetable" - . = ..() -/obj/item/pizzabox/mushroom/Initialize(mapload) - pizza = new /obj/item/food/sliceable/pizza/mushroompizza(src) +/obj/item/pizzabox/mushroom + pizza_type = /obj/item/food/sliceable/pizza/mushroompizza box_tag = "mushroom special" - . = ..() -/obj/item/pizzabox/meat/Initialize(mapload) - pizza = new /obj/item/food/sliceable/pizza/meatpizza(src) +/obj/item/pizzabox/meat + pizza_type = /obj/item/food/sliceable/pizza/meatpizza box_tag = "meatlover's supreme" - . = ..() -/obj/item/pizzabox/hawaiian/Initialize(mapload) - pizza = new /obj/item/food/sliceable/pizza/hawaiianpizza(src) +/obj/item/pizzabox/hawaiian + pizza_type = /obj/item/food/sliceable/pizza/hawaiianpizza box_tag = "Hawaiian feast" - . = ..() -/obj/item/pizzabox/pepperoni/Initialize(mapload) - pizza = new /obj/item/food/sliceable/pizza/pepperonipizza(src) +/obj/item/pizzabox/pepperoni + pizza_type = /obj/item/food/sliceable/pizza/pepperonipizza box_tag = "classic pepperoni" - . = ..() -/obj/item/pizzabox/garlic/Initialize(mapload) - pizza = new /obj/item/food/sliceable/pizza/garlicpizza(src) +/obj/item/pizzabox/garlic + pizza_type = /obj/item/food/sliceable/pizza/garlicpizza box_tag = "triple garlic" - . = ..() -/obj/item/pizzabox/firecracker/Initialize(mapload) - pizza = new /obj/item/food/sliceable/pizza/firecrackerpizza(src) +/obj/item/pizzabox/firecracker + pizza_type = /obj/item/food/sliceable/pizza/firecrackerpizza box_tag = "extra spicy pie" - . = ..() ////////////////////////// // Pizza bombs // @@ -582,7 +579,8 @@ /obj/item/pizzabox/pizza_bomb/Initialize(mapload) correct_wire = pick(wires) - box_tag = "classic pepperoni" + var/obj/item/pizzabox/mimic_box = pick(subtypesof(/obj/item/pizzabox) - typesof(/obj/item/pizzabox/pizza_bomb)) + box_tag = mimic_box.box_tag . = ..() /obj/item/pizzabox/pizza_bomb/autoarm