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.

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

MOTHAFUCKIN PAINCAKES YEAH #37299

Merged
merged 9 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions __DEFINES/reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@
#define GEOMETER "geometer"
#define EGG_YOLK "egg_yolk"
#define PANCAKE "pancake"
#define PAINCAKE "paincake"
#define SPAGHETTI "spaghetti"
#define MUSTARD_POWDER "mustard_powder"
#define MAYO "mayo"
Expand Down
4 changes: 4 additions & 0 deletions code/modules/food/recipes_microwave.dm
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,10 @@
reagents = list(PANCAKE = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/pancake

/datum/recipe/paincake
reagents = list(PAINCAKE = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/pancake/pain

/datum/recipe/sugarcookie
reagents = list(FLOUR = 5, SUGARS = 5)
items = list(/obj/item/weapon/reagent_containers/food/snacks/egg)
Expand Down
7 changes: 7 additions & 0 deletions code/modules/reagents/Chemistry-Recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2536,6 +2536,13 @@
required_reagents = list(FLOUR = 10, MILK = 30, LIQUIDBUTTER = 2, EGG_YOLK = 8, SODIUMCHLORIDE = 1, SUGARS = 5)
result_amount = 56 // 1:1

/datum/chemical_reaction/paincake_mix
name = "Paincake Mix"
id = PAINCAKE
result = PAINCAKE
required_reagents = list(NOVAFLOUR = 10, MILK = 30, LIQUIDBUTTER = 2, EGG_YOLK = 8, SODIUMCHLORIDE = 1, SUGARS = 5) //Not sure if I should replace the egg with pacid, so it's just a flour difference.
result_amount = 56 // 1:1

//Jesus christ how horrible
/datum/chemical_reaction/cream
name = "Cream"
Expand Down
16 changes: 14 additions & 2 deletions code/modules/reagents/reagent_containers/food/snacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2604,9 +2604,9 @@
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/pancake))
var/obj/item/weapon/reagent_containers/food/snacks/pancake/I = O
if (pancakes + I.pancakes > max_pancakes)
to_chat(user, "<span class='warning'>sorry, can't go any higher!</span>")
to_chat(user, "<span class='warning'>It can't go any higher!</span>")
return
to_chat(user, "<span class='notice'>...and another one!</span>")
to_chat(user, "<span class='notice'>...And another one!</span>")
var/amount = I.reagents.total_volume
I.reagents.trans_to(src, amount)
var/image/img = image(I.icon, src, I.icon_state)
Expand All @@ -2622,6 +2622,18 @@
else
..()

/obj/item/weapon/reagent_containers/food/snacks/pancake/pain
name = "paincake"
desc = "How tough am I? I ate a bowl of nails for breakfast! Without any milk..."
icon_state = "paincake"
food_flags = FOOD_ANIMAL

/obj/item/weapon/reagent_containers/food/snacks/pancake/pain/New()
..()
reagents.add_reagent(NUTRIMENT, 5)
reagents.add_reagent(PAINCAKE, 5)
bitesize = 2

/obj/item/weapon/reagent_containers/food/snacks/spaghetti
name = "Spaghetti"
desc = "Now thats a nice pasta!"
Expand Down
25 changes: 25 additions & 0 deletions code/modules/reagents/reagents/reagents_food.dm
Original file line number Diff line number Diff line change
Expand Up @@ -746,6 +746,31 @@
var/obj/effect/decal/cleanable/flour/F = new (T)
F.color = "#E6C968"

/datum/reagent/paincake_mix
name = "Paincake Mix"
id = PAINCAKE
description = "Legends say that this PAINFULLY DELICIOUS pancake recipe was created by Nacho Man Candy Savage himself."
reagent_state = REAGENT_STATE_LIQUID
nutriment_factor = 15 * REAGENTS_METABOLISM
color = "#B22222" //dark red

/datum/reagent/paincake_mix/on_mob_life(var/mob/living/M)
if(..())
return 1
M.bodytemperature += 5 * TEMPERATURE_DAMAGE_COEFFICIENT
var/mob/living/carbon/human/H = M
if(prob(20) && ishuman(M))
H.custom_pain("Your stomach hurts a lot.",1)
H.adjustFireLoss(3)

/datum/reagent/paincake_mix/reaction_turf(var/turf/simulated/T, var/volume)
if(..())
return 1

if(!(locate(/obj/effect/decal/cleanable/flour) in T))
var/obj/effect/decal/cleanable/flour/F = new (T)
F.color = "#B22222" //dark red

/datum/reagent/polypgelatin
name = "Polyp Gelatin"
id = POLYPGELATIN
Expand Down
Binary file modified icons/obj/food.dmi
Binary file not shown.
Loading