Skip to content

Commit

Permalink
changes everythign basiclayy
Browse files Browse the repository at this point in the history
went from microwaving being a subtype of a packed item it uses the donk pocket code
  • Loading branch information
Meatstuff882 committed Aug 18, 2024
1 parent 0d5c881 commit 2f93757
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 42 deletions.
69 changes: 63 additions & 6 deletions code/datums/recipe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -654,23 +654,80 @@

//other

/datum/recipe/packaged_burrito/microwaved
/datum/recipe/packaged_burrito/proc/warm_up(obj/item/reagent_container/food/snacks/packaged_burrito/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 = "A hard microwaved burrito. Molten on the outside, barely cooked on the inside."

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

/datum/recipe/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/packaged_burrito,
)
result = /obj/item/reagent_container/food/snacks/packaged_burrito/microwaved
result = /obj/item/reagent_container/food/snacks/packaged_burrito //SPECIAL

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

/datum/recipe/packaged_burger/proc/warm_up(obj/item/reagent_container/food/snacks/packaged_burger/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 = "A soggy microwaved burger. It's not any less soggy then it was before, it's just hot now."

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

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

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

/datum/recipe/packaged_hdogs/proc/warm_up(obj/item/reagent_container/food/snacks/packaged_hdogs/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 = "A singular squishy, steaming, hot dog. The casing seems to have burst, and the bun is dried out."

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

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

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

/datum/recipe/hotdog
items = list(
Expand Down
39 changes: 3 additions & 36 deletions code/game/objects/items/reagent_containers/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3150,6 +3150,7 @@
icon_state = "packaged-burrito"
bitesize = 2
package = 1
var/warm = 0

/obj/item/reagent_container/food/snacks/packaged_burrito/Initialize()
. = ..()
Expand All @@ -3165,24 +3166,13 @@
package = 0
icon_state = "open-burrito"

/obj/item/reagent_container/food/snacks/packaged_burrito/microwaved
name = "Microwaved Burrito"
desc = "A hard microwaved burrito. Molten on the outside, barely cooked on the inside."
icon_state = "open-burrito"
bitesize = 2
package = 0

/obj/item/reagent_container/food/snacks/packaged_burrito/microwaved/Initialize()
. = ..()
reagents.add_reagent("bread", 1)
reagents.add_reagent("meatprotein", 1)

/obj/item/reagent_container/food/snacks/packaged_burger
name = "Packaged Cheeseburger"
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."
icon_state = "burger"
bitesize = 3
package = 1
var/warm = 0

/obj/item/reagent_container/food/snacks/packaged_burger/Initialize()
. = ..()
Expand All @@ -3202,24 +3192,13 @@
icon_state = "hburger"
item_state = "burger"

/obj/item/reagent_container/food/snacks/packaged_burger/microwaved
name = "Microwaved Cheeseburger"
desc = "A soggy microwaved burger. It's not any less soggy then it was before, it's just hot now."
icon_state = "hburger"
bitesize = 3
package = 0

/obj/item/reagent_container/food/snacks/packaged_burger/microwaved/Initialize()
. = ..()
reagents.add_reagent("bread", 1)
reagents.add_reagent("meatprotein", 1)

/obj/item/reagent_container/food/snacks/packaged_hdogs
name = "Packaged Hotdog"
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."
icon_state = "packaged-hotdog"
bitesize = 2
package = 1
var/warm = 0

/obj/item/reagent_container/food/snacks/packaged_hdogs/Initialize()
. = ..()
Expand All @@ -3236,18 +3215,6 @@
package = 0
icon_state = "open-hotdog"

/obj/item/reagent_container/food/snacks/packaged_hdogs/microwaved
name = "Microwaved Hotdog"
desc = "A singular squishy, steaming, hot dog. The casing seems to have burst, and the bun is dried out."
icon_state = "open-hotdog"
bitesize = 2
package = 0

/obj/item/reagent_container/food/snacks/mpackaged_hdogs/microwaved/Initialize()
. = ..()
reagents.add_reagent("bread", 1)
reagents.add_reagent("meatprotein", 1)

/obj/item/reagent_container/food/snacks/upp
name = "\improper UPP ration"
desc = "A sealed, freeze-dried, compressed package containing a single item of food. Commonplace in the UPP military, especially those units stationed on far-flung colonies. This one is stamped for consumption by the UPP's 'Smoldering Sons' battalion and was packaged in 2179."
Expand Down

0 comments on commit 2f93757

Please sign in to comment.