Merge pull request #201 from Mirag1993/Мердж-с-оффами

licorice (shiptest-ss13#2573)

code/modules/food_and_drinks/food/snacks_frozen.dm

@@ -262,9 +262,9 @@
 	bonus_reagents = list(/datum/reagent/consumable/hot_coco = 4, /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 3, /datum/reagent/consumable/sugar = 2)
 	overlay_state = "jumbo"
 
-/obj/item/reagent_containers/food/snacks/popsicle/nogga_black
-	name = "nogga black"
-	desc = "A salty licorice icecream recently reintroduced due to all the records of the controversy being lost to time. Those who cannot remember the past are doomed to repeat it."
+/obj/item/reagent_containers/food/snacks/popsicle/licorice
+	name = "licorice icecream"
+	desc = "A salty licorice icecream."
 	list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1,  /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
 	bonus_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sodiumchloride = 1,  /datum/reagent/consumable/cream = 2, /datum/reagent/consumable/vanilla = 1, /datum/reagent/consumable/sugar = 4)
 	tastes = list("salty liquorice")

code/modules/food_and_drinks/recipes/tablecraft/recipes_frozen.dm

@@ -296,8 +296,8 @@
 	result = /obj/item/reagent_containers/food/snacks/popsicle/jumbo
 	subcategory = CAT_ICE
 
-/datum/crafting_recipe/food/nogga_black
-	name = "Nogga black"
+/datum/crafting_recipe/food/licorice
+	name = "Licorice icecream"
 	reqs = list(
 		/obj/item/popsicle_stick = 1,
 		/datum/reagent/consumable/blumpkinjuice = 4, //natural source of ammonium chloride
@@ -307,5 +307,5 @@
 		/datum/reagent/consumable/vanilla = 2,
 		/datum/reagent/consumable/sugar = 2
 	)
-	result = /obj/item/reagent_containers/food/snacks/popsicle/nogga_black
+	result = /obj/item/reagent_containers/food/snacks/popsicle/licorice
 	subcategory = CAT_ICE