mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
# Conflicts: # code/modules/mob/living/simple_animal/hostile/giant_spider.dm # code/modules/organs/blood.dm # code/modules/organs/internal/lungs.dm # code/modules/organs/organ.dm # code/modules/organs/organ_external.dm
This commit is contained in:
Anewbe
@@ -47,27 +47,27 @@
|
||||
|
||||
/obj/machinery/chem_master/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob)
|
||||
|
||||
if(istype(B, /obj/item/weapon/reagent_containers/glass))
|
||||
if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food))
|
||||
|
||||
if(src.beaker)
|
||||
user << "A beaker is already loaded into the machine."
|
||||
user << "\A [beaker] is already loaded into the machine."
|
||||
return
|
||||
src.beaker = B
|
||||
user.drop_item()
|
||||
B.loc = src
|
||||
user << "You add the beaker to the machine!"
|
||||
user << "You add \the [B] to the machine!"
|
||||
icon_state = "mixer1"
|
||||
|
||||
else if(istype(B, /obj/item/weapon/storage/pill_bottle))
|
||||
|
||||
if(src.loaded_pill_bottle)
|
||||
user << "A pill bottle is already loaded into the machine."
|
||||
user << "A \the [loaded_pill_bottle] s already loaded into the machine."
|
||||
return
|
||||
|
||||
src.loaded_pill_bottle = B
|
||||
user.drop_item()
|
||||
B.loc = src
|
||||
user << "You add the pill bottle into the dispenser slot!"
|
||||
user << "You add \the [loaded_pill_bottle] into the dispenser slot!"
|
||||
return
|
||||
|
||||
/obj/machinery/chem_master/attack_hand(mob/user as mob)
|
||||
|
||||
@@ -28,9 +28,10 @@
|
||||
var/totalFlavor = 0
|
||||
for(var/taste in data)
|
||||
totalFlavor += data[taste]
|
||||
for(var/taste in data)
|
||||
if(data[taste]/totalFlavor < 0.1)
|
||||
data -= taste
|
||||
if(totalFlavor) //Let's not divide by zero for things w/o taste
|
||||
for(var/taste in data)
|
||||
if(data[taste]/totalFlavor < 0.1)
|
||||
data -= taste
|
||||
|
||||
/datum/reagent/nutriment/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
|
||||
if(!injectable)
|
||||
@@ -114,7 +115,7 @@
|
||||
M.drowsyness = max(M.drowsyness, 60)
|
||||
|
||||
/datum/reagent/nutriment/flour
|
||||
name = "flour"
|
||||
name = "Flour"
|
||||
id = "flour"
|
||||
description = "This is what you rub all over yourself to pretend to be a ghost."
|
||||
taste_description = "chalky wheat"
|
||||
@@ -699,6 +700,71 @@
|
||||
cup_name = "cup of iced tea"
|
||||
cup_desc = "No relation to a certain rap artist/ actor."
|
||||
|
||||
/datum/reagent/drink/tea/minttea
|
||||
name = "Mint Tea"
|
||||
id = "minttea"
|
||||
description = "A tasty mixture of mint and tea. It's apparently good for you!"
|
||||
color = "#A8442C"
|
||||
taste_description = "black tea with tones of mint"
|
||||
|
||||
glass_name = "mint tea"
|
||||
glass_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
|
||||
|
||||
cup_name = "cup of mint tea"
|
||||
cup_desc = "A tasty mixture of mint and tea. It's apparently good for you!"
|
||||
|
||||
/datum/reagent/drink/tea/lemontea
|
||||
name = "Lemon Tea"
|
||||
id = "lemontea"
|
||||
description = "A tasty mixture of lemon and tea. It's apparently good for you!"
|
||||
color = "#FC6A00"
|
||||
taste_description = "black tea with tones of lemon"
|
||||
|
||||
glass_name = "lemon tea"
|
||||
glass_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
|
||||
|
||||
cup_name = "cup of lemon tea"
|
||||
cup_desc = "A tasty mixture of lemon and tea. It's apparently good for you!"
|
||||
|
||||
/datum/reagent/drink/tea/limetea
|
||||
name = "Lime Tea"
|
||||
id = "limetea"
|
||||
description = "A tasty mixture of lime and tea. It's apparently good for you!"
|
||||
color = "#DE4300"
|
||||
taste_description = "black tea with tones of lime"
|
||||
|
||||
glass_name = "lime tea"
|
||||
glass_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
|
||||
|
||||
cup_name = "cup of berry tea"
|
||||
cup_desc = "A tasty mixture of lime and tea. It's apparently good for you!"
|
||||
|
||||
/datum/reagent/drink/tea/orangetea
|
||||
name = "Orange Tea"
|
||||
id = "orangetea"
|
||||
description = "A tasty mixture of orange and tea. It's apparently good for you!"
|
||||
color = "#FB4F06"
|
||||
taste_description = "black tea with tones of orange"
|
||||
|
||||
glass_name = "orange tea"
|
||||
glass_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
|
||||
|
||||
cup_name = "cup of orange tea"
|
||||
cup_desc = "A tasty mixture of orange and tea. It's apparently good for you!"
|
||||
|
||||
/datum/reagent/drink/tea/berrytea
|
||||
name = "Berry Tea"
|
||||
id = "berrytea"
|
||||
description = "A tasty mixture of berries and tea. It's apparently good for you!"
|
||||
color = "#A60735"
|
||||
taste_description = "black tea with tones of berries"
|
||||
|
||||
glass_name = "berry tea"
|
||||
glass_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
|
||||
|
||||
cup_name = "cup of berry tea"
|
||||
cup_desc = "A tasty mixture of berries and tea. It's apparently good for you!"
|
||||
|
||||
/datum/reagent/drink/coffee
|
||||
name = "Coffee"
|
||||
id = "coffee"
|
||||
@@ -2165,3 +2231,4 @@
|
||||
|
||||
glass_name = "special blend whiskey"
|
||||
glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
|
||||
|
||||
|
||||
@@ -581,7 +581,6 @@
|
||||
required_reagents = list("mindbreaker" = 1, "carbon" = 1)
|
||||
result_amount = 3
|
||||
|
||||
|
||||
/datum/chemical_reaction/paroxetine
|
||||
name = "Paroxetine"
|
||||
id = "paroxetine"
|
||||
@@ -589,6 +588,20 @@
|
||||
required_reagents = list("mindbreaker" = 1, "oxygen" = 1, "inaprovaline" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/neurotoxin
|
||||
name = "Neurotoxin"
|
||||
id = "neurotoxin"
|
||||
result = "neurotoxin"
|
||||
required_reagents = list("gargleblaster" = 1, "stoxin" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/luminol
|
||||
name = "Luminol"
|
||||
id = "luminol"
|
||||
result = "luminol"
|
||||
required_reagents = list("hydrogen" = 2, "carbon" = 2, "ammonia" = 2)
|
||||
result_amount = 6
|
||||
|
||||
/* Solidification */
|
||||
|
||||
/datum/chemical_reaction/phoronsolidification
|
||||
@@ -676,7 +689,7 @@
|
||||
var/location = get_turf(holder.my_atom)
|
||||
// 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
|
||||
// 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
|
||||
empulse(location, round(created_volume / 24), round(created_volume / 14), 1)
|
||||
empulse(location, round(created_volume / 24), round(created_volume / 20), round(created_volume / 18), round(created_volume / 14), 1)
|
||||
holder.clear_reagents()
|
||||
return
|
||||
|
||||
@@ -1051,7 +1064,7 @@
|
||||
|
||||
/* Food */
|
||||
|
||||
/datum/chemical_reaction/tofu
|
||||
/datum/chemical_reaction/food/tofu
|
||||
name = "Tofu"
|
||||
id = "tofu"
|
||||
result = null
|
||||
@@ -1059,60 +1072,60 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 1
|
||||
|
||||
/datum/chemical_reaction/tofu/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
/datum/chemical_reaction/food/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
|
||||
|
||||
/datum/chemical_reaction/chocolate_bar
|
||||
/datum/chemical_reaction/food/chocolate_bar
|
||||
name = "Chocolate Bar"
|
||||
id = "chocolate_bar"
|
||||
result = null
|
||||
required_reagents = list("soymilk" = 2, "coco" = 2, "sugar" = 2)
|
||||
result_amount = 1
|
||||
|
||||
/datum/chemical_reaction/chocolate_bar/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
/datum/chemical_reaction/food/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
|
||||
|
||||
/datum/chemical_reaction/chocolate_bar2
|
||||
/datum/chemical_reaction/food/chocolate_bar2
|
||||
name = "Chocolate Bar"
|
||||
id = "chocolate_bar"
|
||||
result = null
|
||||
required_reagents = list("milk" = 2, "coco" = 2, "sugar" = 2)
|
||||
result_amount = 1
|
||||
|
||||
/datum/chemical_reaction/chocolate_bar2/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
/datum/chemical_reaction/food/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
|
||||
|
||||
/datum/chemical_reaction/hot_coco
|
||||
/datum/chemical_reaction/drinks/hot_coco
|
||||
name = "Hot Coco"
|
||||
id = "hot_coco"
|
||||
result = "hot_coco"
|
||||
required_reagents = list("water" = 5, "coco" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/soysauce
|
||||
/datum/chemical_reaction/food/soysauce
|
||||
name = "Soy Sauce"
|
||||
id = "soysauce"
|
||||
result = "soysauce"
|
||||
required_reagents = list("soymilk" = 4, "sacid" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/ketchup
|
||||
/datum/chemical_reaction/food/ketchup
|
||||
name = "Ketchup"
|
||||
id = "ketchup"
|
||||
result = "ketchup"
|
||||
required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
|
||||
result_amount = 4
|
||||
|
||||
/datum/chemical_reaction/cheesewheel
|
||||
/datum/chemical_reaction/food/cheesewheel
|
||||
name = "Cheesewheel"
|
||||
id = "cheesewheel"
|
||||
result = null
|
||||
@@ -1120,46 +1133,46 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 1
|
||||
|
||||
/datum/chemical_reaction/cheesewheel/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
/datum/chemical_reaction/food/cheesewheel/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/sliceable/cheesewheel(location)
|
||||
return
|
||||
|
||||
/datum/chemical_reaction/meatball
|
||||
/datum/chemical_reaction/food/meatball
|
||||
name = "Meatball"
|
||||
id = "meatball"
|
||||
result = null
|
||||
required_reagents = list("protein" = 3, "flour" = 5)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/meatball/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
/datum/chemical_reaction/food/meatball/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/meatball(location)
|
||||
return
|
||||
|
||||
/datum/chemical_reaction/dough
|
||||
/datum/chemical_reaction/food/dough
|
||||
name = "Dough"
|
||||
id = "dough"
|
||||
result = null
|
||||
required_reagents = list("egg" = 3, "flour" = 10)
|
||||
result_amount = 1
|
||||
|
||||
/datum/chemical_reaction/dough/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
/datum/chemical_reaction/food/dough/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/dough(location)
|
||||
return
|
||||
|
||||
/datum/chemical_reaction/syntiflesh
|
||||
/datum/chemical_reaction/food/syntiflesh
|
||||
name = "Syntiflesh"
|
||||
id = "syntiflesh"
|
||||
result = null
|
||||
required_reagents = list("blood" = 5, "clonexadone" = 1)
|
||||
result_amount = 1
|
||||
|
||||
/datum/chemical_reaction/syntiflesh/on_reaction(var/datum/reagents/holder, var/created_volume)
|
||||
/datum/chemical_reaction/food/syntiflesh/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/meat/syntiflesh(location)
|
||||
@@ -1181,49 +1194,49 @@
|
||||
|
||||
/* Alcohol */
|
||||
|
||||
/datum/chemical_reaction/goldschlager
|
||||
/datum/chemical_reaction/drinks/goldschlager
|
||||
name = "Goldschlager"
|
||||
id = "goldschlager"
|
||||
result = "goldschlager"
|
||||
required_reagents = list("vodka" = 10, "gold" = 1)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/patron
|
||||
/datum/chemical_reaction/drinks/patron
|
||||
name = "Patron"
|
||||
id = "patron"
|
||||
result = "patron"
|
||||
required_reagents = list("tequilla" = 10, "silver" = 1)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/bilk
|
||||
/datum/chemical_reaction/drinks/bilk
|
||||
name = "Bilk"
|
||||
id = "bilk"
|
||||
result = "bilk"
|
||||
required_reagents = list("milk" = 1, "beer" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/icetea
|
||||
/datum/chemical_reaction/drinks/icetea
|
||||
name = "Iced Tea"
|
||||
id = "icetea"
|
||||
result = "icetea"
|
||||
required_reagents = list("ice" = 1, "tea" = 2)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/icecoffee
|
||||
/datum/chemical_reaction/drinks/icecoffee
|
||||
name = "Iced Coffee"
|
||||
id = "icecoffee"
|
||||
result = "icecoffee"
|
||||
required_reagents = list("ice" = 1, "coffee" = 2)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/nuka_cola
|
||||
/datum/chemical_reaction/drinks/nuka_cola
|
||||
name = "Nuka Cola"
|
||||
id = "nuka_cola"
|
||||
result = "nuka_cola"
|
||||
required_reagents = list("uranium" = 1, "cola" = 5)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/moonshine
|
||||
/datum/chemical_reaction/drinks/moonshine
|
||||
name = "Moonshine"
|
||||
id = "moonshine"
|
||||
result = "moonshine"
|
||||
@@ -1231,7 +1244,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/grenadine
|
||||
/datum/chemical_reaction/drinks/grenadine
|
||||
name = "Grenadine Syrup"
|
||||
id = "grenadine"
|
||||
result = "grenadine"
|
||||
@@ -1239,7 +1252,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/wine
|
||||
/datum/chemical_reaction/drinks/wine
|
||||
name = "Wine"
|
||||
id = "wine"
|
||||
result = "wine"
|
||||
@@ -1247,7 +1260,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/pwine
|
||||
/datum/chemical_reaction/drinks/pwine
|
||||
name = "Poison Wine"
|
||||
id = "pwine"
|
||||
result = "pwine"
|
||||
@@ -1255,7 +1268,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/melonliquor
|
||||
/datum/chemical_reaction/drinks/melonliquor
|
||||
name = "Melon Liquor"
|
||||
id = "melonliquor"
|
||||
result = "melonliquor"
|
||||
@@ -1263,7 +1276,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/bluecuracao
|
||||
/datum/chemical_reaction/drinks/bluecuracao
|
||||
name = "Blue Curacao"
|
||||
id = "bluecuracao"
|
||||
result = "bluecuracao"
|
||||
@@ -1271,7 +1284,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/spacebeer
|
||||
/datum/chemical_reaction/drinks/spacebeer
|
||||
name = "Space Beer"
|
||||
id = "spacebeer"
|
||||
result = "beer"
|
||||
@@ -1279,7 +1292,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/vodka
|
||||
/datum/chemical_reaction/drinks/vodka
|
||||
name = "Vodka"
|
||||
id = "vodka"
|
||||
result = "vodka"
|
||||
@@ -1287,7 +1300,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/sake
|
||||
/datum/chemical_reaction/drinks/sake
|
||||
name = "Sake"
|
||||
id = "sake"
|
||||
result = "sake"
|
||||
@@ -1295,7 +1308,7 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/kahlua
|
||||
/datum/chemical_reaction/drinks/kahlua
|
||||
name = "Kahlua"
|
||||
id = "kahlua"
|
||||
result = "kahlua"
|
||||
@@ -1303,287 +1316,287 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/gin_tonic
|
||||
/datum/chemical_reaction/drinks/gin_tonic
|
||||
name = "Gin and Tonic"
|
||||
id = "gintonic"
|
||||
result = "gintonic"
|
||||
required_reagents = list("gin" = 2, "tonic" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/cuba_libre
|
||||
/datum/chemical_reaction/drinks/cuba_libre
|
||||
name = "Cuba Libre"
|
||||
id = "cubalibre"
|
||||
result = "cubalibre"
|
||||
required_reagents = list("rum" = 2, "cola" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/martini
|
||||
/datum/chemical_reaction/drinks/martini
|
||||
name = "Classic Martini"
|
||||
id = "martini"
|
||||
result = "martini"
|
||||
required_reagents = list("gin" = 2, "vermouth" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/vodkamartini
|
||||
/datum/chemical_reaction/drinks/vodkamartini
|
||||
name = "Vodka Martini"
|
||||
id = "vodkamartini"
|
||||
result = "vodkamartini"
|
||||
required_reagents = list("vodka" = 2, "vermouth" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/white_russian
|
||||
/datum/chemical_reaction/drinks/white_russian
|
||||
name = "White Russian"
|
||||
id = "whiterussian"
|
||||
result = "whiterussian"
|
||||
required_reagents = list("blackrussian" = 2, "cream" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/whiskey_cola
|
||||
/datum/chemical_reaction/drinks/whiskey_cola
|
||||
name = "Whiskey Cola"
|
||||
id = "whiskeycola"
|
||||
result = "whiskeycola"
|
||||
required_reagents = list("whiskey" = 2, "cola" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/screwdriver
|
||||
/datum/chemical_reaction/drinks/screwdriver
|
||||
name = "Screwdriver"
|
||||
id = "screwdrivercocktail"
|
||||
result = "screwdrivercocktail"
|
||||
required_reagents = list("vodka" = 2, "orangejuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/bloody_mary
|
||||
/datum/chemical_reaction/drinks/bloody_mary
|
||||
name = "Bloody Mary"
|
||||
id = "bloodymary"
|
||||
result = "bloodymary"
|
||||
required_reagents = list("vodka" = 2, "tomatojuice" = 3, "limejuice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/gargle_blaster
|
||||
/datum/chemical_reaction/drinks/gargle_blaster
|
||||
name = "Pan-Galactic Gargle Blaster"
|
||||
id = "gargleblaster"
|
||||
result = "gargleblaster"
|
||||
required_reagents = list("vodka" = 2, "gin" = 1, "whiskey" = 1, "cognac" = 1, "limejuice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/brave_bull
|
||||
/datum/chemical_reaction/drinks/brave_bull
|
||||
name = "Brave Bull"
|
||||
id = "bravebull"
|
||||
result = "bravebull"
|
||||
required_reagents = list("tequilla" = 2, "kahlua" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/tequilla_sunrise
|
||||
/datum/chemical_reaction/drinks/tequilla_sunrise
|
||||
name = "Tequilla Sunrise"
|
||||
id = "tequillasunrise"
|
||||
result = "tequillasunrise"
|
||||
required_reagents = list("tequilla" = 2, "orangejuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/phoron_special
|
||||
/datum/chemical_reaction/drinks/phoron_special
|
||||
name = "Toxins Special"
|
||||
id = "phoronspecial"
|
||||
result = "phoronspecial"
|
||||
required_reagents = list("rum" = 2, "vermouth" = 2, "phoron" = 2)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/beepsky_smash
|
||||
/datum/chemical_reaction/drinks/beepsky_smash
|
||||
name = "Beepksy Smash"
|
||||
id = "beepksysmash"
|
||||
result = "beepskysmash"
|
||||
required_reagents = list("limejuice" = 1, "whiskey" = 1, "iron" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/doctor_delight
|
||||
/datum/chemical_reaction/drinks/doctor_delight
|
||||
name = "The Doctor's Delight"
|
||||
id = "doctordelight"
|
||||
result = "doctorsdelight"
|
||||
required_reagents = list("limejuice" = 1, "tomatojuice" = 1, "orangejuice" = 1, "cream" = 2, "tricordrazine" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/irish_cream
|
||||
/datum/chemical_reaction/drinks/irish_cream
|
||||
name = "Irish Cream"
|
||||
id = "irishcream"
|
||||
result = "irishcream"
|
||||
required_reagents = list("whiskey" = 2, "cream" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/manly_dorf
|
||||
/datum/chemical_reaction/drinks/manly_dorf
|
||||
name = "The Manly Dorf"
|
||||
id = "manlydorf"
|
||||
result = "manlydorf"
|
||||
required_reagents = list ("beer" = 1, "ale" = 2)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/hooch
|
||||
/datum/chemical_reaction/drinks/hooch
|
||||
name = "Hooch"
|
||||
id = "hooch"
|
||||
result = "hooch"
|
||||
required_reagents = list ("sugar" = 1, "ethanol" = 2, "fuel" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/irish_coffee
|
||||
/datum/chemical_reaction/drinks/irish_coffee
|
||||
name = "Irish Coffee"
|
||||
id = "irishcoffee"
|
||||
result = "irishcoffee"
|
||||
required_reagents = list("irishcream" = 1, "coffee" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/b52
|
||||
/datum/chemical_reaction/drinks/b52
|
||||
name = "B-52"
|
||||
id = "b52"
|
||||
result = "b52"
|
||||
required_reagents = list("irishcream" = 1, "kahlua" = 1, "cognac" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/atomicbomb
|
||||
/datum/chemical_reaction/drinks/atomicbomb
|
||||
name = "Atomic Bomb"
|
||||
id = "atomicbomb"
|
||||
result = "atomicbomb"
|
||||
required_reagents = list("b52" = 10, "uranium" = 1)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/margarita
|
||||
/datum/chemical_reaction/drinks/margarita
|
||||
name = "Margarita"
|
||||
id = "margarita"
|
||||
result = "margarita"
|
||||
required_reagents = list("tequilla" = 2, "limejuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/longislandicedtea
|
||||
/datum/chemical_reaction/drinks/longislandicedtea
|
||||
name = "Long Island Iced Tea"
|
||||
id = "longislandicedtea"
|
||||
result = "longislandicedtea"
|
||||
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/icedtea
|
||||
/datum/chemical_reaction/drinks/icedtea
|
||||
name = "Long Island Iced Tea"
|
||||
id = "longislandicedtea"
|
||||
result = "longislandicedtea"
|
||||
required_reagents = list("vodka" = 1, "gin" = 1, "tequilla" = 1, "cubalibre" = 3)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/threemileisland
|
||||
/datum/chemical_reaction/drinks/threemileisland
|
||||
name = "Three Mile Island Iced Tea"
|
||||
id = "threemileisland"
|
||||
result = "threemileisland"
|
||||
required_reagents = list("longislandicedtea" = 10, "uranium" = 1)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/whiskeysoda
|
||||
/datum/chemical_reaction/drinks/whiskeysoda
|
||||
name = "Whiskey Soda"
|
||||
id = "whiskeysoda"
|
||||
result = "whiskeysoda"
|
||||
required_reagents = list("whiskey" = 2, "sodawater" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/black_russian
|
||||
/datum/chemical_reaction/drinks/black_russian
|
||||
name = "Black Russian"
|
||||
id = "blackrussian"
|
||||
result = "blackrussian"
|
||||
required_reagents = list("vodka" = 2, "kahlua" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/manhattan
|
||||
/datum/chemical_reaction/drinks/manhattan
|
||||
name = "Manhattan"
|
||||
id = "manhattan"
|
||||
result = "manhattan"
|
||||
required_reagents = list("whiskey" = 2, "vermouth" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/manhattan_proj
|
||||
/datum/chemical_reaction/drinks/manhattan_proj
|
||||
name = "Manhattan Project"
|
||||
id = "manhattan_proj"
|
||||
result = "manhattan_proj"
|
||||
required_reagents = list("manhattan" = 10, "uranium" = 1)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/vodka_tonic
|
||||
/datum/chemical_reaction/drinks/vodka_tonic
|
||||
name = "Vodka and Tonic"
|
||||
id = "vodkatonic"
|
||||
result = "vodkatonic"
|
||||
required_reagents = list("vodka" = 2, "tonic" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/gin_fizz
|
||||
/datum/chemical_reaction/drinks/gin_fizz
|
||||
name = "Gin Fizz"
|
||||
id = "ginfizz"
|
||||
result = "ginfizz"
|
||||
required_reagents = list("gin" = 1, "sodawater" = 1, "limejuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/bahama_mama
|
||||
/datum/chemical_reaction/drinks/bahama_mama
|
||||
name = "Bahama mama"
|
||||
id = "bahama_mama"
|
||||
result = "bahama_mama"
|
||||
required_reagents = list("rum" = 2, "orangejuice" = 2, "limejuice" = 1, "ice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/singulo
|
||||
/datum/chemical_reaction/drinks/singulo
|
||||
name = "Singulo"
|
||||
id = "singulo"
|
||||
result = "singulo"
|
||||
required_reagents = list("vodka" = 5, "radium" = 1, "wine" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/alliescocktail
|
||||
/datum/chemical_reaction/drinks/alliescocktail
|
||||
name = "Allies Cocktail"
|
||||
id = "alliescocktail"
|
||||
result = "alliescocktail"
|
||||
required_reagents = list("martini" = 1, "vodka" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/demonsblood
|
||||
/datum/chemical_reaction/drinks/demonsblood
|
||||
name = "Demons Blood"
|
||||
id = "demonsblood"
|
||||
result = "demonsblood"
|
||||
required_reagents = list("rum" = 3, "spacemountainwind" = 1, "blood" = 1, "dr_gibb" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/booger
|
||||
/datum/chemical_reaction/drinks/booger
|
||||
name = "Booger"
|
||||
id = "booger"
|
||||
result = "booger"
|
||||
required_reagents = list("cream" = 2, "banana" = 1, "rum" = 1, "watermelonjuice" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/antifreeze
|
||||
/datum/chemical_reaction/drinks/antifreeze
|
||||
name = "Anti-freeze"
|
||||
id = "antifreeze"
|
||||
result = "antifreeze"
|
||||
required_reagents = list("vodka" = 1, "cream" = 1, "ice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/barefoot
|
||||
/datum/chemical_reaction/drinks/barefoot
|
||||
name = "Barefoot"
|
||||
id = "barefoot"
|
||||
result = "barefoot"
|
||||
required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/grapesoda
|
||||
/datum/chemical_reaction/drinks/grapesoda
|
||||
name = "Grape Soda"
|
||||
id = "grapesoda"
|
||||
result = "grapesoda"
|
||||
required_reagents = list("grapejuice" = 2, "cola" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/sbiten
|
||||
/datum/chemical_reaction/drinks/sbiten
|
||||
name = "Sbiten"
|
||||
id = "sbiten"
|
||||
result = "sbiten"
|
||||
required_reagents = list("vodka" = 10, "capsaicin" = 1)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/red_mead
|
||||
/datum/chemical_reaction/drinks/red_mead
|
||||
name = "Red Mead"
|
||||
id = "red_mead"
|
||||
result = "red_mead"
|
||||
required_reagents = list("blood" = 1, "mead" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/mead
|
||||
/datum/chemical_reaction/drinks/mead
|
||||
name = "Mead"
|
||||
id = "mead"
|
||||
result = "mead"
|
||||
@@ -1591,219 +1604,240 @@
|
||||
catalysts = list("enzyme" = 5)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/iced_beer
|
||||
/datum/chemical_reaction/drinks/iced_beer
|
||||
name = "Iced Beer"
|
||||
id = "iced_beer"
|
||||
result = "iced_beer"
|
||||
required_reagents = list("beer" = 10, "frostoil" = 1)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/iced_beer2
|
||||
/datum/chemical_reaction/drinks/iced_beer2
|
||||
name = "Iced Beer"
|
||||
id = "iced_beer"
|
||||
result = "iced_beer"
|
||||
required_reagents = list("beer" = 5, "ice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/grog
|
||||
/datum/chemical_reaction/drinks/grog
|
||||
name = "Grog"
|
||||
id = "grog"
|
||||
result = "grog"
|
||||
required_reagents = list("rum" = 1, "water" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/soy_latte
|
||||
/datum/chemical_reaction/drinks/soy_latte
|
||||
name = "Soy Latte"
|
||||
id = "soy_latte"
|
||||
result = "soy_latte"
|
||||
required_reagents = list("coffee" = 1, "soymilk" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/cafe_latte
|
||||
/datum/chemical_reaction/drinks/cafe_latte
|
||||
name = "Cafe Latte"
|
||||
id = "cafe_latte"
|
||||
result = "cafe_latte"
|
||||
required_reagents = list("coffee" = 1, "milk" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/acidspit
|
||||
/datum/chemical_reaction/drinks/acidspit
|
||||
name = "Acid Spit"
|
||||
id = "acidspit"
|
||||
result = "acidspit"
|
||||
required_reagents = list("sacid" = 1, "wine" = 5)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/amasec
|
||||
/datum/chemical_reaction/drinks/amasec
|
||||
name = "Amasec"
|
||||
id = "amasec"
|
||||
result = "amasec"
|
||||
required_reagents = list("iron" = 1, "wine" = 5, "vodka" = 5)
|
||||
result_amount = 10
|
||||
|
||||
/datum/chemical_reaction/changelingsting
|
||||
/datum/chemical_reaction/drinks/changelingsting
|
||||
name = "Changeling Sting"
|
||||
id = "changelingsting"
|
||||
result = "changelingsting"
|
||||
required_reagents = list("screwdrivercocktail" = 1, "limejuice" = 1, "lemonjuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/aloe
|
||||
/datum/chemical_reaction/drinks/aloe
|
||||
name = "Aloe"
|
||||
id = "aloe"
|
||||
result = "aloe"
|
||||
required_reagents = list("cream" = 1, "whiskey" = 1, "watermelonjuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/andalusia
|
||||
/datum/chemical_reaction/drinks/andalusia
|
||||
name = "Andalusia"
|
||||
id = "andalusia"
|
||||
result = "andalusia"
|
||||
required_reagents = list("rum" = 1, "whiskey" = 1, "lemonjuice" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/neurotoxin
|
||||
name = "Neurotoxin"
|
||||
id = "neurotoxin"
|
||||
result = "neurotoxin"
|
||||
required_reagents = list("gargleblaster" = 1, "stoxin" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/snowwhite
|
||||
/datum/chemical_reaction/drinks/snowwhite
|
||||
name = "Snow White"
|
||||
id = "snowwhite"
|
||||
result = "snowwhite"
|
||||
required_reagents = list("beer" = 1, "lemon_lime" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/irishcarbomb
|
||||
/datum/chemical_reaction/drinks/irishcarbomb
|
||||
name = "Irish Car Bomb"
|
||||
id = "irishcarbomb"
|
||||
result = "irishcarbomb"
|
||||
required_reagents = list("ale" = 1, "irishcream" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/syndicatebomb
|
||||
/datum/chemical_reaction/drinks/syndicatebomb
|
||||
name = "Syndicate Bomb"
|
||||
id = "syndicatebomb"
|
||||
result = "syndicatebomb"
|
||||
required_reagents = list("beer" = 1, "whiskeycola" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/erikasurprise
|
||||
/datum/chemical_reaction/drinks/erikasurprise
|
||||
name = "Erika Surprise"
|
||||
id = "erikasurprise"
|
||||
result = "erikasurprise"
|
||||
required_reagents = list("ale" = 2, "limejuice" = 1, "whiskey" = 1, "banana" = 1, "ice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/devilskiss
|
||||
/datum/chemical_reaction/drinks/devilskiss
|
||||
name = "Devils Kiss"
|
||||
id = "devilskiss"
|
||||
result = "devilskiss"
|
||||
required_reagents = list("blood" = 1, "kahlua" = 1, "rum" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/hippiesdelight
|
||||
/datum/chemical_reaction/drinks/hippiesdelight
|
||||
name = "Hippies Delight"
|
||||
id = "hippiesdelight"
|
||||
result = "hippiesdelight"
|
||||
required_reagents = list("psilocybin" = 1, "gargleblaster" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/bananahonk
|
||||
/datum/chemical_reaction/drinks/bananahonk
|
||||
name = "Banana Honk"
|
||||
id = "bananahonk"
|
||||
result = "bananahonk"
|
||||
required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/silencer
|
||||
/datum/chemical_reaction/drinks/silencer
|
||||
name = "Silencer"
|
||||
id = "silencer"
|
||||
result = "silencer"
|
||||
required_reagents = list("nothing" = 1, "cream" = 1, "sugar" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/driestmartini
|
||||
/datum/chemical_reaction/drinks/driestmartini
|
||||
name = "Driest Martini"
|
||||
id = "driestmartini"
|
||||
result = "driestmartini"
|
||||
required_reagents = list("nothing" = 1, "gin" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/lemonade
|
||||
/datum/chemical_reaction/drinks/lemonade
|
||||
name = "Lemonade"
|
||||
id = "lemonade"
|
||||
result = "lemonade"
|
||||
required_reagents = list("lemonjuice" = 1, "sugar" = 1, "water" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/kiraspecial
|
||||
/datum/chemical_reaction/drinks/kiraspecial
|
||||
name = "Kira Special"
|
||||
id = "kiraspecial"
|
||||
result = "kiraspecial"
|
||||
required_reagents = list("orangejuice" = 1, "limejuice" = 1, "sodawater" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/brownstar
|
||||
/datum/chemical_reaction/drinks/brownstar
|
||||
name = "Brown Star"
|
||||
id = "brownstar"
|
||||
result = "brownstar"
|
||||
required_reagents = list("orangejuice" = 2, "cola" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/milkshake
|
||||
/datum/chemical_reaction/drinks/milkshake
|
||||
name = "Milkshake"
|
||||
id = "milkshake"
|
||||
result = "milkshake"
|
||||
required_reagents = list("cream" = 1, "ice" = 2, "milk" = 2)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/rewriter
|
||||
/datum/chemical_reaction/drinks/rewriter
|
||||
name = "Rewriter"
|
||||
id = "rewriter"
|
||||
result = "rewriter"
|
||||
required_reagents = list("spacemountainwind" = 1, "coffee" = 1)
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/suidream
|
||||
/datum/chemical_reaction/drinks/suidream
|
||||
name = "Sui Dream"
|
||||
id = "suidream"
|
||||
result = "suidream"
|
||||
required_reagents = list("space_up" = 1, "bluecuracao" = 1, "melonliquor" = 1)
|
||||
result_amount = 3
|
||||
|
||||
/datum/chemical_reaction/luminol
|
||||
name = "Luminol"
|
||||
id = "luminol"
|
||||
result = "luminol"
|
||||
required_reagents = list("hydrogen" = 2, "carbon" = 2, "ammonia" = 2)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/shirleytemple
|
||||
/datum/chemical_reaction/drinks/shirleytemple
|
||||
name = "Shirley Temple"
|
||||
id = "shirley_temple"
|
||||
result = "shirley_temple"
|
||||
required_reagents = list("lemon_lime" = 4, "grenadine" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/royrogers
|
||||
/datum/chemical_reaction/drinks/royrogers
|
||||
name = "Roy Rogers"
|
||||
id = "roy_rogers"
|
||||
result = "roy_rogers"
|
||||
required_reagents = list("cola" = 4, "grenadine" = 1)
|
||||
result_amount = 5
|
||||
|
||||
/datum/chemical_reaction/collinsmix
|
||||
/datum/chemical_reaction/drinks/collinsmix
|
||||
name = "Collins Mix"
|
||||
id = "collins_mix"
|
||||
result = "collins_mix"
|
||||
required_reagents = list("lemon_lime" = 3, "sodawater" = 1)
|
||||
result_amount = 4
|
||||
|
||||
/datum/chemical_reaction/arnoldpalmer
|
||||
/datum/chemical_reaction/drinks/arnoldpalmer
|
||||
name = "Arnold Palmer"
|
||||
id = "arnold_palmer"
|
||||
result = "arnold_palmer"
|
||||
required_reagents = list("icetea" = 1, "lemonade" = 1)
|
||||
result_amount = 2
|
||||
result_amount = 2
|
||||
|
||||
/datum/chemical_reaction/minttea
|
||||
name = "Mint Tea"
|
||||
id = "minttea"
|
||||
result = "minttea"
|
||||
required_reagents = list("tea" = 5, "mint" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/lemontea
|
||||
name = "Lemon Tea"
|
||||
id = "lemontea"
|
||||
result = "lemontea"
|
||||
required_reagents = list("tea" = 5, "lemonjuice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/limetea
|
||||
name = "Lime Tea"
|
||||
id = "limetea"
|
||||
result = "limetea"
|
||||
required_reagents = list("tea" = 5, "limejuice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/limetea
|
||||
name = "Orange Tea"
|
||||
id = "orangetea"
|
||||
result = "orangetea"
|
||||
required_reagents = list("tea" = 5, "orangejuice" = 1)
|
||||
result_amount = 6
|
||||
|
||||
/datum/chemical_reaction/berrytea
|
||||
name = "Berry Tea"
|
||||
id = "berrytea"
|
||||
result = "berrytea"
|
||||
required_reagents = list("tea" = 5, "berryjuice" = 1)
|
||||
result_amount = 6
|
||||
@@ -68,6 +68,8 @@
|
||||
hot_coco spawn_reagent = "hot_coco"
|
||||
milk spawn_reagent = "milk"
|
||||
cream spawn_reagent = "cream"
|
||||
mint spawn_reagent = "mint"
|
||||
berry spawn_reagent = "berryjuice"
|
||||
|
||||
// ERT
|
||||
inaprov spawn_reagent = "inaprovaline"
|
||||
|
||||
@@ -57,5 +57,6 @@
|
||||
|
||||
/obj/machinery/chemical_dispenser/bar_coffee
|
||||
dispense_reagents = list(
|
||||
"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice"
|
||||
"coffee", "cafe_latte", "soy_latte", "hot_coco", "milk", "cream", "tea", "ice",
|
||||
"orangejuice", "lemonjuice", "limejuice", "berryjuice", "mint"
|
||||
)
|
||||
@@ -131,5 +131,12 @@
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/milk,
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/cream,
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/tea,
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/ice,
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/mint,
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/orange,
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/lemon,
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/lime,
|
||||
/obj/item/weapon/reagent_containers/chem_disp_cartridge/berry,
|
||||
|
||||
|
||||
)
|
||||
@@ -12,13 +12,6 @@
|
||||
slot_flags = SLOT_EARS
|
||||
volume = 5
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/dropper/do_surgery(mob/living/carbon/M, mob/living/user)
|
||||
if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
|
||||
return ..()
|
||||
afterattack(M, user, 1)
|
||||
return 1
|
||||
|
||||
/obj/item/weapon/reagent_containers/dropper/afterattack(var/obj/target, var/mob/user, var/proximity)
|
||||
if(!target.reagents || !proximity) return
|
||||
|
||||
@@ -75,7 +68,7 @@
|
||||
return
|
||||
|
||||
else
|
||||
trans = reagents.splash(target, amount_per_transfer_from_this, max_spill=30) //sprinkling reagents on generic non-mobs
|
||||
trans = reagents.splash(target, amount_per_transfer_from_this, max_spill=0) //sprinkling reagents on generic non-mobs
|
||||
user << "<span class='notice'>You transfer [trans] units of the solution.</span>"
|
||||
|
||||
else // Taking from something
|
||||
|
||||
@@ -131,23 +131,28 @@
|
||||
..()
|
||||
reagents.add_reagent("soymilk", 50)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton
|
||||
/obj/item/weapon/reagent_containers/food/drinks/smallmilk
|
||||
name = "small milk carton"
|
||||
desc = "It's milk. White and nutritious goodness!"
|
||||
volume = 30
|
||||
icon_state = "mini-milk"
|
||||
/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/New()
|
||||
item_state = "carton"
|
||||
center_of_mass = list("x"=16, "y"=9)
|
||||
/obj/item/weapon/reagent_containers/food/drinks/smallmilk/New()
|
||||
..()
|
||||
reagents.add_reagent("milk", 30)
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/chocolate
|
||||
/obj/item/weapon/reagent_containers/food/drinks/smallchocmilk
|
||||
name = "small chocolate milk carton"
|
||||
desc = "It's milk! This one is in delicious chocolate flavour."
|
||||
volume = 30
|
||||
icon_state = "mini-milk_choco"
|
||||
/obj/item/weapon/reagent_containers/food/drinks/milk/smallcarton/chocolate/New()
|
||||
item_state = "carton"
|
||||
center_of_mass = list("x"=16, "y"=9)
|
||||
/obj/item/weapon/reagent_containers/food/drinks/smallchocmilk/New()
|
||||
..()
|
||||
reagents.add_reagent("chocolate_milk", 30)
|
||||
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/drinks/coffee
|
||||
name = "\improper Robust Coffee"
|
||||
desc = "Careful, the beverage you're about to enjoy is extremely hot."
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/snacks/sandwich,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/tofubread/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/margherita/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/liquidfood,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry,
|
||||
@@ -26,17 +26,17 @@ var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snac
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cherrypie,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/appletart,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/plaincake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/limecake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/applecake/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie/filled,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks)
|
||||
|
||||
var/list/lunchables_drinks_ = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/breadslice/attackby(obj/item/W as obj, mob/user as mob)
|
||||
/obj/item/weapon/reagent_containers/food/snacks/slice/bread/attackby(obj/item/W as obj, mob/user as mob)
|
||||
|
||||
if(istype(W,/obj/item/weapon/material/shard) || istype(W,/obj/item/weapon/reagent_containers/food/snacks))
|
||||
var/obj/item/weapon/reagent_containers/food/snacks/csandwich/S = new(get_turf(src))
|
||||
@@ -19,19 +19,19 @@
|
||||
|
||||
var/sandwich_limit = 4
|
||||
for(var/obj/item/O in ingredients)
|
||||
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/breadslice))
|
||||
if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/slice/bread))
|
||||
sandwich_limit += 4
|
||||
|
||||
if(src.contents.len > sandwich_limit)
|
||||
user << "\red If you put anything else on \the [src] it's going to collapse."
|
||||
return
|
||||
else if(istype(W,/obj/item/weapon/material/shard))
|
||||
if(istype(W,/obj/item/weapon/material/shard))
|
||||
user << "\blue You hide [W] in \the [src]."
|
||||
user.drop_item()
|
||||
W.loc = src
|
||||
update()
|
||||
return
|
||||
else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks))
|
||||
if(src.contents.len > sandwich_limit)
|
||||
user << "\red If you put anything else on \the [src] it's going to collapse."
|
||||
return
|
||||
user << "\blue You layer [W] over \the [src]."
|
||||
var/obj/item/weapon/reagent_containers/F = W
|
||||
F.reagents.trans_to_obj(src, F.reagents.total_volume)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -36,7 +36,7 @@
|
||||
/obj/machinery/disease2/incubator,
|
||||
/obj/machinery/disposal,
|
||||
/mob/living/simple_animal/cow,
|
||||
/mob/living/simple_animal/hostile/retaliate/goat,
|
||||
/mob/living/simple_animal/retaliate/goat,
|
||||
/obj/machinery/computer/centrifuge,
|
||||
/obj/machinery/sleeper,
|
||||
/obj/machinery/smartfridge/,
|
||||
|
||||
@@ -76,7 +76,6 @@
|
||||
|
||||
switch(mode)
|
||||
if(SYRINGE_DRAW)
|
||||
|
||||
if(!reagents.get_free_space())
|
||||
user << "<span class='warning'>The syringe is full.</span>"
|
||||
mode = SYRINGE_INJECT
|
||||
@@ -137,7 +136,7 @@
|
||||
user << "<span class='notice'>[target] is empty.</span>"
|
||||
return
|
||||
|
||||
if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract))
|
||||
if(!target.is_open_container() && !istype(target, /obj/structure/reagent_dispensers) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/weapon/reagent_containers/food))
|
||||
user << "<span class='notice'>You cannot directly remove reagents from this object.</span>"
|
||||
return
|
||||
|
||||
@@ -209,7 +208,7 @@
|
||||
trans = reagents.trans_to_mob(target, amount_per_transfer_from_this, CHEM_BLOOD)
|
||||
admin_inject_log(user, target, src, contained, trans)
|
||||
else
|
||||
trans = reagents.trans_to(target, amount_per_transfer_from_this)
|
||||
trans = reagents.trans_to_obj(target, amount_per_transfer_from_this)
|
||||
if(trans)
|
||||
user << "<span class='notice'>You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.</span>"
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user