From 5d4917bf48ed47100e52650a7b14802439f24a99 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 19 Apr 2019 13:37:56 -0400 Subject: [PATCH 1/5] Add files via upload --- modular_citadel/icons/obj/food/cake.dmi | Bin 0 -> 4607 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 modular_citadel/icons/obj/food/cake.dmi diff --git a/modular_citadel/icons/obj/food/cake.dmi b/modular_citadel/icons/obj/food/cake.dmi new file mode 100644 index 0000000000000000000000000000000000000000..840bfe714d0548af38f5bf820132a03bc470906b GIT binary patch literal 4607 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 N20Hhl)mruu{{vfU%%}hW literal 0 HcmV?d00001 From fe5e68710fee5b9d2d5e1d3da0fa44e5332c0d32 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 19 Apr 2019 13:48:10 -0400 Subject: [PATCH 2/5] Update snacks_cake.dm --- .../food_and_drinks/food/snacks_cake.dm | 103 ++++++++++++++++-- 1 file changed, 96 insertions(+), 7 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index 781b021d05..8f724ec638 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -54,7 +54,6 @@ tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR - /obj/item/reagent_containers/food/snacks/store/cake/brain name = "brain cake" desc = "A squishy cake-thing." @@ -86,7 +85,6 @@ tastes = list("cake" = 4, "cream cheese" = 3) foodtype = GRAIN | DAIRY - /obj/item/reagent_containers/food/snacks/cakeslice/cheese name = "cheese cake slice" desc = "Slice of pure cheestisfaction." @@ -95,7 +93,6 @@ tastes = list("cake" = 4, "cream cheese" = 3) foodtype = GRAIN | DAIRY - /obj/item/reagent_containers/food/snacks/store/cake/orange name = "orange cake" desc = "A cake with added orange." @@ -132,7 +129,6 @@ tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) foodtype = GRAIN | DAIRY | FRUIT | SUGAR - /obj/item/reagent_containers/food/snacks/store/cake/lemon name = "lemon cake" desc = "A cake with added lemon." @@ -143,7 +139,6 @@ tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) foodtype = GRAIN | DAIRY | FRUIT | SUGAR - /obj/item/reagent_containers/food/snacks/cakeslice/lemon name = "lemon cake slice" desc = "Just a slice of cake, it is enough for everyone." @@ -163,7 +158,6 @@ tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR - /obj/item/reagent_containers/food/snacks/cakeslice/chocolate name = "chocolate cake slice" desc = "Just a slice of cake, it is enough for everyone." @@ -172,7 +166,6 @@ tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) foodtype = GRAIN | DAIRY | JUNKFOOD | SUGAR - /obj/item/reagent_containers/food/snacks/store/cake/birthday name = "birthday cake" desc = "Happy Birthday little clown..." @@ -252,3 +245,99 @@ tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR + +/obj/item/reagent_containers/food/snacks/store/cake/bsvc // blackbarry strawberries vanilla cake + name = "blackbarry and strawberry vanilla cake" + desc = "A plain cake, filled with asortment of blackbarries and strawberries!" + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "blackbarry_strawberries_cake_vanilla_cake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bsvc + bonus_reagents = list("nutriment" = 14, "vitamin" = 4) + tastes = list("blackbarry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3) + foodtype = GRAIN | DAIRY | FRUIT | SUGAR + +/obj/item/reagent_containers/food/snacks/cakeslice/bsvc + name = "blackbarry and strawberry vanilla cake slice" + desc = "Just a slice of cake filled with asortment of blackbarries and strawberries!" + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "blackbarry_strawberries_cake_vanilla_slice" + filling_color = "#FFD700" + tastes = list("blackbarry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2,"cake" = 3) + foodtype = GRAIN | DAIRY | FRUIT | SUGAR + +/obj/item/reagent_containers/food/snacks/store/cake/bscc // blackbarry strawberries chocolate cake + name = "blackbarry and strawberry chocolate cake" + desc = "A plain cake, filled with asortment of blackbarries and strawberries!" + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "blackbarry_strawberries_cake_coco_cake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bscc + bonus_reagents = list("nutriment" = 14, "vitamin" = 4, "cocoa" = 5) + tastes = list("blackbarry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) + foodtype = GRAIN | DAIRY | FRUIT | SUGAR + +/obj/item/reagent_containers/food/snacks/cakeslice/bscc + name = "blackbarry and strawberry chocolate cake slice" + desc = "Just a slice of cake filled with asortment of blackbarries and strawberries!" + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "blackbarry_strawberries_cake_coco_cake_slice" + filling_color = "#FFD700" + tastes = list("blackbarry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) + foodtype = GRAIN | DAIRY | FRUIT | SUGAR + +obj/item/reagent_containers/food/snacks/store/cake/holy_cake + name = "angel food cake" + desc = "A cake made for angels and chaplins alike! Contains holy water." + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "holy_cake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice + bonus_reagents = list("nutriment" = 1, "vitamin" = 3, "holy_water" = 10) + tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1) + foodtype = GRAIN | DAIRY | SUGAR + +/obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice + name = "angel food cake slice" + desc = "A slice of heavenly cake." + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "holy_cake_slice" + filling_color = "#00FFFF" + tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1) + foodtype = GRAIN | DAIRY | SUGAR + +obj/item/reagent_containers/food/snacks/store/cake/pound_cake + name = "pound cake" + desc = "A condecnecd cake made for filling people up quickly." + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "pound_cake" + slices_num = 7 //Its ment to feed the party + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice + bonus_reagents = list("nutriment" = 60) + tastes = list("cake" = 5, "sweetness" = 1, "batter" = 1) + foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD + +/obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice + name = "pound cake slice" + desc = "A slice of condecnecd cake made for filling people up quickly." + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "pound_cake_slice" + filling_color = "#00FFFF" + tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1) + foodtype = GRAIN | DAIRY | SUGAR | JUNKFOOD + +obj/item/reagent_containers/food/snacks/store/cake/hardware_cake + name = "hardware cake" + desc = "A cake that is made with eletronical boards and leaks acid..." + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "hardware_cake" + slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice + bonus_reagents = list("sacid" = 15, "oil" = 15) + tastes = list("acid" = 1, "metal" = 1, "regret" = 10) + foodtype = GRAIN | GROSS + +/obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice + name = "hardware cake slice" + desc = "A slice of eletronical boards and some acid." + icon = 'modular_citadel/icons/obj/food/cake.dmi' + icon_state = "hardware_cake_slice" + filling_color = "#00FFFF" + tastes = list("acid" = 1, "metal" = 1, "regret" = 10) + foodtype = GRAIN | GROSS From e8e7467a50d0a8ad012bd7570920eebe064817e5 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 19 Apr 2019 13:50:02 -0400 Subject: [PATCH 3/5] Update recipes_cake.dm --- .../recipes/tablecraft/recipes_cake.dm | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index 01c13abf47..5cf60dfb67 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -102,6 +102,52 @@ result = /obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice subcategory = CAT_CAKE +/datum/crafting_recipe/food/holycake + name = "Angel food cake" + reqs = list( + /datum/reagent/water/holywater = 15, + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/holy_cake + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/poundcake + name = "Pound cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 4 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/pound_cake + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/hardwarecake + name = "Hardware cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/circuitboard = 2, + /datum/reagent/toxin/acid = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/hardware_cake + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/bscccake + name = "blackbarry and strawberry chocolate cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/chocolatebar = 2, + /obj/item/reagent_containers/food/snacks/grown/berries = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/bscc + subcategory = CAT_CAKE + +/datum/crafting_recipe/food/bscvcake + name = "blackbarry and strawberry vanilla cake" + reqs = list( + /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, + /obj/item/reagent_containers/food/snacks/grown/berries = 5 + ) + result = /obj/item/reagent_containers/food/snacks/store/cake/bsvc + subcategory = CAT_CAKE + /datum/crafting_recipe/food/cak name = "Living cat/cake hybrid" reqs = list( @@ -114,4 +160,4 @@ /datum/reagent/teslium = 1 //To shock the whole thing into life ) result = /mob/living/simple_animal/pet/cat/cak - subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT??? + subcategory = CAT_CAKE //Cat! Haha, get it? CAT? GET IT? We get it - Love Catpeople From bb51b9e354a9288706283d7124ea4a5d5bb90411 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 19 Apr 2019 14:04:03 -0400 Subject: [PATCH 4/5] grammar --- .../food_and_drinks/food/snacks_cake.dm | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm index 8f724ec638..1eeea79410 100644 --- a/code/modules/food_and_drinks/food/snacks_cake.dm +++ b/code/modules/food_and_drinks/food/snacks_cake.dm @@ -243,12 +243,11 @@ icon_state = "pumpkinspicecakeslice" filling_color = "#FFD700" tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) - foodtype = GRAIN | DAIRY | VEGETABLES | SUGAR -/obj/item/reagent_containers/food/snacks/store/cake/bsvc // blackbarry strawberries vanilla cake - name = "blackbarry and strawberry vanilla cake" - desc = "A plain cake, filled with asortment of blackbarries and strawberries!" +/obj/item/reagent_containers/food/snacks/store/cake/bsvc // blackberry strawberries vanilla cake + name = "blackberry and strawberry vanilla cake" + desc = "A plain cake, filled with assortment of blackberries and strawberries!" icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "blackbarry_strawberries_cake_vanilla_cake" slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bsvc @@ -257,8 +256,8 @@ foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/reagent_containers/food/snacks/cakeslice/bsvc - name = "blackbarry and strawberry vanilla cake slice" - desc = "Just a slice of cake filled with asortment of blackbarries and strawberries!" + name = "blackberry and strawberry vanilla cake slice" + desc = "Just a slice of cake filled with assortment of blackberries and strawberries!" icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "blackbarry_strawberries_cake_vanilla_slice" filling_color = "#FFD700" @@ -266,27 +265,27 @@ foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/reagent_containers/food/snacks/store/cake/bscc // blackbarry strawberries chocolate cake - name = "blackbarry and strawberry chocolate cake" - desc = "A plain cake, filled with asortment of blackbarries and strawberries!" + name = "blackberry and strawberry chocolate cake" + desc = "A plain cake, filled with assortment of blackberries and strawberries!" icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "blackbarry_strawberries_cake_coco_cake" slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/bscc bonus_reagents = list("nutriment" = 14, "vitamin" = 4, "cocoa" = 5) - tastes = list("blackbarry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) + tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) foodtype = GRAIN | DAIRY | FRUIT | SUGAR /obj/item/reagent_containers/food/snacks/cakeslice/bscc - name = "blackbarry and strawberry chocolate cake slice" - desc = "Just a slice of cake filled with asortment of blackbarries and strawberries!" + name = "blackberry and strawberry chocolate cake slice" + desc = "Just a slice of cake filled with assortment of blackberries and strawberries!" icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "blackbarry_strawberries_cake_coco_cake_slice" filling_color = "#FFD700" - tastes = list("blackbarry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) + tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2,"cake" = 3) foodtype = GRAIN | DAIRY | FRUIT | SUGAR obj/item/reagent_containers/food/snacks/store/cake/holy_cake name = "angel food cake" - desc = "A cake made for angels and chaplins alike! Contains holy water." + desc = "A cake made for angels and chaplains alike! Contains holy water." icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "holy_cake" slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/holy_cake_slice @@ -305,7 +304,7 @@ obj/item/reagent_containers/food/snacks/store/cake/holy_cake obj/item/reagent_containers/food/snacks/store/cake/pound_cake name = "pound cake" - desc = "A condecnecd cake made for filling people up quickly." + desc = "A condensed cake made for filling people up quickly." icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "pound_cake" slices_num = 7 //Its ment to feed the party @@ -316,7 +315,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake /obj/item/reagent_containers/food/snacks/cakeslice/pound_cake_slice name = "pound cake slice" - desc = "A slice of condecnecd cake made for filling people up quickly." + desc = "A slice of condensed cake made for filling people up quickly." icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "pound_cake_slice" filling_color = "#00FFFF" @@ -325,7 +324,7 @@ obj/item/reagent_containers/food/snacks/store/cake/pound_cake obj/item/reagent_containers/food/snacks/store/cake/hardware_cake name = "hardware cake" - desc = "A cake that is made with eletronical boards and leaks acid..." + desc = "A cake that is made with electronic boards and leaks acid..." icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "hardware_cake" slice_path = /obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice @@ -335,7 +334,7 @@ obj/item/reagent_containers/food/snacks/store/cake/hardware_cake /obj/item/reagent_containers/food/snacks/cakeslice/hardware_cake_slice name = "hardware cake slice" - desc = "A slice of eletronical boards and some acid." + desc = "A slice of electronic boards and some acid." icon = 'modular_citadel/icons/obj/food/cake.dmi' icon_state = "hardware_cake_slice" filling_color = "#00FFFF" From 1a680b142ff7374865ec897516b8e0f015d07c4c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Fri, 19 Apr 2019 14:06:02 -0400 Subject: [PATCH 5/5] grammar --- .../food_and_drinks/recipes/tablecraft/recipes_cake.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm index 5cf60dfb67..464b8ce26f 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_cake.dm @@ -130,7 +130,7 @@ subcategory = CAT_CAKE /datum/crafting_recipe/food/bscccake - name = "blackbarry and strawberry chocolate cake" + name = "blackberry and strawberry chocolate cake" reqs = list( /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, /obj/item/reagent_containers/food/snacks/chocolatebar = 2, @@ -140,7 +140,7 @@ subcategory = CAT_CAKE /datum/crafting_recipe/food/bscvcake - name = "blackbarry and strawberry vanilla cake" + name = "blackberry and strawberry vanilla cake" reqs = list( /obj/item/reagent_containers/food/snacks/store/cake/plain = 1, /obj/item/reagent_containers/food/snacks/grown/berries = 5