cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes tags on ordered pizza (#3344)

Browse Source 
* Fixes tags on ordered pizza (#56369)

Box tags

    Fixes bug where box tags weren't updating correctly on creation
    Adds box tag flavours for the pizzas without them (i.e. Donk Pocket -> Bangin' Donk, Dank -> Fresh Herb, Sassysage -> Sausage Lovers, Arnold -> 9mm Pepperoni)

Randomised pizza crates

    Pizza crates can now come with any five pizzas, weighted by disruptiveness
    Small chance of getting one pizza bomb in a pizza crate (either armed or not) per shift

Armed pizza bomb

    Adds an armed variant of the bomb pizza box, which has the boxtag "Meat Explosion", contains a meat pizza and explodes 5 seconds after opening
    Makes the pizza party spawner use the armed bomb pizza box, instead of giving whoever a free syndicate pizza bomb they probably aren't allowed to use anyway

Secure kitchen crate

    Adds the secure kitchen crate from my previous PR
    Adds a secure pizza crate variant to KiloStation's cargo warehouse where the freezer crate was, which contains the pizza party and is locked with kitchen access

Ghost examines

    Adds ghost examine messages for pizza boxes with bombs or the nanomachine pizza in them

* Fixes tags on ordered pizza

Co-authored-by: cacogen <25089914+cacogen@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-02-13 11:13:43 +01:00
committed by GitHub
parent 27b9b8c6c7
commit c430e11d0b
8 changed files with 163 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/food/pizza.dm
+12 -2
View File
@@ -8,6 +8,8 @@
foodtypes = GRAIN | DAIRY | VEGETABLES
/// type is spawned 6 at a time and replaces this pizza when processed by cutting tool
var/obj/item/food/pizzaslice/slice_type
///What label pizza boxes use if this pizza spawns in them.
var/boxtag = ""
/obj/item/food/pizza/MakeProcessable()
if (slice_type)
@@ -35,9 +37,9 @@
icon_state = "pizzamargherita"
food_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1)
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/margherita
boxtag = "Margherita Deluxe"
/obj/item/food/pizza/margherita/robo
food_reagents = list(/datum/reagent/nanomachines = 70, /datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 5)
@@ -60,6 +62,7 @@
food_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 8)
foodtypes = GRAIN | VEGETABLES| DAIRY | MEAT
slice_type = /obj/item/food/pizzaslice/meat
boxtag = "Meatlovers' Supreme"
/obj/item/food/pizzaslice/meat
name = "meatpizza slice"
@@ -77,6 +80,7 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "mushroom" = 1)
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/mushroom
boxtag = "Mushroom Special"
/obj/item/food/pizzaslice/mushroom
name = "mushroom pizza slice"
@@ -94,6 +98,7 @@
tastes = list("crust" = 1, "tomato" = 2, "cheese" = 1, "carrot" = 1)
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/vegetable
boxtag = "Gourmet Vegetable"
/obj/item/food/pizzaslice/vegetable
name = "vegetable pizza slice"
@@ -111,6 +116,7 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1, "laziness" = 1)
foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | JUNKFOOD
slice_type = /obj/item/food/pizzaslice/donkpocket
boxtag = "Bangin' Donk"
/obj/item/food/pizzaslice/donkpocket
name = "donkpocket pizza slice"
@@ -128,6 +134,7 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/dank
boxtag = "Fresh Herb"
/obj/item/food/pizzaslice/dank
name = "dank pizza slice"
@@ -139,12 +146,13 @@
/obj/item/food/pizza/sassysage
name = "sassysage pizza"
desc = "You can really smell the sassiness."
desc = "You can almost taste the sassiness."
icon_state = "sassysagepizza"
food_reagents = list(/datum/reagent/consumable/nutriment = 20, /datum/reagent/consumable/nutriment/protein = 15, /datum/reagent/consumable/tomatojuice = 6, /datum/reagent/consumable/nutriment/vitamin = 6)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "meat" = 1)
foodtypes = GRAIN | VEGETABLES | DAIRY
slice_type = /obj/item/food/pizzaslice/sassysage
boxtag = "Sausage Lovers"
/obj/item/food/pizzaslice/sassysage
name = "sassysage pizza slice"
@@ -162,6 +170,7 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
foodtypes = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
slice_type = /obj/item/food/pizzaslice/pineapple
boxtag = "Honolulu Chew"
/obj/item/food/pizzaslice/pineapple
name = "\improper Hawaiian pizza slice"
@@ -195,6 +204,7 @@
food_reagents = list(/datum/reagent/consumable/nutriment = 25, /datum/reagent/consumable/nutriment/protein = 9, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/iron = 10, /datum/reagent/medicine/omnizine = 30)
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pepperoni" = 2, "9 millimeter bullets" = 2)
slice_type = /obj/item/food/pizzaslice/arnold
boxtag = "9mm Pepperoni"
//fuck it, i will leave this at the food level for now.
/obj/item/food/proc/try_break_off(mob/living/M, mob/living/user) //maybe i give you a pizza maybe i break off your arm