From d3196306f854e35f079e5d57120e566a109dcd41 Mon Sep 17 00:00:00 2001 From: Geeves Date: Sun, 13 Dec 2020 12:35:45 +0200 Subject: [PATCH] Pineapple Pizza (#10768) --- code/game/objects/random/random.dm | 13 +++++++++ .../reagent_containers/food/snacks.dm | 27 +++++++++++++------ html/changelogs/geeves-pineapple_pizza.yml | 6 +++++ 3 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 html/changelogs/geeves-pineapple_pizza.yml diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index e54b3deb86f..fddf824e0d6 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -1690,3 +1690,16 @@ /obj/structure/reagent_dispensers/keg/xuizikeg = 0.5, /obj/structure/reagent_dispensers/keg/mead = 0.5 ) + +/obj/random/pizzabox + name = "random pizzabox" + desc = "Contains a random pizzabox." + icon = 'icons/obj/food.dmi' + icon_state = "pizzabox1" + spawnlist = list( + /obj/item/pizzabox/margherita, + /obj/item/pizzabox/vegetable, + /obj/item/pizzabox/mushroom, + /obj/item/pizzabox/meat, + /obj/item/pizzabox/pineapple + ) \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index cc0fcbb574a..1009c628b6c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -3204,9 +3204,16 @@ var/open = 0 // Is the box open? var/ismessy = 0 // Fancy mess on the lid var/obj/item/reagent_containers/food/snacks/sliceable/pizza/pizza // Content pizza + var/pizza_type var/list/boxes = list() // If the boxes are stacked, they come here var/boxtag = "" +/obj/item/pizzabox/Initialize() + . = ..() + if(pizza_type) + pizza = new pizza_type(src) + update_icon() + /obj/item/pizzabox/update_icon() cut_overlays() @@ -3351,22 +3358,26 @@ return ..() -/obj/item/pizzabox/margherita/New() - pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita(src) +/obj/item/pizzabox/margherita + pizza_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/margherita boxtag = "Margherita Deluxe" -/obj/item/pizzabox/vegetable/New() - pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza(src) +/obj/item/pizzabox/vegetable + pizza_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza boxtag = "Gourmet Vegatable" -/obj/item/pizzabox/mushroom/New() - pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza(src) +/obj/item/pizzabox/mushroom + pizza_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/mushroompizza boxtag = "Mushroom Special" -/obj/item/pizzabox/meat/New() - pizza = new /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza(src) +/obj/item/pizzabox/meat + pizza_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/meatpizza boxtag = "Meatlover's Supreme" +/obj/item/pizzabox/pineapple + pizza_type = /obj/item/reagent_containers/food/snacks/sliceable/pizza/pineapple + boxtag = "Silversun Sunrise" + /obj/item/reagent_containers/food/snacks/sliceable/dionaroast name = "roast diona" desc = "It's like an enormous, leathery carrot. With an eye." diff --git a/html/changelogs/geeves-pineapple_pizza.yml b/html/changelogs/geeves-pineapple_pizza.yml new file mode 100644 index 00000000000..8919833a815 --- /dev/null +++ b/html/changelogs/geeves-pineapple_pizza.yml @@ -0,0 +1,6 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added an orderable pineapple pizza box, as well as a cheaper randomized pizza box." \ No newline at end of file