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

The Corndog Update. Adds corndogs! And a bit more! [Bounty Request] (Complete) #713

Merged
merged 16 commits into from
Dec 20, 2023
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 code/modules/vending/drinnerware.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
/obj/item/kitchen/rollingpin = 2,
/obj/item/kitchen/tongs = 2,
/obj/item/knife/kitchen = 2,
/obj/item/storage/fancy/popsiclestick_pack = 2 //Monkestation edit: part of "The Corndog Update" - Not adding too many popsicle stick packs so le botany gets 'interaction'
),
),
list(
Expand Down
118 changes: 118 additions & 0 deletions monkestation/code/game/objects/items/food/corndog.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
//Sprites done by Camriod_Core - Bounty Requested by Camriod_Core, financed by Iamcooldan for 2000 monkecoins

//Basically vanilla+ stuff, doesn't experiment with cooked sausage since people may want to do stuff with that/ mildly out of scope - The beginning of the corndog crafting tree
/obj/item/food/raw_sausage_stick //Does't inherit raw_sausage to avoid weird behavior with attackby()
name = "raw sausage on a stick"
desc = "Simply put, a sausage on a stick."
trash_type = /obj/item/popsicle_stick
icon = 'monkestation/icons/obj/food/corndog.dmi'
icon_state = "rawsausage_stick"
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 5,
/datum/reagent/consumable/nutriment/vitamin = 2,
)
tastes = list("meat" = 1)
foodtypes = MEAT | RAW
eatverbs = list("bite", "chew", "nibble", "deep throat", "gobble", "chomp")
w_class = WEIGHT_CLASS_SMALL

/obj/item/food/raw_sausage_stick/rod
name = "raw sausage on a rod"
desc = "Simply put, a sausage on a rod."
trash_type = /obj/item/stack/rods
icon_state = "rawsausage_rod"

/obj/item/food/raw_sausage/attackby(obj/item/used_item, mob/living/user, params)
if(istype(used_item, /obj/item/popsicle_stick))
qdel(used_item)
qdel(src)
var/sausagestick = new /obj/item/food/raw_sausage_stick
user.put_in_hands(sausagestick)
if(istype(used_item, /obj/item/stack/rods))
used_item.use(1)
qdel(src)
var/sausagestick = new /obj/item/food/raw_sausage_stick/rod
user.put_in_hands(sausagestick)

//Where the real corndogging begins, CHOOSE YOUR CLASS
/obj/item/food/raw_corndog
trash_type = /obj/item/popsicle_stick
name = "raw corndog"
desc = "A battered hot dog brimming with potential."
icon = 'monkestation/icons/obj/food/corndog.dmi'
icon_state = "corndog_raw_stick"
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 4,
/datum/reagent/consumable/nutriment/vitamin = 2,
/datum/reagent/consumable/cornmeal_batter = 1
)
tastes = list("raw meat" = 1, "raw batter" = 1, "hastiness" = 1)
foodtypes = MEAT | RAW | GRAIN
food_flags = FOOD_FINGER_FOOD
eatverbs = list("bite", "chew", "nibble", "gobble", "chomp")
w_class = WEIGHT_CLASS_SMALL
burns_on_grill = TRUE
venue_value = FOOD_PRICE_WORTHLESS

/obj/item/food/raw_corndog/rod
trash_type = /obj/item/stack/rods
icon_state = "corndog_raw_rod"

//Self explanatory, makes them bakeable. Sadly fryer crafting isn't a thing (atleast to my knowledge)
/obj/item/food/raw_corndog/make_bakeable()
AddComponent(/datum/component/bakeable, /obj/item/food/corndog, rand(10 SECONDS, 20 SECONDS), TRUE, TRUE)

/obj/item/food/raw_corndog/rod/make_bakeable()
AddComponent(/datum/component/bakeable, /obj/item/food/corndog/rod, rand(10 SECONDS, 20 SECONDS), TRUE, TRUE)

//The corndawgs themselves
/obj/item/food/corndog
trash_type = /obj/item/popsicle_stick
name = "corndog"
desc = "The best thing to come out of 1900s America."
icon = 'monkestation/icons/obj/food/corndog.dmi'
icon_state = "corndog_stick"
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 8,
/datum/reagent/consumable/nutriment/vitamin = 4,
)
tastes = list("American freedom" = 1, "meat" = 1, "carnival food" = 1)
foodtypes = MEAT | GRAIN
food_flags = FOOD_FINGER_FOOD
eatverbs = list("bite", "chew", "nibble", "gobble", "chomp")
w_class = WEIGHT_CLASS_SMALL
burns_on_grill = TRUE
venue_value = FOOD_PRICE_NORMAL

/obj/item/food/corndog/rod
trash_type = /obj/item/stack/rods
icon_state = "corndog_rod"

/obj/item/food/corndog/fullcondiment //End of the corndog crafting tree, no name change so frying it doesn't give a weird name
icon_state = "corndog_stick_km"
desc = "The best thing to come out of 1900s America paired with the best thing to come out of 1800s America, paired with, hey- Just how old is mustard?"
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 10,
/datum/reagent/consumable/nutriment/vitamin = 5,
/datum/reagent/consumable/ketchup = 5
)
tastes = list("American superiority" = 1, "carnival food" = 1, "mustard" = 1)

/obj/item/food/corndog/fullcondiment/rod
trash_type = /obj/item/stack/rods
icon_state = "corndog_rod_km"

//Forbidden corndog corner
/obj/item/food/corndog/NarDog
name = "Nar’Dog"
icon_state = "demondog"
food_reagents = list(
/datum/reagent/consumable/nutriment/protein = 15,
/datum/reagent/consumable/nutriment/vitamin = 10,
/datum/reagent/consumable/ethanol/narsour = 10,
/datum/reagent/brimdust = 4
)
desc = "A demonic corndog of occult origin, <font color=#ae0000>it glows with an unholy power...</font>"
tastes = list("brimstone" = 1, "the souls of the damned" = 1)
foodtypes = MEAT | GRAIN | ALCOHOL
venue_value = FOOD_PRICE_EXOTIC
2 changes: 1 addition & 1 deletion monkestation/code/game/objects/items/food/spaghetti.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/food/spaghetti/security
name = "Robust pasta"
desc = "Only the truly robust can eat this safelly"
desc = "Only the truly robust can eat this safely."
icon_state = "spesslaw"
bite_consumption = 5
food_reagents = list(
Expand Down
19 changes: 19 additions & 0 deletions monkestation/code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,22 @@
/obj/item/storage/box/disks_nanite/PopulateContents()
for(var/i in 1 to 7)
new /obj/item/disk/nanite_program(src)

/obj/item/storage/fancy/popsiclestick_pack
name = "popsicle stick pack"
desc = "A pack of ethically-sourced popsicle sticks, great for medical examinations or iced treats! Comes in a modest pack of 6, for wood is quite a scarcity on space stations."
icon = 'monkestation/icons/obj/popsiclestick_pack.dmi'
icon_state = "popsiclepack6"
base_icon_state = "popsiclepack"
inhand_icon_state = null
worn_icon_state = null
spawn_type = /obj/item/popsicle_stick
slot_flags = ITEM_SLOT_POCKETS
spawn_count = 6
open_status = FANCY_CONTAINER_ALWAYS_OPEN
contents_tag = "popsicle stick"
custom_price = PAYCHECK_COMMAND //Makes price 100, 20 for the chef - Only the most premium popsicle sticks

/obj/item/storage/fancy/popsiclestick_pack/Initialize(mapload)
. = ..()
atom_storage.set_holdable(list(/obj/item/popsicle_stick))
46 changes: 46 additions & 0 deletions monkestation/code/modules/food_and_drinks/recipes/recipes_meat.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/datum/crafting_recipe/food/raw_corndog
name = "raw corndog on a stick"
reqs = list(
/obj/item/food/raw_sausage_stick = 1,
/datum/reagent/consumable/cornmeal_batter = 10,
)
result = /obj/item/food/raw_corndog
category = CAT_MEAT

/datum/crafting_recipe/food/raw_corndog_rod
name = "raw corndog on a rod"
reqs = list(
/obj/item/food/raw_sausage_stick/rod = 1,
/datum/reagent/consumable/cornmeal_batter = 10,
)
result = /obj/item/food/raw_corndog/rod
category = CAT_MEAT

/datum/crafting_recipe/food/fullcondiment
name = "corndog with toppings"
reqs = list(
/obj/item/food/corndog = 1,
/datum/reagent/consumable/ketchup = 5,
)
result = /obj/item/food/corndog/fullcondiment
category = CAT_MEAT

/datum/crafting_recipe/food/fullcondiment/rod
name = "corndog with toppings... on a rod!"
reqs = list(
/obj/item/food/corndog/rod = 1,
/datum/reagent/consumable/ketchup = 5,
)
result = /obj/item/food/corndog/fullcondiment/rod
category = CAT_MEAT

/datum/crafting_recipe/food/NarDog
name = "Nar'Dog"
desc = "A demonic corndog of occult origin, it glows with an unholy power..." //overwrites default description to avoid metadata being displayed in the craft menu
reqs = list(
/obj/item/food/corndog = 1, //YOU'RE GOING TO USE THE POPSICLE STICK AND YOU'RE GOING TO LIKE IT!!!
/datum/reagent/consumable/ethanol/narsour = 20,
/datum/reagent/brimdust = 15
)
result = /obj/item/food/corndog/NarDog
category = CAT_MEAT
Binary file added monkestation/icons/obj/food/corndog.dmi
Binary file not shown.
Binary file added monkestation/icons/obj/popsiclestick_pack.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -5683,6 +5683,7 @@
#include "monkestation\code\game\objects\items\effects\honk_platinum.dm"
#include "monkestation\code\game\objects\items\effects\nugget.dm"
#include "monkestation\code\game\objects\items\effects\washing_machine.dm"
#include "monkestation\code\game\objects\items\food\corndog.dm"
#include "monkestation\code\game\objects\items\food\spaghetti.dm"
#include "monkestation\code\game\objects\items\grenades\monkey_barrel.dm"
#include "monkestation\code\game\objects\items\guns\crank_guns.dm"
Expand Down Expand Up @@ -6082,6 +6083,7 @@
#include "monkestation\code\modules\donator\code\mob\pets.dm"
#include "monkestation\code\modules\events\wizard\summon_gifts.dm"
#include "monkestation\code\modules\food_and_drinks\recipes\boiling.dm"
#include "monkestation\code\modules\food_and_drinks\recipes\recipes_meat.dm"
#include "monkestation\code\modules\ghost_players\area_changes.dm"
#include "monkestation\code\modules\ghost_players\centcom_teleporter.dm"
#include "monkestation\code\modules\ghost_players\ghost_player.dm"
Expand Down
Loading