cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed "Chilli" -> "Chili" and "Coco" -> "Cocoa". Pray it passes Travis.

Browse Source
This commit is contained in:
TheVekter
2015-02-06 05:22:53 -06:00
parent 9bc2137815
commit ff65ec2018
8 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/food/snacks/food_mixtures.dm
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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/hydroponics/grown.dm
+7 -7
View File
@@ -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
+4 -4
View File
@@ -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/Food-Reagents.dm
+1 -1
View File
@@ -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