Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

more pizza options in pizza crate #17523

Merged
merged 1 commit into from
Jan 17, 2023
Merged

more pizza options in pizza crate #17523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions code/modules/cargo/packs.dm
View file
Open in desktop
Expand Up @@ -1341,15 +1341,15 @@
small_item = TRUE
contains = list(/obj/item/storage/firstaid/o2)
crate_type = /obj/structure/closet/crate/secure/cheap

/datum/supply_pack/medical/firstaidadvanced_single
name = "Advanced Treatment Kit Single-Pack"
desc = "Contains one advanced first aid kit able to heal many advanced ailments."
cost = 600
small_item = TRUE
contains = list(/obj/item/storage/firstaid/advanced)
crate_type = /obj/structure/closet/crate/secure/cheap

/datum/supply_pack/medical/hypospraykitvial_single
name = "Hypospray Kit Single-Pack"
desc = "Contains a hypospray kit containing a hypospray and empty vials for applying reagents to patients."
Expand Down Expand Up @@ -1569,7 +1569,7 @@
/datum/supply_pack/medical/vending
name = "Medical Vending Crate"
desc = "Contains one NanoMed Plus refill, one wall-mounted NanoMed refill, and one wall-mounted HypoMed refill."
cost = 2500
cost = 2500
contains = list(/obj/item/vending_refill/medical,
/obj/item/vending_refill/wallmed,
/obj/item/vending_refill/wallhypo)
Expand Down Expand Up @@ -2112,10 +2112,17 @@
/obj/item/pizzabox/meat,
/obj/item/pizzabox/vegetable,
/obj/item/pizzabox/pineapple,
/obj/item/pizzabox/seafood)
/obj/item/pizzabox/seafood,
/obj/item/pizzabox/sassysage,
/obj/item/pizzabox/donkpocket)
crate_name = "pizza crate"
var/static/anomalous_box_provided = FALSE

/datum/supply_pack/organic/pizza/fill(obj/structure/closet/crate/C)
for(var/i in 1 to 6)
var/item = pick(contains)
new item(C)

/datum/supply_pack/organic/pizza/fill(obj/structure/closet/crate/C)
. = ..()
if(!anomalous_box_provided)
Expand Down
10 changes: 10 additions & 0 deletions code/modules/food_and_drinks/pizzabox.dm
View file
Open in desktop
Expand Up @@ -308,6 +308,16 @@
pizza = new /obj/item/reagent_containers/food/snacks/pizza/seafood(src)
boxtag = "Ahi King"

/obj/item/pizzabox/sassysage/Initialize()
. = ..()
pizza = new /obj/item/reagent_containers/food/snacks/pizza/sassysage(src)
boxtag = "Meatball Supreme"

/obj/item/pizzabox/donkpocket/Initialize()
. = ..()
pizza = new /obj/item/reagent_containers/food/snacks/pizza/donkpocket(src)
boxtag = "Donk Pocket Special"

//An anomalous pizza box that, when opened, produces the opener's favorite kind of pizza.
/obj/item/pizzabox/infinite
resistance_flags = FIRE_PROOF | LAVA_PROOF | ACID_PROOF //hard to destroy
Expand Down