From b68565280e569a78f8aa99ee60406f0b7c08b146 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:02:22 -0400 Subject: [PATCH 01/13] Update snacks_other.dm --- .../food_and_drinks/food/snacks_other.dm | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 5213cc96e1..c1abec86c1 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -340,36 +340,6 @@ tastes = list("melon" = 1) foodtype = FRUIT -/obj/item/reagent_containers/food/snacks/spacefreezy - name = "space freezy" - desc = "The best icecream in space." - icon_state = "spacefreezy" - bonus_reagents = list("nutriment" = 2, "vitamin" = 2) - list_reagents = list("nutriment" = 6, "bluecherryjelly" = 5, "vitamin" = 4) - filling_color = "#87CEFA" - tastes = list("blue cherries" = 2, "ice cream" = 2) - foodtype = FRUIT | DAIRY - -/obj/item/reagent_containers/food/snacks/sundae - name = "sundae" - desc = "A classic dessert." - icon_state = "sundae" - bonus_reagents = list("nutriment" = 2, "vitamin" = 1) - list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) - filling_color = "#FFFACD" - tastes = list("ice cream" = 1, "banana" = 1) - foodtype = FRUIT | DAIRY | SUGAR - -/obj/item/reagent_containers/food/snacks/honkdae - name = "honkdae" - desc = "The clown's favorite dessert." - icon_state = "honkdae" - bonus_reagents = list("nutriment" = 2, "vitamin" = 2) - list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4) - filling_color = "#FFFACD" - tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) - foodtype = FRUIT | DAIRY | SUGAR - /obj/item/reagent_containers/food/snacks/nachos name = "nachos" desc = "Chips from Space Mexico." From e922a0cb183d7ee6f53050a32a43279c0f6049d2 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:04:40 -0400 Subject: [PATCH 02/13] Update recipes_sandwich.dm --- .../recipes/tablecraft/recipes_sandwich.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm index a2e83a09b4..0f1c40da3f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_sandwich.dm @@ -43,16 +43,6 @@ result = /obj/item/reagent_containers/food/snacks/jellysandwich/cherry subcategory = CAT_SANDWICH -/datum/crafting_recipe/food/icecreamsandwich - name = "Icecream sandwich" - reqs = list( - /datum/reagent/consumable/cream = 5, - /datum/reagent/consumable/ice = 5, - /obj/item/reagent_containers/food/snacks/icecream = 1 - ) - result = /obj/item/reagent_containers/food/snacks/icecreamsandwich - subcategory = CAT_SANDWICH - /datum/crafting_recipe/food/notasandwich name = "Not a sandwich" reqs = list( From 9b2991d0f2851cf3c56d1b910c47967d4b1b208f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:05:22 -0400 Subject: [PATCH 03/13] Update recipes_misc.dm --- .../recipes/tablecraft/recipes_misc.dm | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm index 3dd27ddd01..0c4e2c2e30 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm @@ -186,39 +186,6 @@ result = /obj/item/reagent_containers/food/snacks/melonfruitbowl subcategory = CAT_MISCFOOD -/datum/crafting_recipe/food/spacefreezy - name ="Space freezy" - reqs = list( - /datum/reagent/consumable/bluecherryjelly = 5, - /datum/reagent/consumable/spacemountainwind = 15, - /obj/item/reagent_containers/food/snacks/icecream = 1 - ) - result = /obj/item/reagent_containers/food/snacks/spacefreezy - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/sundae - name ="Sundae" - reqs = list( - /datum/reagent/consumable/cream = 5, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1, - /obj/item/reagent_containers/food/snacks/grown/banana = 1, - /obj/item/reagent_containers/food/snacks/icecream = 1 - ) - result = /obj/item/reagent_containers/food/snacks/sundae - subcategory = CAT_MISCFOOD - -/datum/crafting_recipe/food/honkdae - name ="Honkdae" - reqs = list( - /datum/reagent/consumable/cream = 5, - /obj/item/clothing/mask/gas/clown_hat = 1, - /obj/item/reagent_containers/food/snacks/grown/cherries = 1, - /obj/item/reagent_containers/food/snacks/grown/banana = 2, - /obj/item/reagent_containers/food/snacks/icecream = 1 - ) - result = /obj/item/reagent_containers/food/snacks/honkdae - subcategory = CAT_MISCFOOD - /datum/crafting_recipe/food/nachos name ="Nachos" reqs = list( From b7a759017df71f046dc7d66fefd8b3a23fb9c1b2 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:05:56 -0400 Subject: [PATCH 04/13] Add files via upload --- .../recipes/tablecraft/recipes_frozen.dm | 200 ++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm new file mode 100644 index 0000000000..5108f6b2ed --- /dev/null +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -0,0 +1,200 @@ +//////////////////////////SNOW CONES/////////////////////// + +/datum/crafting_recipe/food/flaverless_sc + name = "Flaverless snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones + subcategory = CAT_ICE + +/datum/crafting_recipe/food/pineapple_sc + name = "Pineapple snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /obj/item/reagent_containers/food/snacks/pineappleslice = 2 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/pineapple + subcategory = CAT_ICE + +/datum/crafting_recipe/food/lime_sc + name = "Lime snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/limejuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/lime + subcategory = CAT_ICE + +/datum/crafting_recipe/food/lemon_sc + name = "Lemon snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/lemonjuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/lemon + subcategory = CAT_ICE + +/datum/crafting_recipe/food/apple_sc + name = "Apple snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/applejuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/apple + subcategory = CAT_ICE + +/datum/crafting_recipe/food/grape_sc + name = "Grape snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/berryjuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/grape + subcategory = CAT_ICE + +/datum/crafting_recipe/food/orange_sc + name = "Orange snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/orangejuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/orange + subcategory = CAT_ICE + +/datum/crafting_recipe/food/blue_sc + name = "Bluecherry snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/bluecherryjelly= 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/blue + subcategory = CAT_ICE + +/datum/crafting_recipe/food/red_sc + name = "Cherry snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/cherryjelly= 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/red + subcategory = CAT_ICE + +/datum/crafting_recipe/food/mix_sc + name = "Mixed berrie snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/berryjuice = 15 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/mix + subcategory = CAT_ICE + +/datum/crafting_recipe/food/fruitsalad_sc + name = "Fruit Salad snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/orangejuice = 5, + /datum/reagent/consumable/limejuice = 5, + /datum/reagent/consumable/lemonjuice = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/fruitsalad + subcategory = CAT_ICE + +/datum/crafting_recipe/food/mime_sc + name = "Mime snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/nothing = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/mime + subcategory = CAT_ICE + +/datum/crafting_recipe/food/clown_sc + name = "Clown snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/clownstears = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/clown + subcategory = CAT_ICE + +/datum/crafting_recipe/food/soda_sc + name = "Soda water snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/sodawater = 15 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/soda + subcategory = CAT_ICE + +/datum/crafting_recipe/food/pwgrmer_sc + name = "Pwergamer snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/pwr_game = 15 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/pwgrmer + subcategory = CAT_ICE + +/datum/crafting_recipe/food/kiwi_sc + name = "Soda water snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /obj/item/reagent_containers/food/snacks/egg/kiwiEgg = 1 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/kiwi + subcategory = CAT_ICE + +/datum/crafting_recipe/food/honey_sc + name = "Honey snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/consumable/honey = 5 + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/honey + subcategory = CAT_ICE + +/datum/crafting_recipe/food/honey_sc + name = "Rainbow snowcone" + reqs = list( + /obj/item/reagent_containers/food/drinks/sillycup = 1 + /datum/reagent/water = 5, + /datum/reagent/consumable/ice = 15, + /datum/reagent/colorful_reagent = 1 //Hard to make + ) + result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow + subcategory = CAT_ICE \ No newline at end of file From 7f8886f6e95823a91323c7c13542e95a7663504b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:06:37 -0400 Subject: [PATCH 05/13] Update construction.dm --- code/__DEFINES/construction.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index 9f3d38efa1..aa9c5cf34e 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -103,6 +103,7 @@ #define CAT_SOUP "Soups" #define CAT_SPAGHETTI "Spaghettis" #define CAT_SUSHI "Fish" +#define CAT_ICE "Frozen" #define RCD_FLOORWALL 1 #define RCD_AIRLOCK 2 From 762c5093157d9651db6bbe051e67ef499234fd49 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:07:25 -0400 Subject: [PATCH 06/13] Update craft.dm --- code/modules/crafting/craft.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/crafting/craft.dm b/code/modules/crafting/craft.dm index 29ddb8e800..ba2a27af77 100644 --- a/code/modules/crafting/craft.dm +++ b/code/modules/crafting/craft.dm @@ -21,6 +21,8 @@ CAT_BURGER, CAT_CAKE, CAT_EGG, + CAT_SUSHI, //Called Fish + CAT_ICE, //Called Frozen CAT_MEAT, CAT_MISCFOOD, CAT_PASTRY, @@ -28,7 +30,6 @@ CAT_PIZZA, CAT_SALAD, CAT_SANDWICH, - CAT_SUSHI, CAT_SOUP, CAT_SPAGHETTI), CAT_CLOTHING) //Clothing subcategories From e5b538af71a2669dba1bd388913038092d0056ac Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:09:21 -0400 Subject: [PATCH 07/13] Update recipes_frozen.dm --- .../recipes/tablecraft/recipes_frozen.dm | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index 5108f6b2ed..f520377a4f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -1,3 +1,47 @@ + +/datum/crafting_recipe/food/icecreamsandwich + name = "Icecream sandwich" + reqs = list( + /datum/reagent/consumable/cream = 5, + /datum/reagent/consumable/ice = 5, + /obj/item/reagent_containers/food/snacks/icecream = 1 + ) + result = /obj/item/reagent_containers/food/snacks/icecreamsandwich + subcategory = CAT_ICE + +/datum/crafting_recipe/food/spacefreezy + name ="Space freezy" + reqs = list( + /datum/reagent/consumable/bluecherryjelly = 5, + /datum/reagent/consumable/spacemountainwind = 15, + /obj/item/reagent_containers/food/snacks/icecream = 1 + ) + result = /obj/item/reagent_containers/food/snacks/spacefreezy + subcategory = CAT_ICE + +/datum/crafting_recipe/food/sundae + name ="Sundae" + reqs = list( + /datum/reagent/consumable/cream = 5, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 1, + /obj/item/reagent_containers/food/snacks/icecream = 1 + ) + result = /obj/item/reagent_containers/food/snacks/sundae + subcategory = CAT_ICE + +/datum/crafting_recipe/food/honkdae + name ="Honkdae" + reqs = list( + /datum/reagent/consumable/cream = 5, + /obj/item/clothing/mask/gas/clown_hat = 1, + /obj/item/reagent_containers/food/snacks/grown/cherries = 1, + /obj/item/reagent_containers/food/snacks/grown/banana = 2, + /obj/item/reagent_containers/food/snacks/icecream = 1 + ) + result = /obj/item/reagent_containers/food/snacks/honkdae + subcategory = CAT_ICE + //////////////////////////SNOW CONES/////////////////////// /datum/crafting_recipe/food/flaverless_sc @@ -197,4 +241,4 @@ /datum/reagent/colorful_reagent = 1 //Hard to make ) result = /obj/item/reagent_containers/food/snacks/snowcones/rainbow - subcategory = CAT_ICE \ No newline at end of file + subcategory = CAT_ICE From a9ded7a3eb1ea54ab0a600cec069b314c8528388 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:10:07 -0400 Subject: [PATCH 08/13] Add files via upload --- .../food_and_drinks/food/snacks_frozen.dm | 187 ++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 code/modules/food_and_drinks/food/snacks_frozen.dm diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm new file mode 100644 index 0000000000..e7f0509b92 --- /dev/null +++ b/code/modules/food_and_drinks/food/snacks_frozen.dm @@ -0,0 +1,187 @@ +/obj/item/reagent_containers/food/snacks/icecreamsandwich + name = "icecream sandwich" + desc = "Portable Ice-cream in its own packaging." + icon = 'icons/obj/food/food.dmi' + icon_state = "icecreamsandwich" + bonus_reagents = list("nutriment" = 1, "ice" = 2) + list_reagents = list("nutriment" = 2, "ice" = 2) + tastes = list("ice cream" = 1) + foodtype = GRAIN | DAIRY + +/obj/item/reagent_containers/food/snacks/sundae + name = "sundae" + desc = "A classic dessert." + icon_state = "sundae" + bonus_reagents = list("nutriment" = 2, "vitamin" = 1) + list_reagents = list("nutriment" = 6, "banana" = 5, "vitamin" = 2) + filling_color = "#FFFACD" + tastes = list("ice cream" = 1, "banana" = 1) + foodtype = FRUIT | DAIRY | SUGAR + +/obj/item/reagent_containers/food/snacks/honkdae + name = "honkdae" + desc = "The clown's favorite dessert." + icon_state = "honkdae" + bonus_reagents = list("nutriment" = 2, "vitamin" = 2) + list_reagents = list("nutriment" = 6, "banana" = 10, "vitamin" = 4) + filling_color = "#FFFACD" + tastes = list("ice cream" = 1, "banana" = 1, "a bad joke" = 1) + foodtype = FRUIT | DAIRY | SUGAR + +/obj/item/reagent_containers/food/snacks/spacefreezy + name = "space freezy" + desc = "The best icecream in space." + icon_state = "spacefreezy" + bonus_reagents = list("nutriment" = 2, "vitamin" = 2) + list_reagents = list("nutriment" = 6, "bluecherryjelly" = 5, "vitamin" = 4) + filling_color = "#87CEFA" + tastes = list("blue cherries" = 2, "ice cream" = 2) + foodtype = FRUIT | DAIRY + +///////////// +//SNOWCONES// +///////////// + +/obj/item/reagent_containers/food/snacks/snowcones //We use this as a base for all other snowcones + name = "flaverless snowcone" + desc = "Its just harden water slivers. Still fun to chew on." + icon = 'icons/obj/food/snowcones.dmi' + icon_state = "flaverless_sc" + trash = /obj/item/reagent_containers/food/drinks/sillycup //We dont eat paper cups + bonus_reagents = list("water" = 10) //Base line will allways give water + list_reagents = list("water" = 1) // We dont get food for water/juices + filling_color = "#FFFFFF" //Ice is white + tastes = list("ice" = 1, "water" = 1) + foodtype = SUGAR //We use SUGAR as a base line to act in as junkfood, other wise we use fruit + +/obj/item/reagent_containers/food/snacks/snowcones/lime + name = "lime flavored snowcone" + desc = "A pineapple flavord snowball in a paper cup." + icon_state = "lime_sc" + list_reagents = list("nutriment" = 1, "limejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "limes" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/lemon + name = "lemon flavored snowcone" + desc = "A pineapple flavord snowball in a paper cup." + icon_state = "lemon_sc" + list_reagents = list("nutriment" = 1, "lemonjuice" = 5) + tastes = list("ice" = 1, "water" = 1, "lemons" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/apple + name = "apple flavored snowcone" + desc = "A pineapple flavord snowball in a paper cup." + icon_state = "blue_sc" + list_reagents = list("nutriment" = 1, "applejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "apples" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/grape + name = "grape flavored snowcone" + desc = "A grape flavord snowball in a paper cup." + icon_state = "grape_sc" + list_reagents = list("nutriment" = 1, "berryjuice" = 5) + tastes = list("ice" = 1, "water" = 1, "grape" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/orange + name = "orange flavored snowcone" + desc = "A mix of different flavors dizzled on a snowball in a paper cup." + icon_state = "orange_sc" + list_reagents = list("nutriment" = 1, "orangejuice" = 10) + tastes = list("ice" = 1, "water" = 1, "berries" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/blue + name = "bluecherry flavored snowcone" + desc = "A bluecharry flavord snowball in a paper cup, how rare!" + icon_state = "red_sc" + list_reagents = list("nutriment" = 1, "bluecherryjelly" = 5) + tastes = list("ice" = 1, "water" = 1, "blue" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/red + name = "cherry flavored snowcone" + desc = "A cherry flavord snowball in a paper cup." + icon_state = "blue_sc" + list_reagents = list("nutriment" = 1, "cherryjelly" = 5) + tastes = list("ice" = 1, "water" = 1, "red" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/kiwi + name = "kiwi flavored snowcone" + desc = "A kiwi flavord snowball in a paper cup." + icon_state = "kiwi_sc" + list_reagents = list("nutriment" = 3, "vitamin" = 6) + tastes = list("ice" = 1, "space" = 3, "kiwi" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/mix + name = "mixed berry flavored snowcone" + desc = "A mix of different flavors dizzled on a snowball in a paper cup." + icon_state = "berry_sc" + list_reagents = list("nutriment" = 1, "berryjuice" = 10) + tastes = list("ice" = 1, "water" = 1, "berries" = 5) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/fruitsalad + name = "mixed fruit flavored snowcone" + desc = "A mix of different flavors dizzled on a snowball in a paper cup." + icon_state = "fruitsalad_sc" + list_reagents = list("nutriment" = 1, "lemonjuice" = 5, "limejuice" = 5, "lemonjuice" = 5, "orangejuice" = 5) + tastes = list("ice" = 1, "water" = 1, "fruits" = 25) + foodtype = FRUIT + +/obj/item/reagent_containers/food/snacks/snowcones/pineapple + name = "pineapple flavored snowcone" + desc = "A pineapple flavord snowball in a paper cup." + icon_state = "pineapple_sc" + list_reagents = list("nutriment" = 1, "water" = 1) + tastes = list("ice" = 1, "water" = 1, "pineapples" = 5) + foodtype = PINEAPPLE //Pineapple to allow all that like pineapple to enjoy + +/obj/item/reagent_containers/food/snacks/snowcones/mime + name = "mime snowcone" + desc = "..." + icon_state = "mime_sc" + list_reagents = list("nutriment" = 1, "nothing" = 5) + tastes = list("nothing" = 5) + +/obj/item/reagent_containers/food/snacks/snowcones/clown + name = "joke flavored snowcone" + desc = "A waterd down jokeful flavord snowball in a paper cup." + icon_state = "clown_sc" + list_reagents = list("nutriment" = 1, "laughter" = 5) + tastes = list("jokes" = 5, "brainfreeze" = 5, "joy" = 5) + +/obj/item/reagent_containers/food/snacks/snowcones/soda + name = "sodawater flavored snowcone" + desc = "A waterd down sodawater flavored snowcone snowball in a paper cup." + icon_state = "soda_sc" + list_reagents = list("nutriment" = 1, "sodawater" = 5) + tastes = list("surgar" = 1, "water" = 5, "soda" = 5) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/snowcones/pwgrmer + name = "pwergamer flavored snowcone" + desc = "A waterd down pwergamer soda flavord snowball in a paper cup." + icon_state = "pwergamer_sc" + list_reagents = list("nutriment" = 1, "laughter" = 1) + tastes = list("vaild" = 5, "salt" = 5, "wats" = 5) + foodtype = JUNKFOOD | SUGAR + +/obj/item/reagent_containers/food/snacks/snowcones/honey + name = "pwergamer flavored snowcone" + desc = "A waterd down pwergamer soda flavord snowball in a paper cup." + icon_state = "honey_sc" + list_reagents = list("nutriment" = 1, "honey" = 5) + tastes = list("pollen" = 5, "sweetness" = 5, "wax" = 1) + +/obj/item/reagent_containers/food/snacks/snowcones/rainbow + name = "rainbow color snowcone" + desc = "A rainbow color snowball in a paper cup." + icon_state = "rainbow_sc" + list_reagents = list("nutriment" = 5, "laughter" = 25) + tastes = list("sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3) \ No newline at end of file From 9443f5bf719a3ac9ef12fe69a25a0a5f0978087c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:11:54 -0400 Subject: [PATCH 09/13] Add files via upload --- icons/obj/food/snowcones.dmi | Bin 0 -> 1388 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 icons/obj/food/snowcones.dmi diff --git a/icons/obj/food/snowcones.dmi b/icons/obj/food/snowcones.dmi new file mode 100644 index 0000000000000000000000000000000000000000..bdaa89fdf76f832c068d5414f9c59580e1e1342e GIT binary patch literal 1388 zcmV-y1(W)TP)004jp0{{R3ySOfH|I7fHX8$wHnKR60GnoL) zW;4tH%w{v0GyecHz`(%&|2Jd>&AI>p00DGTPE!Ct=GbNc007N;R9JLGWpiV4X>fFD zZ*Bkpc$|&W%?g7s3)3k zt6SaZ@?NVKvL|QtMW1(jl||~ql$z5~WfRgkg{|=c0;Vz_45TLpy?^*FS6NT&)BK>a zfnmn2{^^A*!m=2Y;E`bwK|{01G4>MHnpL(IXJrI^&{f^DIpU$hIy@ z=)fxl4+cb8de?*KFe37p#w@{;vna~bG1&260EMoa@_Y9mgbCm6eFVuT000BSNkl+5U5vTp7dc*T5y)wejso0t5l#U{`G)O9I0YEx z6kmk%A0XY_Tq>tMZo96#V4mF44zVwAZZ3OVG^ZVI@g;fzoc6eIo<#2Pi{L7iN~Kb% zR4UbZRFHn({8e}N_p}n&&zasB(_=nt$8p$VUe^_^AZJ&FrPCWr8{l{{#}4mMKS%a@ zejz@V&=}MYZpUFPDMi$;){14?uNk_bbfyY@&YFiafo3~6E265KDS|hNRVa> z&(8*p1qQQwpCIb*BtKe+(}YKUBkt|h@ciy3F}NR;YcSH^xw{zik@JfjFZN>RXN%E( zkn)T7e{3(p=?;lA8j6eIUM{#Ni%sviHU>#2=3W zf8ThAxPL7u!jBz#{&1Qk!3pIzOM>%^`oX88!rXd??JN2MZp7^_%-I{O-G{lPM<&}D z82ll>BJH ze((?=_-*=mbO;Rch$9Jh8;LN|54yWJ)(>)g__y=HAw0f!HwivJMHufN*DwRsLo|a|lmnDJy9Q`UTti^n7iM@V- z&j*UV!ovSAUR%8ja9Kb;g$vNyGv${oeJ&2$CCr_>!nWw~xwWnOlze@6~u{oUF+{rSGNb#i~VwodQw*4D}W u-P$_6zgt@;_jhYc`#Y6NrBbQ>wtfJGFLVd|kimWc0000 Date: Wed, 5 Jun 2019 20:13:07 -0400 Subject: [PATCH 10/13] Update tgstation.dme --- tgstation.dme | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tgstation.dme b/tgstation.dme index 739176a457..b5d72fff2b 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1624,6 +1624,7 @@ #include "code\modules\food_and_drinks\food\snacks_burgers.dm" #include "code\modules\food_and_drinks\food\snacks_cake.dm" #include "code\modules\food_and_drinks\food\snacks_egg.dm" +#include "code\modules\food_and_drinks\food\snacks_frozen.dm" #include "code\modules\food_and_drinks\food\snacks_meat.dm" #include "code\modules\food_and_drinks\food\snacks_other.dm" #include "code\modules\food_and_drinks\food\snacks_pastry.dm" @@ -1652,6 +1653,7 @@ #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_burger.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_cake.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_egg.dm" +#include "code\modules\food_and_drinks\recipes\tablecraft\recipes_frozen.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_meat.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_misc.dm" #include "code\modules\food_and_drinks\recipes\tablecraft\recipes_pastry.dm" From 1b463c18b3d8d899b13382213d20ab6b5b5ec9fe Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 20:14:48 -0400 Subject: [PATCH 11/13] Update snacks_sandwichtoast.dm --- .../food_and_drinks/food/snacks_sandwichtoast.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm index 88f8848315..1b602b6759 100644 --- a/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm +++ b/code/modules/food_and_drinks/food/snacks_sandwichtoast.dm @@ -52,16 +52,6 @@ list_reagents = list("nutriment" = 2, "cherryjelly" = 5, "vitamin" = 2) foodtype = GRAIN | FRUIT -/obj/item/reagent_containers/food/snacks/icecreamsandwich - name = "icecream sandwich" - desc = "Portable Ice-cream in its own packaging." - icon = 'icons/obj/food/food.dmi' - icon_state = "icecreamsandwich" - bonus_reagents = list("nutriment" = 1, "ice" = 2) - list_reagents = list("nutriment" = 2, "ice" = 2) - tastes = list("ice cream" = 1) - foodtype = GRAIN | DAIRY - /obj/item/reagent_containers/food/snacks/notasandwich name = "not-a-sandwich" desc = "Something seems to be wrong with this, you can't quite figure what. Maybe it's his moustache." From 5e68db7836dcf542f99f2a2e1a22b1aec0e43629 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 5 Jun 2019 22:22:50 -0400 Subject: [PATCH 12/13] local files have commas, but I forgot to save --- .../recipes/tablecraft/recipes_frozen.dm | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm index f520377a4f..08d5716779 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm @@ -47,7 +47,7 @@ /datum/crafting_recipe/food/flaverless_sc name = "Flaverless snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15 ) @@ -57,7 +57,7 @@ /datum/crafting_recipe/food/pineapple_sc name = "Pineapple snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /obj/item/reagent_containers/food/snacks/pineappleslice = 2 @@ -68,7 +68,7 @@ /datum/crafting_recipe/food/lime_sc name = "Lime snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/limejuice = 5 @@ -79,7 +79,7 @@ /datum/crafting_recipe/food/lemon_sc name = "Lemon snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/lemonjuice = 5 @@ -90,7 +90,7 @@ /datum/crafting_recipe/food/apple_sc name = "Apple snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/applejuice = 5 @@ -101,7 +101,7 @@ /datum/crafting_recipe/food/grape_sc name = "Grape snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/berryjuice = 5 @@ -112,7 +112,7 @@ /datum/crafting_recipe/food/orange_sc name = "Orange snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/orangejuice = 5 @@ -123,7 +123,7 @@ /datum/crafting_recipe/food/blue_sc name = "Bluecherry snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/bluecherryjelly= 5 @@ -134,7 +134,7 @@ /datum/crafting_recipe/food/red_sc name = "Cherry snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/cherryjelly= 5 @@ -145,7 +145,7 @@ /datum/crafting_recipe/food/mix_sc name = "Mixed berrie snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/berryjuice = 15 @@ -156,7 +156,7 @@ /datum/crafting_recipe/food/fruitsalad_sc name = "Fruit Salad snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/orangejuice = 5, @@ -169,7 +169,7 @@ /datum/crafting_recipe/food/mime_sc name = "Mime snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/nothing = 5 @@ -180,7 +180,7 @@ /datum/crafting_recipe/food/clown_sc name = "Clown snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/clownstears = 5 @@ -191,7 +191,7 @@ /datum/crafting_recipe/food/soda_sc name = "Soda water snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/sodawater = 15 @@ -202,7 +202,7 @@ /datum/crafting_recipe/food/pwgrmer_sc name = "Pwergamer snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/pwr_game = 15 @@ -213,10 +213,10 @@ /datum/crafting_recipe/food/kiwi_sc name = "Soda water snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, + /obj/item/reagent_containers/food/snacks/egg/kiwiEgg = 1, /datum/reagent/water = 5, - /datum/reagent/consumable/ice = 15, - /obj/item/reagent_containers/food/snacks/egg/kiwiEgg = 1 + /datum/reagent/consumable/ice = 15 ) result = /obj/item/reagent_containers/food/snacks/snowcones/kiwi subcategory = CAT_ICE @@ -224,7 +224,7 @@ /datum/crafting_recipe/food/honey_sc name = "Honey snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/consumable/honey = 5 @@ -235,7 +235,7 @@ /datum/crafting_recipe/food/honey_sc name = "Rainbow snowcone" reqs = list( - /obj/item/reagent_containers/food/drinks/sillycup = 1 + /obj/item/reagent_containers/food/drinks/sillycup = 1, /datum/reagent/water = 5, /datum/reagent/consumable/ice = 15, /datum/reagent/colorful_reagent = 1 //Hard to make From 01e56cc00dae6dc0b0d61ea9d45393d0435ef8d1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 6 Jun 2019 14:52:52 -0400 Subject: [PATCH 13/13] garmmer --- code/modules/food_and_drinks/food/snacks_frozen.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_frozen.dm b/code/modules/food_and_drinks/food/snacks_frozen.dm index e7f0509b92..febfa527ca 100644 --- a/code/modules/food_and_drinks/food/snacks_frozen.dm +++ b/code/modules/food_and_drinks/food/snacks_frozen.dm @@ -56,7 +56,7 @@ /obj/item/reagent_containers/food/snacks/snowcones/lime name = "lime flavored snowcone" - desc = "A pineapple flavord snowball in a paper cup." + desc = "A lime flavord snowball in a paper cup." icon_state = "lime_sc" list_reagents = list("nutriment" = 1, "limejuice" = 5) tastes = list("ice" = 1, "water" = 1, "limes" = 5) @@ -64,7 +64,7 @@ /obj/item/reagent_containers/food/snacks/snowcones/lemon name = "lemon flavored snowcone" - desc = "A pineapple flavord snowball in a paper cup." + desc = "A lemon flavord snowball in a paper cup." icon_state = "lemon_sc" list_reagents = list("nutriment" = 1, "lemonjuice" = 5) tastes = list("ice" = 1, "water" = 1, "lemons" = 5) @@ -72,7 +72,7 @@ /obj/item/reagent_containers/food/snacks/snowcones/apple name = "apple flavored snowcone" - desc = "A pineapple flavord snowball in a paper cup." + desc = "A apple flavord snowball in a paper cup." icon_state = "blue_sc" list_reagents = list("nutriment" = 1, "applejuice" = 5) tastes = list("ice" = 1, "water" = 1, "apples" = 5) @@ -173,8 +173,8 @@ foodtype = JUNKFOOD | SUGAR /obj/item/reagent_containers/food/snacks/snowcones/honey - name = "pwergamer flavored snowcone" - desc = "A waterd down pwergamer soda flavord snowball in a paper cup." + name = "honey flavored snowcone" + desc = "A honey flavord snowball in a paper cup." icon_state = "honey_sc" list_reagents = list("nutriment" = 1, "honey" = 5) tastes = list("pollen" = 5, "sweetness" = 5, "wax" = 1) @@ -184,4 +184,4 @@ desc = "A rainbow color snowball in a paper cup." icon_state = "rainbow_sc" list_reagents = list("nutriment" = 5, "laughter" = 25) - tastes = list("sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3) \ No newline at end of file + tastes = list("sunlight" = 5, "light" = 5, "slime" = 5, "paint" = 3, "clouds" = 3)