From ddfe378bd3824f8309d857ae7450c66a01e975db Mon Sep 17 00:00:00 2001
From: The Wolf Studios <33724974+TheWolfStudios@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:00:40 -0600
Subject: [PATCH 1/3] Adds Choccogun to snacks.
---
.../food_and_drinks/food/snacks_other.dm | 39 +++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index 30f12279c..3a587d2ae 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -256,6 +256,45 @@
tastes = list("fudge" = 1)
foodtype = JUNKFOOD | SUGAR
+/obj/item/reagent_containers/food/snacks/choccogun
+ name = "golden gun"
+ desc = "It's a golden gun! Probably will instantly kill who ever is hit."
+ icon_state = "pyritegun"
+ w_class = WEIGHT_CLASS_SMALL
+ attack_verb = list("pistol whipped")
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5, /datum/reagent/iron = 1)
+ list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/coco = 5)
+ filling_color = "#A0522D"
+ tastes = list("fudge" = 1, "metal" = 1)
+ bitesize = 0.1
+ foodtype = JUNKFOOD | SUGAR
+
+ var is_wrapped = 1
+
+/obj/item/reagent_containers/food/snacks/choccogun/afterattack(user)
+ if (is_wrapped == 1)
+ to_chat(user, "*click*")
+ playsound(src, "gun_dry_fire", 30, 1)
+ else //no more clicking chocolate for you. <3
+ return
+
+/obj/item/reagent_containers/food/snacks/choccogun/attack_self(mob/user)
+ if (is_wrapped == 1)
+ to_chat(user, "You look at the gun and find it's made of chocolate, unwrapping it.")
+
+ name = "chocolate gun"
+ desc = "This explains why it wasn't firing at all.."
+ icon_state = "choccogun"
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/sugar = 5, /datum/reagent/gold = 1)
+ list_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/coco = 5)
+ filling_color = "#A0522D"
+ tastes = list("fudge" = 1)
+ foodtype = JUNKFOOD | SUGAR
+
+ is_wrapped = 0
+ else
+ return
+
/obj/item/reagent_containers/food/snacks/chocoorange
name = "chocolate orange"
desc = "A festive chocolate orange."
From 0d4a7712a140244c633ae3115dfe44a98899742a Mon Sep 17 00:00:00 2001
From: The Wolf Studios <33724974+TheWolfStudios@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:05:26 -0600
Subject: [PATCH 2/3] adds chocco gun recipe
---
.../food_and_drinks/recipes/tablecraft/recipes_misc.dm | 9 +++++++++
1 file changed, 9 insertions(+)
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 5b5ff4c5a..3cbb62fee 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_misc.dm
@@ -49,6 +49,15 @@
result = /obj/item/reagent_containers/food/snacks/chocoorange
subcategory = CAT_MISCFOOD
+/datum/crafting_recipe/food/choccogun
+ name = "Choco gun"
+ reqs = list(
+ /datum/reagent/iron = 1,
+ /obj/item/reagent_containers/food/snacks/chocolatebar = 1,
+ )
+ result = /obj/item/reagent_containers/food/snacks/choccogun
+ subcategory = CAT_MISCFOOD
+
/datum/crafting_recipe/food/loadedbakedpotato
name = "Loaded baked potato"
time = 40
From 8dd125b882ad19ecf28f502670ca613927345562 Mon Sep 17 00:00:00 2001
From: The Wolf Studios <33724974+TheWolfStudios@users.noreply.github.com>
Date: Mon, 13 Feb 2023 20:06:27 -0600
Subject: [PATCH 3/3] adds icons for chocco gun
---
icons/obj/food/food.dmi | Bin 77619 -> 78408 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 31035ff08398d79f4a0c821fb714aad1d6a35af4..e473b84fbccc0ec33900932361cafe23b615ade2 100644
GIT binary patch
delta 4364
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