cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-13 17:08:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reagent Fix Pack 1

Browse Source
This commit is contained in:
Archie
2020-12-24 14:30:43 -03:00
parent 5080516eca
commit b2a1a63bb1
9 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+2 -2
View File
@@ -481,7 +481,7 @@
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = FALSE
list_reagents = list("pineapplejuice" = 100)
list_reagents = list(/datum/reagent/consumable/pineapplejuice = 100)
foodtype = FRUIT | PINEAPPLE
/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice
@@ -492,7 +492,7 @@
lefthand_file = 'icons/mob/inhands/equipment/kitchen_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/kitchen_righthand.dmi'
isGlass = FALSE
list_reagents = list("strawberryjuice" = 100)
list_reagents = list(/datum/reagent/consumable/strawberryjuice = 100)
foodtype = FRUIT
/obj/item/reagent_containers/food/drinks/bottle/grenadine
code/modules/food_and_drinks/food/snacks_bread.dm
+2 -2
View File
@@ -185,8 +185,8 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "garlicbread"
item_state = "garlicbread"
bonus_reagents = list("nutriment" = 5, "vitamin" = 2)
list_reagents = list("nutriment" = 5, "vitamin" = 4, "garlic" = 2)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 2)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/nutriment/vitamin = 4, /datum/reagent/consumable/garlic = 2)
bitesize = 3
tastes = list("bread" = 1, "garlic" = 1, "butter" = 1)
foodtype = GRAIN
code/modules/food_and_drinks/food/snacks_other.dm
+1 -1
View File
@@ -542,7 +542,7 @@
desc = "A sliced piece of juicy pineapple."
icon_state = "pineapple_slice"
filling_color = "#F6CB0B"
juice_results = list("pineapplejuice" = 3)
juice_results = list(/datum/reagent/consumable/pineapplejuice = 3)
tastes = list("pineapple" = 1)
foodtype = FRUIT | PINEAPPLE
code/modules/food_and_drinks/food/snacks_vend.dm
+2 -2
View File
@@ -85,7 +85,7 @@
desc = "fine print: seasoned with nanoscale mechanochemical generators. Not only does it taste good, But also self-heats when opened"
icon_state = "soyfood"
trash = /obj/item/trash/soy_food
list_reagents = list("nutriment" = 4, "sugar" = 2, "vitamin" = 3)
list_reagents = list(/datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/sugar = 2, /datum/reagent/consumable/nutriment/vitamin = 3)
junkiness = 0
filling_color = "#FFD700"
tastes = list("nanomachines" = 2, "soybeans" = 5)
@@ -106,7 +106,7 @@
desc = "A self-heating bag of hollowed charcoal noodles with a spicy soy sauce glaze. Does contain small traces of charcoal."
icon_state = "carbonnanotube_noodles"
trash = /obj/item/trash/carbonnanotube_noodles
list_reagents = list("nutriment" = 5, "charcoal" = 1, "vitamin" = 4)
list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/charcoal = 1, /datum/reagent/consumable/nutriment/vitamin = 4)
junkiness = 0
filling_color = "#FFD700"
tastes = list("charcoal" = 1, "spiciness" = 3, "soysauce" = 3)
code/modules/food_and_drinks/recipes/drinks_recipes.dm
+28 -28
View File
@@ -305,13 +305,13 @@
name = "Painkiller"
id = "painkiller"
results = list("painkiller" = 10)
required_reagents = list("creme_de_coconut" = 5, "pineapplejuice" = 4, "orangejuice" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 5, /datum/reagent/consumable/pineapplejuice = 4, /datum/reagent/consumable/orangejuice = 1)
/datum/chemical_reaction/pina_colada
name = "Pina Colada"
id = "pina_colada"
results = list("pina_colada" = 5)
required_reagents = list("creme_de_coconut" = 1, "pineapplejuice" = 2, "rum" = 1, "limejuice" = 1)
required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/pineapplejuice = 2, /datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/limejuice = 1)
////DRINKS THAT REQUIRED IMPROVED SPRITES BELOW:: -Agouri/////
@@ -497,13 +497,13 @@
name = "Cherry Shake"
id = "cherryshake"
results = list("cherryshake" = 3)
required_reagents = list("cherryjelly" = 1, "ice" = 1, "cream" = 1)
required_reagents = list(/datum/reagent/consumable/cherryjelly = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)
/datum/chemical_reaction/bluecherryshake
name = "Blue Cherry Shake"
id = "bluecherryshake"
results = list("bluecherryshake" = 3)
required_reagents = list("bluecherryjelly" = 1, "ice" = 1, "cream" = 1)
required_reagents = list(/datum/reagent/consumable/bluecherryjelly = 1, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)
/datum/chemical_reaction/drunkenblumpkin
name = "Drunken Blumpkin"
@@ -837,54 +837,54 @@
/datum/chemical_reaction/gunfire
name = "Gunfire"
id = "gunfire"
results = list("gunfire" = 4)
required_reagents = list("rum" = 1, "tea" = 3)
id = /datum/reagent/consumable/ethanol/gunfire
results = list(/datum/reagent/consumable/ethanol/gunfire = 4)
required_reagents = list(/datum/reagent/consumable/ethanol/rum = 1, /datum/reagent/consumable/tea = 3)
mix_message = "A loud popping begins to fill the air as the drink is mixed."
/datum/chemical_reaction/hellfire
name = "Hellfire"
id = "hellfire"
results = list("hellfire" = 4)
required_reagents = list("rum" = 2, "ice" = 1, "crevice_spike" = 1)
id = /datum/reagent/consumable/ethanol/hellfire
results = list(/datum/reagent/consumable/ethanol/hellfire = 4)
required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/ethanol/crevice_spike = 1)
mix_message = "The liquid begins to churn as it changes to an amber orange and catches on fire."
/datum/chemical_reaction/sins_delight
name = "Sins Delight"
id = "sins_delight"
results = list("sins_delight" = 5)
required_reagents = list("demonsblood" = 2, "triple_sec" = 1, "martini" = 1, "changelingsting" = 1)
id = /datum/reagent/consumable/ethanol/sins_delight
results = list(/datum/reagent/consumable/ethanol/sins_delight = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/demonsblood = 2, /datum/reagent/consumable/ethanol/triple_sec = 1, /datum/reagent/consumable/ethanol/martini = 1, /datum/reagent/consumable/ethanol/changelingsting = 1)
mix_message = "The liquid starts swirling, before forming a pink cloud that dissipates in the air."
/datum/chemical_reaction/strawberry_daiquiri
name = "Strawberry Daiquiri"
id = "strawberry_daiquiri"
results = list("strawberry_daiquiri" = 7)
required_reagents = list("rum" = 2, "limejuice" = 1, "sugar" = 1, "strawberryjuice" = 2, "ice" = 1)
id = /datum/reagent/consumable/ethanol/strawberry_daiquiri
results = list(/datum/reagent/consumable/ethanol/strawberry_daiquiri = 7)
required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/sugar = 1, /datum/reagent/consumable/strawberryjuice = 2, /datum/reagent/consumable/ice = 1)
/datum/chemical_reaction/miami_vice
name = "Miami Vice"
id = "miami_vice"
results = list("miami_vice" = 2)
required_reagents = list("pina_colada" = 1, "strawberry_daiquiri" = 1)
id = /datum/reagent/consumable/ethanol/miami_vice
results = list(/datum/reagent/consumable/ethanol/miami_vice = 2)
required_reagents = list(/datum/reagent/consumable/ethanol/pina_colada = 1, /datum/reagent/consumable/ethanol/strawberry_daiquiri = 1)
/datum/chemical_reaction/malibu_sunset
name = "Malibu Sunset"
id = "malibu_sunset"
results = list("malibu_sunset" = 5)
required_reagents = list("creme_de_coconut" = 1, "pineapplejuice" = 1, "grenadine" = 1, "orangejuice" = 1, "ice" = 1)
id = /datum/reagent/consumable/ethanol/malibu_sunset
results = list(/datum/reagent/consumable/ethanol/malibu_sunset = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/creme_de_coconut = 1, /datum/reagent/consumable/pineapplejuice = 1, /datum/reagent/consumable/grenadine = 1, /datum/reagent/consumable/orangejuice = 1, /datum/reagent/consumable/ice = 1)
/datum/chemical_reaction/liz_fizz
name = "Liz Fizz"
id = "liz_fizz"
results = list("liz_fizz" = 5)
required_reagents = list("triple_citrus" = 3, "ice" = 1, "cream" = 1)
id = /datum/reagent/consumable/ethanol/liz_fizz
results = list(/datum/reagent/consumable/ethanol/liz_fizz = 5)
required_reagents = list(/datum/reagent/consumable/triple_citrus = 3, /datum/reagent/consumable/ice = 1, /datum/reagent/consumable/cream = 1)
/datum/chemical_reaction/hotlime_miami
name = "Hotlime Miami"
id = "hotlime_miami"
results = list("hotlime_miami" = 2)
required_reagents = list("ephedrine" = 1, "pina_colada" = 1)
id = /datum/reagent/consumable/ethanol/hotlime_miami
results = list(/datum/reagent/consumable/ethanol/hotlime_miami = 2)
required_reagents = list(/datum/reagent/medicine/ephedrine = 1, /datum/reagent/consumable/ethanol/pina_colada = 1)
/datum/chemical_reaction/commander_and_chief
name = "Commander and Chief"
code/modules/hydroponics/grown/pineapple.dm
+1 -1
View File
@@ -30,6 +30,6 @@
filling_color = "#F6CB0B"
w_class = WEIGHT_CLASS_NORMAL
foodtype = FRUIT | PINEAPPLE
juice_results = list("pineapplejuice" = 0)
juice_results = list(/datum/reagent/consumable/pineapplejuice = 1)
tastes = list("pineapple" = 1)
wine_power = 40
code/modules/reagents/reagent_containers/glass.dm
+1 -1
View File
@@ -365,7 +365,7 @@
desc = "Finally, a bottle as proportionate as you. Incredible!"
icon = 'icons/obj/drinks.dmi'
icon_state = "wataur"
list_reagents = list("water" = 100) //robust ass wataur
list_reagents = list(/datum/reagent/water = 100) //robust ass wataur
volume = 100
amount_per_transfer_from_this = 20
container_HP = 1