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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Microwaved snacks #371

Merged
merged 12 commits into from
Sep 10, 2024
Merged

Microwaved snacks #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
86abbad
Microwaved snacks
Meatstuff882 Aug 11, 2024
c997df1
makes microwaved food subtypes
Meatstuff882 Aug 14, 2024
0d5c881
code works now (kind of)
Meatstuff882 Aug 14, 2024
2f93757
changes everythign basiclayy
Meatstuff882 Aug 18, 2024
67fdb88
Merge branch 'master' into burgers
Meatstuff882 Aug 19, 2024
86a43f9
donk wrappers
Meatstuff882 Aug 24, 2024
14d85cf
Merge branch 'master' of https://github.com/cmss13-devs/cmss13-pve in…
Meatstuff882 Aug 24, 2024
6d57ca7
fixes a whitespace
Meatstuff882 Aug 24, 2024
e3dc9c0
Breaks and Ruins everything
Meatstuff882 Aug 25, 2024
5915b39
Merge branch 'master' into burgers
Meatstuff882 Aug 25, 2024
2ed1f0d
Merge branch 'master' into burgers
Meatstuff882 Sep 8, 2024
d64b2ae
resolves conflict
Meatstuff882 Sep 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 53 additions & 32 deletions code/datums/recipe.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,59 @@

//other

/datum/recipe/donkpocket
items = list(
/obj/item/reagent_container/food/snacks/dough,
/obj/item/reagent_container/food/snacks/meatball,
)
result = /obj/item/reagent_container/food/snacks/microwavable/donkpocket //SPECIAL

/datum/recipe/microwavesnack/proc/warm_up(obj/item/reagent_container/food/snacks/microwavable/being_cooked)
being_cooked.warm = 1
being_cooked.reagents.add_reagent("bread", 1)
being_cooked.reagents.add_reagent("meatprotein", 1)
being_cooked.name = "Warm " + being_cooked.name
being_cooked.desc = being_cooked.warm_desc

/datum/recipe/microwavesnack/make_food(obj/container as obj)
var/obj/item/reagent_container/food/snacks/microwavable/being_cooked = ..(container)
warm_up(being_cooked)
return being_cooked

/datum/recipe/microwavesnack/warm/make_food(obj/container as obj)
var/obj/item/reagent_container/food/snacks/microwavable/being_cooked = locate() in container
if(being_cooked && !being_cooked.warm)
warm_up(being_cooked)
return being_cooked

/datum/recipe/microwavesnack/donkpocket/warm
reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour
items = list(
/obj/item/reagent_container/food/snacks/microwavable/donkpocket,
)
result = /obj/item/reagent_container/food/snacks/microwavable/donkpocket //SPECIAL

/datum/recipe/microwavesnack/packaged_burrito/warm
reagents = list() //Literally just stealing this from the donk pocket code with barely any understanding of what it means. Here's hoping!
items = list(
/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito,
)
result = /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito //SPECIAL

/datum/recipe/microwavesnack/packaged_burger/warm
reagents = list()
items = list(
/obj/item/reagent_container/food/snacks/microwavable/packaged_burger,
)
result = /obj/item/reagent_container/food/snacks/microwavable/packaged_burger //SPECIAL

/datum/recipe/microwavesnack/packaged_hdogs/warm
reagents = list()
items = list(
/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs,
)
result = /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs //SPECIAL

/datum/recipe/hotdog
items = list(
/obj/item/reagent_container/food/snacks/bun,
Expand All @@ -678,38 +731,6 @@
)
result = /obj/item/reagent_container/food/snacks/pancakes

/datum/recipe/donkpocket
items = list(
/obj/item/reagent_container/food/snacks/dough,
/obj/item/reagent_container/food/snacks/meatball,
)
result = /obj/item/reagent_container/food/snacks/donkpocket //SPECIAL

/datum/recipe/donkpocket/proc/warm_up(obj/item/reagent_container/food/snacks/donkpocket/being_cooked)
being_cooked.warm = 1
being_cooked.reagents.add_reagent("tricordrazine", 5)
being_cooked.bitesize = 6
being_cooked.name = "Warm " + being_cooked.name
being_cooked.cooltime()

/datum/recipe/donkpocket/make_food(obj/container as obj)
var/obj/item/reagent_container/food/snacks/donkpocket/being_cooked = ..(container)
warm_up(being_cooked)
return being_cooked

/datum/recipe/donkpocket/warm
reagents = list() //This is necessary since this is a child object of the above recipe and we don't want donk pockets to need flour
items = list(
/obj/item/reagent_container/food/snacks/donkpocket,
)
result = /obj/item/reagent_container/food/snacks/donkpocket //SPECIAL

/datum/recipe/donkpocket/warm/make_food(obj/container as obj)
var/obj/item/reagent_container/food/snacks/donkpocket/being_cooked = locate() in container
if(being_cooked && !being_cooked.warm)
warm_up(being_cooked)
return being_cooked

/datum/recipe/muffin
reagents = list("milk" = 5, "sugar" = 5)
items = list(
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/colonialmarines/huntergames.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
\
75; /obj/item/stack/medical/bruise_pack, \
75; /obj/item/stack/medical/ointment, \
75; /obj/item/reagent_container/food/snacks/donkpocket, \
75; /obj/item/reagent_container/food/snacks/microwavable/donkpocket, \
\
100; /obj/item/cell/high, \
100; /obj/item/tool/wirecutters, \
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/kitchen/microwave.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
if (istype(contents_item, /obj/item/reagent_container/food/snacks/meat)) //any meat
items_measures[display_name] = "slab of meat"
items_measures_p[display_name] = "slabs of meat"
if (istype(contents_item, /obj/item/reagent_container/food/snacks/donkpocket))
if (istype(contents_item, /obj/item/reagent_container/food/snacks/microwavable/donkpocket))
display_name = "Turnovers"
items_measures[display_name] = "turnover"
items_measures_p[display_name] = "turnovers"
Expand Down
21 changes: 12 additions & 9 deletions code/game/machinery/vending/vending_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,10 @@
product_ads = "Kepler Crisps! Try a snack that's out of this world!;Eat an EAT!"
icon_state = "snack"
products = list(
/obj/item/reagent_container/food/snacks/packaged_burger = 12,
/obj/item/reagent_container/food/snacks/packaged_burrito = 12,
/obj/item/reagent_container/food/snacks/packaged_hdogs =12,
/obj/item/reagent_container/food/snacks/microwavable/donkpocket = 12,
/obj/item/reagent_container/food/snacks/microwavable/packaged_burger = 12,
/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = 12,
/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs =12,
/obj/item/reagent_container/food/snacks/kepler_crisps = 12,
/obj/item/reagent_container/food/snacks/kepler_crisps/flamehot = 12,
/obj/item/reagent_container/food/snacks/wy_chips/pepper = 12,
Expand All @@ -64,9 +65,10 @@
)

prices = list(
/obj/item/reagent_container/food/snacks/packaged_burger = 5,
/obj/item/reagent_container/food/snacks/packaged_burrito = 5,
/obj/item/reagent_container/food/snacks/packaged_hdogs = 5,
/obj/item/reagent_container/food/snacks/microwavable/donkpocket = 5,
/obj/item/reagent_container/food/snacks/microwavable/packaged_burger = 5,
/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = 5,
/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs = 5,
/obj/item/reagent_container/food/snacks/kepler_crisps = 3,
/obj/item/reagent_container/food/snacks/kepler_crisps/flamehot = 5,
/obj/item/reagent_container/food/snacks/wy_chips/pepper = 3,
Expand All @@ -81,9 +83,10 @@
product_slogans = ""
product_ads = ""
products = list(
/obj/item/reagent_container/food/snacks/packaged_burger = 40,
/obj/item/reagent_container/food/snacks/packaged_burrito = 40,
/obj/item/reagent_container/food/snacks/packaged_hdogs = 40,
/obj/item/reagent_container/food/snacks/microwavable/donkpocket = 40,
/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = 40,
/obj/item/reagent_container/food/snacks/microwavable/packaged_burger = 40,
/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs = 40,
)

/obj/structure/machinery/vending/cola
Expand Down
108 changes: 69 additions & 39 deletions code/game/objects/items/reagent_containers/food/snacks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,26 +736,6 @@
reagents.add_reagent("meatprotein", 6)
bitesize = 2

/obj/item/reagent_container/food/snacks/donkpocket
name = "Donk-pocket"
desc = "The food of choice for the seasoned traitor."
icon_state = "donkpocket"
filling_color = "#DEDEAB"
var/warm = 0

/obj/item/reagent_container/food/snacks/donkpocket/Initialize()
. = ..()
reagents.add_reagent("meatprotein", 2)
reagents.add_reagent("bread", 2)

/obj/item/reagent_container/food/snacks/donkpocket/proc/cooltime() //Not working, derp?
if(warm)
spawn(4200)
if(!QDELETED(src)) //not qdel'd
warm = 0
reagents.del_reagent("tricordrazine")
name = "donk-pocket"

/obj/item/reagent_container/food/snacks/brainburger
name = "brainburger"
desc = "A strange looking burger. It looks almost sentient."
Expand Down Expand Up @@ -3154,19 +3134,67 @@
reagents.add_reagent("vegetable", 3)
reagents.add_reagent("potato", 3)

/obj/item/reagent_container/food/snacks/packaged_burrito
/obj/item/reagent_container/food/snacks/microwavable
name = "Microwavable snack"
desc = "Some food you could microwave. It won't be tastier if you do, though."
var/warm_desc = "Some microwaved food."
icon_state = "donkpocket"
bitesize = 3
var/warm = 0

/obj/item/reagent_container/food/snacks/microwavable/proc/cooltime() //Not working, derp?
if(warm)
spawn(4200)
if(!QDELETED(src)) //not qdel'd
warm = 0
reagents.del_reagent("bread", 1)
reagents.del_reagent("meatprotein", 1)
name = name

/obj/item/reagent_container/food/snacks/microwavable/donkpocket
name = "Donk-pocket"
desc = "The food of choice for the seasoned traitor. Packaged by the Weyland-Yutani Corporation."
warm_desc = "The food of choice for the seasoned traitor. Warmed unevenly and rock hard."
icon_state = "donkpocket_wr2"
filling_color = "#DEDEAB"
package = 2

/obj/item/reagent_container/food/snacks/microwavable/donkpocket/Initialize()
. = ..()
reagents.add_reagent("meatprotein", 5)
reagents.add_reagent("bread", 5)
reagents.add_reagent("tomatojuice", 2)
reagents.add_reagent("cheese", 2)

/obj/item/reagent_container/food/snacks/microwavable/donkpocket/attack_self(mob/user)
..()

if(package==1) // this one comes first, otherwise it will run package==2 and THEN package==1 in succession
playsound(src.loc,'sound/effects/pageturn2.ogg', 15, 1)
to_chat(user, SPAN_NOTICE("You pull off the sleeve from the donk pocket!"))
package = 0
icon_state = "donkpocket"
if(package==2)
playsound(src.loc,'sound/effects/pageturn2.ogg', 15, 1)
to_chat(user, SPAN_NOTICE("You pull off the wrapping from the donk pocket!"))
package = 1
icon_state = "donkpocket_wr1"

/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito
name = "Packaged Burrito"
desc = "A hard microwavable burrito. There's no time given for how long to cook it. Packaged by the Weyland-Yutani Corporation."
desc = "A hard microwavable burrito. There's no time given for how long to cook it, but you can try microwaving it anyways. Packaged by the Weyland-Yutani Corporation."
warm_desc = "A hard microwaved burrito. Molten on the outside, barely cooked on the inside."
icon_state = "packaged-burrito"
bitesize = 2
package = 1

/obj/item/reagent_container/food/snacks/packaged_burrito/Initialize()
/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito/Initialize()
. = ..()
reagents.add_reagent("bread", 5)
reagents.add_reagent("meatprotein", 5)
reagents.add_reagent("bread", 4)
reagents.add_reagent("meatprotein", 4)
reagents.add_reagent("vegetable", 2)
reagents.add_reagent("cheese", 2)

/obj/item/reagent_container/food/snacks/packaged_burrito/attack_self(mob/user)
/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito/attack_self(mob/user)
..()

if(package)
Expand All @@ -3175,21 +3203,22 @@
package = 0
icon_state = "open-burrito"

/obj/item/reagent_container/food/snacks/packaged_burger
/obj/item/reagent_container/food/snacks/microwavable/packaged_burger
name = "Packaged Cheeseburger"
desc = "A soggy microwavable burger. There's no time given for how long to cook it. Packaged by the Weyland-Yutani Corporation."
desc = "A soggy microwavable burger. There's no time given for how long to cook it, but you can try microwaving it anyways. Packaged by the Weyland-Yutani Corporation."
warm_desc = "A soggy microwaved burger. It's not any less soggy then it was before, it's just hot now."
icon_state = "burger"
bitesize = 3
package = 1

/obj/item/reagent_container/food/snacks/packaged_burger/Initialize()
/obj/item/reagent_container/food/snacks/microwavable/packaged_burger/Initialize()
. = ..()
reagents.add_reagent("bread", 5)
reagents.add_reagent("meatprotein", 5)
reagents.add_reagent("cheese", 2)
reagents.add_reagent("sodiumchloride", 2)


/obj/item/reagent_container/food/snacks/packaged_burger/attack_self(mob/user)
/obj/item/reagent_container/food/snacks/microwavable/packaged_burger/attack_self(mob/user)
..()

if(package)
Expand All @@ -3199,20 +3228,21 @@
icon_state = "hburger"
item_state = "burger"

/obj/item/reagent_container/food/snacks/packaged_hdogs
/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs
name = "Packaged Hotdog"
desc = "A singular squishy, room temperature, hot dog. There's no time given for how long to cook it, so you assume its probably good to go. Packaged by the Weyland-Yutani Corporation."
desc = "A singular squishy, room temperature, hot dog. There's no time given for how long to cook it, but you can try microwaving it anyways. Packaged by the Weyland-Yutani Corporation."
warm_desc = "A singular squishy, steaming, hot dog. The casing seems to have burst, and the bun is dried out."
icon_state = "packaged-hotdog"
bitesize = 2
package = 1

/obj/item/reagent_container/food/snacks/packaged_hdogs/Initialize()
/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs/Initialize()
. = ..()
reagents.add_reagent("bread", 2)
reagents.add_reagent("meatprotein", 1)
reagents.add_reagent("bread", 5)
reagents.add_reagent("meatprotein", 5)
reagents.add_reagent("ketchup", 2)
reagents.add_reagent("sodiumchloride", 2)

/obj/item/reagent_container/food/snacks/packaged_hdogs/attack_self(mob/user)
/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs/attack_self(mob/user)
..()

if(package)
Expand Down
12 changes: 6 additions & 6 deletions code/game/objects/items/storage/boxes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,12 +283,12 @@
w_class = SIZE_MEDIUM

/obj/item/storage/box/donkpockets/fill_preset_inventory()
new /obj/item/reagent_container/food/snacks/donkpocket(src)
new /obj/item/reagent_container/food/snacks/donkpocket(src)
new /obj/item/reagent_container/food/snacks/donkpocket(src)
new /obj/item/reagent_container/food/snacks/donkpocket(src)
new /obj/item/reagent_container/food/snacks/donkpocket(src)
new /obj/item/reagent_container/food/snacks/donkpocket(src)
new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src)
new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src)
new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src)
new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src)
new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src)
new /obj/item/reagent_container/food/snacks/microwavable/donkpocket(src)

/obj/item/storage/box/monkeycubes
name = "monkey cube box"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/crates_lockers/largecrate.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
/obj/item/device/multitool,
/obj/item/tool/crowbar,
/obj/item/device/flashlight,
/obj/item/reagent_container/food/snacks/donkpocket,
/obj/item/reagent_container/food/snacks/microwavable/donkpocket,
/obj/item/explosive/grenade/smokebomb,
/obj/item/circuitboard/airlock,
/obj/item/device/assembly/igniter,
Expand Down
6 changes: 3 additions & 3 deletions code/modules/client/preferences_gear.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -935,15 +935,15 @@ var/global/list/gear_datums_by_name = list()

/datum/gear/snack_packaged/burrito
display_name = "Packaged burrito"
path = /obj/item/reagent_container/food/snacks/packaged_burrito
path = /obj/item/reagent_container/food/snacks/microwavable/packaged_burrito

/datum/gear/snack_packaged/cheeseburger
display_name = "Packaged cheeseburger"
path = /obj/item/reagent_container/food/snacks/packaged_burger
path = /obj/item/reagent_container/food/snacks/microwavable/packaged_burger

/datum/gear/snack_packaged/hotdog
display_name = "Packaged hotdog"
path = /obj/item/reagent_container/food/snacks/packaged_hdogs
path = /obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs

/datum/gear/snack_packaged/chips_pepper
display_name = "W-Y Pepper Chips"
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/head/helmet.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,14 +234,14 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list(
/obj/item/reagent_container/food/drinks/flask = "helmet_flask",
/obj/item/reagent_container/food/drinks/flask/marine = "helmet_flask",
/obj/item/reagent_container/food/snacks/eat_bar = "helmet_snack_eat",
/obj/item/reagent_container/food/snacks/packaged_burrito = "helmet_snack_burrito",
/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = "helmet_snack_burrito",
/obj/item/reagent_container/food/snacks/mushroompizzaslice = "pizza", // Fuck whoever put these under different paths for some REASON
/obj/item/reagent_container/food/snacks/vegetablepizzaslice = "pizza",
/obj/item/reagent_container/food/snacks/meatpizzaslice = "pizza",
/obj/item/reagent_container/food/snacks/packaged_burrito = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/reagent_container/food/snacks/packaged_hdogs = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/reagent_container/food/snacks/microwavable/packaged_burrito = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/reagent_container/food/snacks/microwavable/packaged_hdogs = HELMET_GARB_RELAY_ICON_STATE,
/obj/item/reagent_container/food/snacks/wrapped/chunk = "chunkbox",
/obj/item/reagent_container/food/snacks/donkpocket = "donkpocket",
/obj/item/reagent_container/food/snacks/microwavable/donkpocket = "donkpocket",
/obj/item/reagent_container/food/snacks/wrapped/booniebars = "boonie-bars",
/obj/item/reagent_container/food/snacks/wrapped/barcardine = "barcardine-bars",

Expand Down
Loading
Loading