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." 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 diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 31035ff08..e473b84fb 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ