Merge pull request #7568 from TheVekter/typofix

Fixes a few typos

code/modules/food&drinks/drinks/drinks/bottle.dm

@@ -143,11 +143,11 @@
 	icon_state = "vodkabottle"
 	list_reagents = list("vodka" = 100)
 
-/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla
-	name = "Caccavo Guaranteed Quality Tequilla"
+/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila
+	name = "Caccavo Guaranteed Quality tequila"
 	desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
-	icon_state = "tequillabottle"
-	list_reagents = list("tequilla" = 100)
+	icon_state = "tequilabottle"
+	list_reagents = list("tequila" = 100)
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/bottleofnothing
 	name = "Bottle of Nothing"
@@ -157,7 +157,7 @@
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/patron
 	name = "Wrapp Artiste Patron"
-	desc = "Silver laced tequilla, served in space night clubs across the galaxy."
+	desc = "Silver laced tequila, served in space night clubs across the galaxy."
 	icon_state = "patronbottle"
 	list_reagents = list("patron" = 100)
 

code/modules/food&drinks/drinks/drinks/drinkingglass.dm

@@ -110,9 +110,9 @@
 				icon_state = "vermouthglass"
 				name = "glass of vermouth"
 				desc = "You wonder why you're even drinking this straight."
-			if("tequilla")
-				icon_state = "tequillaglass"
-				name = "glass of tequilla"
+			if("tequila")
+				icon_state = "tequilaglass"
+				name = "glass of tequila"
 				desc = "Now all that's missing is the weird colored shades!"
 			if("patron")
 				icon_state = "patronglass"
@@ -157,10 +157,10 @@
 			if("bravebull")
 				icon_state = "bravebullglass"
 				name = "Brave Bull"
-				desc = "Tequilla and Coffee liquor, brought together in a mouthwatering mixture. Drink up."
-			if("tequillasunrise")
-				icon_state = "tequillasunriseglass"
-				name = "Tequilla Sunrise"
+				desc = "tequila and Coffee liquor, brought together in a mouthwatering mixture. Drink up."
+			if("tequilasunrise")
+				icon_state = "tequilasunriseglass"
+				name = "tequila Sunrise"
 				desc = "Oh great, now you feel nostalgic about sunrises back on Terra..."
 			if("toxinsspecial")
 				icon_state = "toxinsspecialglass"

code/modules/food&drinks/food/snacks/food_mixtures.dm

@@ -20,7 +20,7 @@
 	name = "Chocolate Bar"
 	id = "chocolate_bar"
 	result = null
-	required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
+	required_reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
 	result_amount = 1
 
 /datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -34,7 +34,7 @@
 	name = "Chocolate Bar"
 	id = "chocolate_bar"
 	result = null
-	required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
+	required_reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2)
 	result_amount = 1
 	mob_react = 1
 /datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
@@ -47,7 +47,7 @@
 	name = "Hot Coco"
 	id = "hot_coco"
 	result = "hot_coco"
-	required_reagents = list("water" = 5, "coco" = 1)
+	required_reagents = list("water" = 5, "cocoa" = 1)
 	result_amount = 5
 
 /datum/chemical_reaction/coffee

code/modules/food&drinks/food/snacks_other.dm

@@ -12,7 +12,7 @@
 	desc = "Such, sweet, fattening food."
 	icon_state = "chocolatebarunwrapped"
 	wrapped = 0
-	list_reagents = list("nutriment" = 4, "sugar" = 2, "coco" = 2, "vitamin" = 1)
+	list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2, "vitamin" = 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/chocolatebar/attack_self(mob/user)
 	if(wrapped)
@@ -142,10 +142,10 @@
 	name = "chocolate coin"
 	desc = "A completely edible but nonflippable festive coin."
 	icon_state = "chococoin"
-	list_reagents = list("nutriment" = 2, "sugar" = 2, "coco" = 2)
+	list_reagents = list("nutriment" = 2, "sugar" = 2, "cocoa" = 2)
 
 /obj/item/weapon/reagent_containers/food/snacks/chocoorange
 	name = "chocolate orange"
 	desc = "A festive chocolate orange"
 	icon_state = "chocoorange"
-	list_reagents = list("nutriment" = 4, "sugar" = 2, "coco" = 2)
+	list_reagents = list("nutriment" = 4, "sugar" = 2, "cocoa" = 2)

code/modules/food&drinks/food/snacks_pastry.dm

@@ -24,7 +24,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/donut/chaos/New()
 	..()
-	extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "coco", "slimejelly", "banana", "berryjuice", "omnizine")
+	extra_reagent = pick("nutriment", "capsaicin", "frostoil", "krokodil", "plasma", "cocoa", "slimejelly", "banana", "berryjuice", "omnizine")
 	reagents.add_reagent("[extra_reagent]", 3)
 	if(prob(30))
 		icon_state = "donut2"

code/modules/food&drinks/kitchen machinery/icecream_vat.dm

@@ -22,7 +22,7 @@
 /obj/machinery/icecream_vat/proc/get_ingredient_list(var/type)
 	switch(type)
 		if(ICECREAM_CHOCOLATE)
-			return list("milk", "ice", "coco")
+			return list("milk", "ice", "cocoa")
 		if(ICECREAM_STRAWBERRY)
 			return list("milk", "ice", "berryjuice")
 		if(ICECREAM_BLUE)
@@ -30,7 +30,7 @@
 		if(CONE_WAFFLE)
 			return list("flour", "sugar")
 		if(CONE_CHOC)
-			return list("flour", "sugar", "coco")
+			return list("flour", "sugar", "cocoa")
 		else
 			return list("milk", "ice")
 

code/modules/food&drinks/recipes/drinks_recipes.dm

@@ -12,7 +12,7 @@
 	name = "Patron"
 	id = "patron"
 	result = "patron"
-	required_reagents = list("tequilla" = 10, "silver" = 1)
+	required_reagents = list("tequila" = 10, "silver" = 1)
 	result_amount = 10
 
 /datum/chemical_reaction/bilk
@@ -150,14 +150,14 @@
 	name = "Brave Bull"
 	id = "bravebull"
 	result = "bravebull"
-	required_reagents = list("tequilla" = 2, "kahlua" = 1)
+	required_reagents = list("tequila" = 2, "kahlua" = 1)
 	result_amount = 3
 
-/datum/chemical_reaction/tequilla_sunrise
-	name = "Tequilla Sunrise"
-	id = "tequillasunrise"
-	result = "tequillasunrise"
-	required_reagents = list("tequilla" = 2, "orangejuice" = 1)
+/datum/chemical_reaction/tequila_sunrise
+	name = "tequila Sunrise"
+	id = "tequilasunrise"
+	result = "tequilasunrise"
+	required_reagents = list("tequila" = 2, "orangejuice" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/toxins_special
@@ -234,14 +234,14 @@
 	name = "Margarita"
 	id = "margarita"
 	result = "margarita"
-	required_reagents = list("tequilla" = 2, "limejuice" = 1)
+	required_reagents = list("tequila" = 2, "limejuice" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/longislandicedtea
 	name = "Long Island Iced Tea"
 	id = "longislandicedtea"
 	result = "longislandicedtea"
-	required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 1)
+	required_reagents = list("vodka" = 1, "gin" = 1, "tequila" = 1, "cubalibre" = 1)
 	result_amount = 4
 
 /datum/chemical_reaction/threemileisland

code/modules/hydroponics/grown.dm

@@ -285,7 +285,7 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod/add_juice()
 	if(..())
 		reagents.add_reagent("nutriment", 1 + round((potency / 10), 1))
-		reagents.add_reagent("coco", 4 + round((potency / 5), 1))
+		reagents.add_reagent("cocoa", 4 + round((potency / 5), 1))
 		bitesize = 1 + round(reagents.total_volume / 2, 1)
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane
@@ -523,32 +523,32 @@
 		user << "<span class='info'>- Frostoil: <i>[reagents.get_reagent_amount("frostoil")]%</i></span>"
 
 
-/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli
-	seed = /obj/item/seeds/chillighost
+/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili
+	seed = /obj/item/seeds/chilighost
 	name = "ghost chili"
 	desc = "It seems to be vibrating gently."
 	icon_state = "ghostchilipepper"
 	var/mob/held_mob
 
-/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/add_juice()
+/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/add_juice()
 	..()
 	reagents.add_reagent("nutriment", 1 + round((potency / 25), 1))
 	reagents.add_reagent("capsaicin", 8+round(potency / 2, 1))
 	reagents.add_reagent("condensedcapsaicin", 4+round(potency / 4, 1))
 	bitesize = 1 + round(reagents.total_volume / 4, 1)
 
-/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/attackby(var/obj/item/O as obj, var/mob/user as mob)
+/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	. = ..()
 	if (istype(O, /obj/item/device/analyzer/plant_analyzer))
 		user << "<span class='info'>- Capsaicin: <i>[reagents.get_reagent_amount("capsaicin")]%</i></span>"
 
-/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/attack_hand(mob/user as mob)
+/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/attack_hand(mob/user as mob)
 	..()
 	if( istype(src.loc, /mob) )
 		held_mob = src.loc
 		SSobj.processing.Add(src)
 
-/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli/process()
+/obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili/process()
 	if(held_mob && src.loc == held_mob)
 		if( (held_mob.l_hand == src) || (held_mob.r_hand == src))
 			if(hasvar(held_mob,"gloves") && held_mob:gloves)

code/modules/hydroponics/seeds.dm

@@ -57,7 +57,7 @@
 	plant_type = 0
 	growthstages = 6
 	rarity = 0 // CentComm knows about this species already, it's in exotic seeds crates.
-	mutatelist = list(/obj/item/seeds/icepepperseed, /obj/item/seeds/chillighost)
+	mutatelist = list(/obj/item/seeds/icepepperseed, /obj/item/seeds/chilighost)
 
 /obj/item/seeds/replicapod
 	name = "pack of replica pod seeds"
@@ -1094,13 +1094,13 @@
 	new /obj/effect/spacevine_controller(user.loc, mutations)
 	qdel(src)
 
-/obj/item/seeds/chillighost
-	name = "pack of ghost chilli seeds"
+/obj/item/seeds/chilighost
+	name = "pack of ghost chili seeds"
 	desc = "These seeds grow into a chili said to be the hottest in the galaxy."
 	icon_state = "seed-chilighost"
 	species = "chilighost"
 	plantname = "chilighost"
-	product = /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chilli
+	product = /obj/item/weapon/reagent_containers/food/snacks/grown/ghost_chili
 	lifespan = 20
 	endurance = 10
 	maturation = 10

code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Drink-Reagents/Alcohols.dm

@@ -163,9 +163,9 @@ datum/reagent/consumable/ethanol/rum
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 45
 
-datum/reagent/consumable/ethanol/tequilla
+datum/reagent/consumable/ethanol/tequila
 	name = "Tequila"
-	id = "tequilla"
+	id = "tequila"
 	description = "A strong and mildly flavoured, mexican produced spirit. Feeling thirsty hombre?"
 	color = "#FFFF91" // rgb: 255, 255, 145
 	boozepwr = 35
@@ -289,9 +289,9 @@ datum/reagent/consumable/ethanol/brave_bull
 	color = "#664300" // rgb: 102, 67, 0
 	boozepwr = 35
 
-datum/reagent/consumable/ethanol/tequilla_sunrise
+datum/reagent/consumable/ethanol/tequila_sunrise
 	name = "Tequila Sunrise"
-	id = "tequillasunrise"
+	id = "tequilasunrise"
 	description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
 	color = "#FFE48C" // rgb: 255, 228, 140
 	boozepwr = 35

code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm

@@ -236,7 +236,7 @@ datum/reagent/consumable/blackpepper
 
 datum/reagent/consumable/coco
 	name = "Coco Powder"
-	id = "coco"
+	id = "cocoa"
 	description = "A fatty, bitter paste made from coco beans."
 	reagent_state = SOLID
 	nutriment_factor = 5 * REAGENTS_METABOLISM

code/modules/reagents/reagent_containers/borghydro.dm

@@ -136,7 +136,7 @@ Borg Shaker
 	charge_cost = 20 //Lots of reagents all regenerating at once, so the charge cost is lower. They also regenerate faster.
 	recharge_time = 3
 
-	reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequilla", "vermouth", "wine", "kahlua", "cognac", "ale")
+	reagent_ids = list("beer", "orangejuice", "limejuice", "tomatojuice", "cola", "tonic", "sodawater", "ice", "cream", "whiskey", "vodka", "rum", "gin", "tequila", "vermouth", "wine", "kahlua", "cognac", "ale")
 
 /obj/item/weapon/reagent_containers/borghypo/borgshaker/attack(mob/M as mob, mob/user as mob)
 	return //Can't inject stuff with a shaker, can we?