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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes tatortots and fixes recipe issues #3175

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
13 changes: 0 additions & 13 deletions code/modules/food_and_drinks/food/snacks_other.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,6 @@
. = ..()
AddElement(/datum/element/dunkable, 10)

/obj/item/reagent_containers/food/snacks/tatortot
name = "tator tot"
desc = "A large fried potato nugget that may or may not try to valid you."
icon_state = "tatortot"
list_reagents = list(/datum/reagent/consumable/nutriment = 4)
filling_color = "FFD700"
tastes = list("potato" = 3, "valids" = 1)
foodtype = FRIED | VEGETABLES

/obj/item/reagent_containers/food/snacks/tatortot/Initialize()
. = ..()
AddElement(/datum/element/dunkable, 10)

/obj/item/reagent_containers/food/snacks/soydope
name = "soy dope"
desc = "Dope from a soy."
Expand Down
6 changes: 1 addition & 5 deletions code/modules/food_and_drinks/recipes/processor_recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,13 @@
input = /obj/item/reagent_containers/food/snacks/meat/rawcutlet
output = /obj/item/reagent_containers/food/snacks/meat/rawbacon

/datum/food_processor_process/potatowedges
input = /obj/item/reagent_containers/food/snacks/grown/potato/wedges
output = /obj/item/reagent_containers/food/snacks/fries

/datum/food_processor_process/sweetpotato
input = /obj/item/reagent_containers/food/snacks/grown/potato/sweet
output = /obj/item/reagent_containers/food/snacks/yakiimo

/datum/food_processor_process/potato
input = /obj/item/reagent_containers/food/snacks/grown/potato
output = /obj/item/reagent_containers/food/snacks/tatortot
output = /obj/item/reagent_containers/food/snacks/fries

/datum/food_processor_process/carrot
input = /obj/item/reagent_containers/food/snacks/grown/carrot
Expand Down
19 changes: 0 additions & 19 deletions code/modules/hydroponics/grown/potato.dm
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,6 @@
juice_results = list(/datum/reagent/consumable/potato_juice = 0)
distill_reagent = /datum/reagent/consumable/ethanol/vodka

/obj/item/reagent_containers/food/snacks/grown/potato/wedges
name = "potato wedges"
desc = "Slices of neatly cut potato."
icon_state = "potato_wedges"
filling_color = "#E9967A"
bitesize = 100


/obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params)
if(W.get_sharpness())
to_chat(user, "<span class='notice'>You cut the potato into wedges with [W].</span>")
var/obj/item/reagent_containers/food/snacks/grown/potato/wedges/Wedges = new /obj/item/reagent_containers/food/snacks/grown/potato/wedges
remove_item_from_storage(user)
qdel(src)
user.put_in_hands(Wedges)
else
return ..()


// Sweet Potato
/obj/item/seeds/potato/sweet
name = "pack of sweet potato seeds"
Expand Down
Loading