cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa Spelling and Relative Pathing Cleanup

Browse Source 
Standardized the spelling of "Cocoa", as this was inconsistent
- One spot refers to it as cacao still, but that is because it is in the
legit latin scientific name. Everything else is now cocoa (not coco).

Chocolate now will provide some nutrition (and make you fat if you eat a
lot)
- Cocoa Powder (the arguably main component of chocolate) provided
nutrition, but that nutrition mysteriously vanished when you combine it
with milk and sugar. Now chocolate provides the same nutrition as the
cocoa powder in it

Merged a number of cases where foods had both chocolate and cocoa to now
have just chocolate
- In the case where both were present, the volumes were combined to
maintain food sizes

Renamed cocoa pile to chocolate pile, as this was wrong
- The cocoa pile claimed to be a pure cocoa powder pile, but was
actually just chocolate that was dumped on the floor.

Removed a fair amount of relative pathing, but there's still more to go.
This commit is contained in:
FalseIncarnate
2016-02-24 16:34:23 -05:00
parent 799337d180
commit d2ae37c540
10 changed files with 897 additions and 915 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/recipes_candy.dm
+2 -2
View File
@@ -16,12 +16,12 @@
// ***********************************************************
/datum/recipe/candy/chocolate_bar
reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
reagents = list("soymilk" = 2, "cocoa" = 2, "sugar" = 2)
items = list()
result = /obj/item/weapon/reagent_containers/food/snacks/chocolatebar
/datum/recipe/candy/chocolate_bar2
reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2)
items = list()
result = /obj/item/weapon/reagent_containers/food/snacks/chocolatebar
code/modules/hydroponics/grown.dm
+1 -1
View File
@@ -101,7 +101,7 @@
descriptors |= "nutritious"
if(reagents.has_reagent("condensedcapsaicin") || reagents.has_reagent("capsaicin"))
descriptors |= "spicy"
if(reagents.has_reagent("coco"))
if(reagents.has_reagent("cocoa"))
descriptors |= "bitter"
if(reagents.has_reagent("orangejuice") || reagents.has_reagent("lemonjuice") || reagents.has_reagent("limejuice"))
descriptors |= "sweet-sour"
code/modules/hydroponics/seed_datums.dm
+3 -3
View File
@@ -1209,9 +1209,9 @@
/datum/seed/cocoa
name = "cocoa"
seed_name = "cacao"
display_name = "cacao tree"
chems = list("plantmatter" = list(1,10), "coco" = list(4,5))
seed_name = "cocoa"
display_name = "cocoa tree"
chems = list("plantmatter" = list(1,10), "cocoa" = list(4,5))
preset_icon = "cocoapod"
/datum/seed/cocoa/New()
code/modules/reagents/newchem/food.dm
+3 -1
View File
@@ -131,10 +131,12 @@ datum/reagent/honey/reaction_turf(var/turf/T, var/volume)
id = "chocolate"
description = "Chocolate is a delightful product derived from the seeds of the theobroma cacao tree."
reagent_state = LIQUID
nutriment_factor = 5 * REAGENTS_METABOLISM //same as pure cocoa powder, because it makes no sense that chocolate won't fill you up and make you fat
color = "#2E2418"
/datum/reagent/chocolate/on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.nutrition += nutriment_factor
M.reagents.add_reagent("sugar", 0.8)
..()
return
@@ -142,7 +144,7 @@ datum/reagent/honey/reaction_turf(var/turf/T, var/volume)
/datum/reagent/chocolate/reaction_turf(var/turf/T, var/volume)
src = null
if(volume >= 5)
new /obj/item/weapon/reagent_containers/food/snacks/cocoa_pile(T)
new /obj/item/weapon/reagent_containers/food/snacks/choc_pile(T)
return
/datum/reagent/mugwort
code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_drink.dm
+503 -505
View File
File diff suppressed because it is too large Load Diff
code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_food.dm
+111 -107
View File
@@ -1,121 +1,125 @@
/datum/chemical_reaction/
tofu
name = "Tofu"
id = "tofu"
result = null
required_reagents = list("soymilk" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/tofu(location)
return
/datum/chemical_reaction/tofu
name = "Tofu"
id = "tofu"
result = null
required_reagents = list("soymilk" = 10)
required_catalysts = list("enzyme" = 5)
result_amount = 1
chocolate_bar
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
return
/datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/tofu(location)
return
chocolate_bar2
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
return
/datum/chemical_reaction/chocolate_bar
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
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)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
return
soysauce
name = "Soy Sauce"
id = "soysauce"
result = "soysauce"
required_reagents = list("soymilk" = 1,"sodiumchloride" = 1, "water" = 8)
result_amount = 10
/datum/chemical_reaction/chocolate_bar2
name = "Chocolate Bar"
id = "chocolate_bar"
result = null
required_reagents = list("milk" = 2, "cocoa" = 2, "sugar" = 2)
result_amount = 1
cheesewheel
name = "Cheesewheel"
id = "cheesewheel"
result = null
required_reagents = list("milk" = 40)
required_catalysts = list("enzyme" = 5)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location)
return
/datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/chocolatebar(location)
return
syntiflesh
name = "Syntiflesh"
id = "syntiflesh"
result = null
required_reagents = list("blood" = 5, "cryoxadone" = 1)
result_amount = 1
on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location)
return
/datum/chemical_reaction/soysauce
name = "Soy Sauce"
id = "soysauce"
result = "soysauce"
required_reagents = list("soymilk" = 1,"sodiumchloride" = 1, "water" = 8)
result_amount = 10
hot_ramen
name = "Hot Ramen"
id = "hot_ramen"
result = "hot_ramen"
required_reagents = list("water" = 1, "dry_ramen" = 3)
result_amount = 3
/datum/chemical_reaction/cheesewheel
name = "Cheesewheel"
id = "cheesewheel"
result = null
required_reagents = list("milk" = 40)
required_catalysts = list("enzyme" = 5)
result_amount = 1
hell_ramen
name = "Hell Ramen"
id = "hell_ramen"
result = "hell_ramen"
required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
result_amount = 6
/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesewheel(location)
return
doughball
name = "Ball of dough"
id = "dough_ball"
result = "dough_ball"
required_reagents = list("flour" = 15, "water" = 5)
required_catalysts = list("enzyme" = 5)
/datum/chemical_reaction/syntiflesh
name = "Syntiflesh"
id = "syntiflesh"
result = null
required_reagents = list("blood" = 5, "cryoxadone" = 1)
result_amount = 1
sodiumchloride
name = "Sodium Chloride"
id = "sodiumchloride"
result = "sodiumchloride"
required_reagents = list("sodium" = 1, "chlorine" = 1, "water" = 1)
result_amount = 3
mix_message = "The solution crystallizes with a brief flare of light."
/datum/chemical_reaction/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
var/location = get_turf(holder.my_atom)
new /obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh(location)
return
ice
name = "Ice"
id = "ice"
result = "ice"
required_reagents = list("water" = 1)
result_amount = 1
max_temp = 273
mix_message = "Ice forms as the water freezes."
mix_sound = null
/datum/chemical_reaction/hot_ramen
name = "Hot Ramen"
id = "hot_ramen"
result = "hot_ramen"
required_reagents = list("water" = 1, "dry_ramen" = 3)
result_amount = 3
dough
name = "Dough"
id = "dough"
result = null
required_reagents = list("water" = 10, "flour" = 15)
result_amount = 1
mix_message = "The ingredients form a dough."
/datum/chemical_reaction/hell_ramen
name = "Hell Ramen"
id = "hell_ramen"
result = "hell_ramen"
required_reagents = list("capsaicin" = 1, "hot_ramen" = 6)
result_amount = 6
on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/dough(location)
/datum/chemical_reaction/doughball
name = "Ball of dough"
id = "dough_ball"
result = "dough_ball"
required_reagents = list("flour" = 15, "water" = 5)
required_catalysts = list("enzyme" = 5)
/datum/chemical_reaction/sodiumchloride
name = "Sodium Chloride"
id = "sodiumchloride"
result = "sodiumchloride"
required_reagents = list("sodium" = 1, "chlorine" = 1, "water" = 1)
result_amount = 3
mix_message = "The solution crystallizes with a brief flare of light."
/datum/chemical_reaction/ice
name = "Ice"
id = "ice"
result = "ice"
required_reagents = list("water" = 1)
result_amount = 1
max_temp = 273
mix_message = "Ice forms as the water freezes."
mix_sound = null
/datum/chemical_reaction/dough
name = "Dough"
id = "dough"
result = null
required_reagents = list("water" = 10, "flour" = 15)
result_amount = 1
mix_message = "The ingredients form a dough."
/datum/chemical_reaction/dough/on_reaction(datum/reagents/holder, created_volume)
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/weapon/reagent_containers/food/snacks/dough(location)
return
code/modules/reagents/oldchem/reagents/reagents_food.dm
+6 -6
View File
@@ -185,15 +185,15 @@
reagent_state = SOLID
// no color (ie, black)
/datum/reagent/coco
name = "Coco Powder"
id = "coco"
description = "A fatty, bitter paste made from coco beans."
/datum/reagent/cocoa
name = "Cocoa Powder"
id = "cocoa"
description = "A fatty, bitter paste made from cocoa beans."
reagent_state = SOLID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#302000" // rgb: 48, 32, 0
/datum/reagent/coco/on_mob_life(var/mob/living/M as mob)
/datum/reagent/cocoa/on_mob_life(var/mob/living/M as mob)
M.nutrition += nutriment_factor
..()
return
@@ -201,7 +201,7 @@
/datum/reagent/hot_coco
name = "Hot Chocolate"
id = "hot_coco"
description = "Made with love! And coco beans."
description = "Made with love! And cocoa beans."
reagent_state = LIQUID
nutriment_factor = 2 * REAGENTS_METABOLISM
color = "#403010" // rgb: 64, 48, 16
code/modules/reagents/reagent_containers/food/snacks.dm
+6 -8
View File
@@ -397,13 +397,12 @@
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("chocolate",2)
reagents.add_reagent("coco", 2)
reagents.add_reagent("chocolate",4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cocoa_pile //for reagent chocolate being spilled on turfs
name = "Pile of Cocoa Powder"
desc = "A pile of pure cocoa powder."
/obj/item/weapon/reagent_containers/food/snacks/choc_pile //for reagent chocolate being spilled on turfs
name = "Pile of Chocolate"
desc = "A pile of pure chocolate pieces."
icon_state = "cocoa"
filling_color = "#7D5F46"
@@ -421,8 +420,7 @@
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("chocolate",2)
reagents.add_reagent("coco", 2)
reagents.add_reagent("chocolate",4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donut
@@ -477,7 +475,7 @@
if(5)
reagents.add_reagent("plasma", 3)
if(6)
reagents.add_reagent("coco", 3)
reagents.add_reagent("chocolate", 3)
if(7)
reagents.add_reagent("slimejelly", 3)
if(8)
code/modules/reagents/reagent_containers/food/snacks/candy.dm
+261 -281
View File
@@ -7,12 +7,13 @@
//Candy / Candy Ingredients
//Subclass so we can pass on values
/obj/item/weapon/reagent_containers/food/snacks/candy/
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "generic candy"
desc = "It's placeholder flavored. This shouldn't be seen."
icon = 'icons/obj/food/candy.dmi'
icon_state = "candy"
New()
/obj/item/weapon/reagent_containers/food/snacks/candy/New()
..()
// ***********************************************************
@@ -25,12 +26,11 @@
icon_state = "chocolatebar"
filling_color = "#7D5F46"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("chocolate",2)
reagents.add_reagent("coco", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar/New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("chocolate",4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/caramel
name = "Caramel"
@@ -38,11 +38,11 @@
icon_state = "caramel"
filling_color = "#DB944D"
New()
..()
reagents.add_reagent("cream", 2)
reagents.add_reagent("sugar", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/caramel/New()
..()
reagents.add_reagent("cream", 2)
reagents.add_reagent("sugar", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/toffee
name = "Toffee"
@@ -50,11 +50,11 @@
icon_state = "toffee"
filling_color = "#7D5F46"
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/toffee/New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/nougat
name = "Nougat"
@@ -62,11 +62,11 @@
icon_state = "nougat"
filling_color = "#7D5F46"
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/nougat/New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/taffy
name = "Saltwater Taffy"
@@ -74,12 +74,12 @@
icon_state = "candy1"
filling_color = "#7D5F46"
New()
..()
icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5")
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/taffy/New()
..()
icon_state = pick("candy1", "candy2", "candy3", "candy4", "candy5")
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("sugar", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/fudge
name = "Fudge"
@@ -87,12 +87,11 @@
icon_state = "fudge"
filling_color = "#7D5F46"
New()
..()
reagents.add_reagent("cream", 3)
reagents.add_reagent("chocolate",3)
reagents.add_reagent("coco", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/fudge/New()
..()
reagents.add_reagent("cream", 3)
reagents.add_reagent("chocolate",6)
bitesize = 3
// ***********************************************************
// Candy Products (Pre-existing)
@@ -102,11 +101,12 @@
name = "Donor Candy"
desc = "A little treat for blood donors."
trash = /obj/item/trash/candy
New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("sugar", 3)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/candy/donor/New()
..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("sugar", 3)
bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/candy_corn
name = "candy corn"
@@ -114,11 +114,11 @@
icon_state = "candy_corn"
filling_color = "#FFFCB0"
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("sugar", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy_corn/New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("sugar", 2)
bitesize = 2
// ***********************************************************
// Candy Products (plain / unflavored)
@@ -131,10 +131,10 @@
trash = /obj/item/weapon/c_tube
filling_color = "#FFFFFF"
New()
..()
reagents.add_reagent("sugar", 15)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/New()
..()
reagents.add_reagent("sugar", 15)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar
name = "candy"
@@ -143,11 +143,11 @@
trash = /obj/item/trash/candy
filling_color = "#7D5F46"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("chocolate",5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("chocolate",5)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/candycane
name = "candy cane"
@@ -155,11 +155,11 @@
icon_state = "candycane"
filling_color = "#F2F2F2"
New()
..()
reagents.add_reagent("minttoxin", 1)
reagents.add_reagent("sugar", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/candycane/New()
..()
reagents.add_reagent("minttoxin", 1)
reagents.add_reagent("sugar", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear
name = "gummy bear"
@@ -167,10 +167,10 @@
icon_state = "gbear"
filling_color = "#FFFFFF"
New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm
name = "gummy worm"
@@ -178,10 +178,10 @@
icon_state = "gworm"
filling_color = "#FFFFFF"
New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean
name = "jelly bean"
@@ -189,10 +189,10 @@
icon_state = "jbean"
filling_color = "#FFFFFF"
New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jawbreaker
name = "jawbreaker"
@@ -200,10 +200,10 @@
icon_state = "jawbreaker"
filling_color = "#ED0758"
New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 0.1 //this is gonna take a while, you'll be working at this all shift.
/obj/item/weapon/reagent_containers/food/snacks/candy/jawbreaker/New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 0.1 //this is gonna take a while, you'll be working at this all shift.
/obj/item/weapon/reagent_containers/food/snacks/candy/cash
name = "candy cash"
@@ -211,12 +211,11 @@
icon_state = "candy_cash"
filling_color = "#302000"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("sugar", 2)
reagents.add_reagent("coco", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/cash/New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("chocolate", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/candy/coin
name = "chocolate coin"
@@ -224,12 +223,11 @@
icon_state = "choc_coin"
filling_color = "#302000"
New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("chocolate",2)
reagents.add_reagent("coco", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/coin/New()
..()
reagents.add_reagent("nutriment", 2)
reagents.add_reagent("chocolate",4)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gum
name = "bubblegum"
@@ -238,10 +236,10 @@
trash = /obj/item/trash/gum
filling_color = "#FF7495"
New()
..()
reagents.add_reagent("sugar", 5)
bitesize = 0.2
/obj/item/weapon/reagent_containers/food/snacks/candy/gum/New()
..()
reagents.add_reagent("sugar", 5)
bitesize = 0.2
/obj/item/weapon/reagent_containers/food/snacks/candy/sucker
name = "sucker"
@@ -249,10 +247,10 @@
icon_state = "sucker"
filling_color = "#FFFFFF"
New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/candy/sucker/New()
..()
reagents.add_reagent("sugar", 10)
bitesize = 1
// ***********************************************************
// Gummy Bear Flavors
@@ -264,10 +262,10 @@
icon_state = "gbear_red"
filling_color = "#801E28"
New()
..()
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/red/New()
..()
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/blue
name = "gummy bear"
@@ -275,10 +273,10 @@
icon_state = "gbear_blue"
filling_color = "#863333"
New()
..()
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/blue/New()
..()
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison
name = "gummy bear"
@@ -286,13 +284,12 @@
icon_state = "gbear_blue"
filling_color = "#863353"
New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/poison/New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/green
name = "gummy bear"
@@ -300,10 +297,10 @@
icon_state = "gbear_green"
filling_color = "#365E30"
New()
..()
reagents.add_reagent("limejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/green/New()
..()
reagents.add_reagent("limejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/yellow
name = "gummy bear"
@@ -311,10 +308,10 @@
icon_state = "gbear_yellow"
filling_color = "#863333"
New()
..()
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/yellow/New()
..()
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/orange
name = "gummy bear"
@@ -322,10 +319,10 @@
icon_state = "gbear_orange"
filling_color = "#E78108"
New()
..()
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/orange/New()
..()
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/purple
name = "gummy bear"
@@ -333,10 +330,10 @@
icon_state = "gbear_purple"
filling_color = "#993399"
New()
..()
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/purple/New()
..()
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf
name = "gummy bear"
@@ -344,11 +341,10 @@
icon_state = "gbear_wtf"
filling_color = "#60A584"
New()
..()
reagents.add_reagent("space_drugs", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummybear/wtf/New()
..()
reagents.add_reagent("space_drugs", 2)
bitesize = 3
// ***********************************************************
// Gummy Worm Flavors
@@ -360,10 +356,10 @@
icon_state = "gworm_red"
filling_color = "#801E28"
New()
..()
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/red/New()
..()
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/blue
name = "gummy worm"
@@ -371,10 +367,10 @@
icon_state = "gworm_blue"
filling_color = "#863333"
New()
..()
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/blue/New()
..()
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison
name = "gummy worm"
@@ -382,12 +378,12 @@
icon_state = "gworm_blue"
filling_color = "#863353"
New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/poison/New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green
name = "gummy worm"
@@ -395,10 +391,10 @@
icon_state = "gworm_green"
filling_color = "#365E30"
New()
..()
reagents.add_reagent("limejuice", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/green/New()
..()
reagents.add_reagent("limejuice", 10)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/yellow
name = "gummy worm"
@@ -406,10 +402,10 @@
icon_state = "gworm_yellow"
filling_color = "#863333"
New()
..()
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/yellow/New()
..()
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/orange
name = "gummy worm"
@@ -417,10 +413,10 @@
icon_state = "gworm_orange"
filling_color = "#E78108"
New()
..()
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/orange/New()
..()
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/purple
name = "gummy worm"
@@ -428,10 +424,10 @@
icon_state = "gworm_purple"
filling_color = "#993399"
New()
..()
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/purple/New()
..()
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf
name = "gummy worm"
@@ -439,11 +435,10 @@
icon_state = "gworm_wtf"
filling_color = "#60A584"
New()
..()
reagents.add_reagent("space_drugs", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/gummyworm/wtf/New()
..()
reagents.add_reagent("space_drugs", 2)
bitesize = 3
// ***********************************************************
// Jelly Bean Flavors
@@ -455,10 +450,10 @@
icon_state = "jbean_red"
filling_color = "#801E28"
New()
..()
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/red/New()
..()
reagents.add_reagent("cherryjelly", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/blue
name = "jelly bean"
@@ -466,10 +461,10 @@
icon_state = "jbean_blue"
filling_color = "#863333"
New()
..()
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/blue/New()
..()
reagents.add_reagent("berryjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison
name = "jelly bean"
@@ -477,12 +472,12 @@
icon_state = "jbean_blue"
filling_color = "#863353"
New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/poison/New()
..()
reagents.add_reagent("poisonberryjuice", 12)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/green
name = "jelly bean"
@@ -490,10 +485,10 @@
icon_state = "jbean_green"
filling_color = "#365E30"
New()
..()
reagents.add_reagent("limejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/green/New()
..()
reagents.add_reagent("limejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/yellow
name = "jelly bean"
@@ -501,10 +496,10 @@
icon_state = "jbean_yellow"
filling_color = "#863333"
New()
..()
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/yellow/New()
..()
reagents.add_reagent("lemonjuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/orange
name = "jelly bean"
@@ -512,10 +507,10 @@
icon_state = "jbean_orange"
filling_color = "#E78108"
New()
..()
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/orange/New()
..()
reagents.add_reagent("orangejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/purple
name = "jelly bean"
@@ -523,10 +518,10 @@
icon_state = "jbean_purple"
filling_color = "#993399"
New()
..()
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/purple/New()
..()
reagents.add_reagent("grapejuice", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/chocolate
name = "jelly bean"
@@ -534,10 +529,10 @@
icon_state = "jbean_choc"
filling_color = "#302000"
New()
..()
reagents.add_reagent("chocolate",2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/chocolate/New()
..()
reagents.add_reagent("chocolate",2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/popcorn
name = "jelly bean"
@@ -545,10 +540,10 @@
icon_state = "jbean_popcorn"
filling_color = "#664330"
New()
..()
reagents.add_reagent("nutriment", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/popcorn/New()
..()
reagents.add_reagent("nutriment", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola
name = "jelly bean"
@@ -556,10 +551,10 @@
icon_state = "jbean_cola"
filling_color = "#102000"
New()
..()
reagents.add_reagent("cola", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/cola/New()
..()
reagents.add_reagent("cola", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/drgibb
name = "jelly bean"
@@ -567,10 +562,10 @@
icon_state = "jbean_cola"
filling_color = "#102000"
New()
..()
reagents.add_reagent("dr_gibb", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/drgibb/New()
..()
reagents.add_reagent("dr_gibb", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/coffee
name = "jelly bean"
@@ -578,10 +573,10 @@
icon_state = "jbean_choc"
filling_color = "#482000"
New()
..()
reagents.add_reagent("coffee", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/coffee/New()
..()
reagents.add_reagent("coffee", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf
name = "jelly bean"
@@ -589,10 +584,10 @@
icon_state = "jbean_wtf"
filling_color = "#60A584"
New()
..()
reagents.add_reagent("space_drugs", 2)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/candy/jellybean/wtf/New()
..()
reagents.add_reagent("space_drugs", 2)
bitesize = 3
// ***********************************************************
// Cotton Candy Flavors
@@ -605,10 +600,10 @@
trash = /obj/item/weapon/c_tube
filling_color = "#801E28"
New()
..()
reagents.add_reagent("cherryjelly", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/red/New()
..()
reagents.add_reagent("cherryjelly", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/blue
name = "cotton candy"
@@ -617,10 +612,10 @@
trash = /obj/item/weapon/c_tube
filling_color = "#863333"
New()
..()
reagents.add_reagent("berryjuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/blue/New()
..()
reagents.add_reagent("berryjuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/poison
name = "cotton candy"
@@ -629,12 +624,12 @@
trash = /obj/item/weapon/c_tube
filling_color = "#863353"
New()
..()
reagents.add_reagent("poisonberryjuice", 20)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/poison/New()
..()
reagents.add_reagent("poisonberryjuice", 20)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/green
name = "cotton candy"
@@ -643,10 +638,10 @@
trash = /obj/item/weapon/c_tube
filling_color = "#365E30"
New()
..()
reagents.add_reagent("limejuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/green/New()
..()
reagents.add_reagent("limejuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/yellow
name = "cotton candy"
@@ -655,10 +650,10 @@
trash = /obj/item/weapon/c_tube
filling_color = "#863333"
New()
..()
reagents.add_reagent("lemonjuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/yellow/New()
..()
reagents.add_reagent("lemonjuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/orange
name = "cotton candy"
@@ -667,10 +662,10 @@
trash = /obj/item/weapon/c_tube
filling_color = "#E78108"
New()
..()
reagents.add_reagent("orangejuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/orange/New()
..()
reagents.add_reagent("orangejuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/purple
name = "cotton candy"
@@ -679,10 +674,10 @@
trash = /obj/item/weapon/c_tube
filling_color = "#993399"
New()
..()
reagents.add_reagent("grapejuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/purple/New()
..()
reagents.add_reagent("grapejuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/pink
name = "cotton candy"
@@ -691,10 +686,10 @@
trash = /obj/item/weapon/c_tube
filling_color = "#863333"
New()
..()
reagents.add_reagent("watermelonjuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/pink/New()
..()
reagents.add_reagent("watermelonjuice", 5)
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/rainbow
name = "cotton candy"
@@ -703,12 +698,12 @@
trash = /obj/item/weapon/c_tube
filling_color = "#C8A5DC"
New()
..()
reagents.add_reagent("omnizine", 20)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/rainbow/New()
..()
reagents.add_reagent("omnizine", 20)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/bad_rainbow
name = "cotton candy"
@@ -717,12 +712,12 @@
trash = /obj/item/weapon/c_tube
filling_color = "#32127A"
New()
..()
reagents.add_reagent("sulfonal", 20)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/candy/cotton/bad_rainbow/New()
..()
reagents.add_reagent("sulfonal", 20)
reagents.del_reagent("sugar")
reagents.update_total()
bitesize = 4
// ***********************************************************
// Candybar Flavors
@@ -735,41 +730,26 @@
trash = /obj/item/trash/candy
filling_color = "#7D5F46"
New()
..()
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/toffee
name = "Yum-baton Bar"
desc = "Chocolate and toffee in the shape of a baton. Security sure knows how to pound these down!"
icon_state = "yumbaton"
filling_color = "#7D5F46"
New()
..()
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel
name = "Malper Bar"
desc = "A chocolate syringe filled with a caramel injection. Just what the doctor ordered!"
icon_state = "malper"
filling_color = "#7D5F46"
New()
..()
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel_nougat
name = "Toxins Test Bar"
desc = "An explosive combination of chocolate, caramel, and nougat. Research has never been so tasty!"
icon_state = "toxinstest"
filling_color = "#7D5F46"
New()
..()
/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/nougat
name = "Tool-erone Bar"
desc = "Chocolate-covered nougat, shaped like a wrench. Great for an engineer on the go!"
icon_state = "toolerone"
filling_color = "#7D5F46"
New()
..()