Second part of reagent porting

ported all chems of use, even the ones not produced by plants yet (they will be ported)
moved the metaglass sprite entries from metaglass to a new metaglass_ch to easy maintenance, the alt sprite code for metaglass still in original
Ported the drinks and plan on making in the future:
Bookwyrm not be straight up soporific and be something to drink without constantly going to sleep
Make high power stun without using obnoxious newbie solution I came up with a long time ago
Make the flapper and other blood drinks actually give nutrient to blood drinkers
Make Oilslide somehow be broken down and fuel synths

Ported the soy bean mutant chems and their recipes along with the recipe for blood clotting
ported all the fruit tea types, and made macha latte have large teacup metaglass sprite
ported the medical chems: Hannoa and Bullvalene
Ported Serazine made from a lavender mutant (not ported yet) and Alizine made from it acting as a tier 2 brute med.
This commit is contained in:
Shadowfire117
2020-02-22 16:42:45 +01:00
parent 7c9d46a199
commit 1ed5de2ec7
5 changed files with 447 additions and 98 deletions

View File

@@ -663,94 +663,4 @@ Drinks Data
glass_center_of_mass = list("x"=16, "y"=8) glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/ethanol/mojito /datum/reagent/ethanol/mojito
glass_icon_state = "mojito" glass_icon_state = "mojito"
//////////////////CHOMP//////////////////////////
/datum/reagent/ethanol/cloverclub
glass_icon_state = "cloverclub"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/ethanol/spiderdrink
glass_icon_state = "glassofspiders"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/drink/bubbleteawatermelon
glass_icon_state = "bubbleteawatermelonglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/bubbleteastrawberry
glass_icon_state = "bubbleteastrawberryglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/bubbleteacherry
glass_icon_state = "bubbleteacherryglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/bubbleteacoffee
glass_icon_state = "bubbleteacoffeeglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/bubbleteabanana
glass_icon_state = "bubbleteabananaglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/horchata
glass_icon_state = "horchata"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=7)
/datum/reagent/toxin/bluetrain
glass_icon_state = "bluetrain"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/drink/lovepotion
glass_icon_state = "lovepotion"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/drink/lowpower
glass_icon_state = "lowpower"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/coffee/jackbrew
glass_icon_state = "jackbrew"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/bookwyrm
glass_icon_state = "bookwyrm"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/drink/highpower
glass_icon_state = "highpower"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/flapper
glass_icon_state = "flapper"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/toxin/oilslide
glass_icon_state = "oilslide"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/sitonmyface
glass_icon_state = "sitonmyface"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/hachi
glass_icon_state = "hachi"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/mojito
glass_icon_state = "mojito"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/slimedrink
glass_icon_state = "slimedrink"
glass_icon_source = 'icons/obj/drinks_ch.dmi'

View File

@@ -0,0 +1,113 @@
//////////////////CHOMP//////////////////////////
/datum/reagent/ethanol/cloverclub
glass_icon_state = "cloverclub"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/ethanol/spiderdrink
glass_icon_state = "glassofspiders"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/drink/tea/minttea
glass_icon_state = "bigteacup"
/datum/reagent/drink/tea/lemontea
glass_icon_state = "bigteacup"
/datum/reagent/drink/tea/limetea
glass_icon_state = "bigteacup"
/datum/reagent/drink/tea/orangetea
glass_icon_state = "bigteacup"
/datum/reagent/drink/tea/berrytea
glass_icon_state = "bigteacup"
/datum/reagent/drink/tea/cherrytea
glass_icon_state = "bigteacup"
/datum/reagent/drink/tea/watermelontea
glass_icon_state = "bigteacup"
/datum/reagent/drink/bubbleteawatermelon
glass_icon_state = "bubbleteawatermelonglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/bubbleteastrawberry
glass_icon_state = "bubbleteastrawberryglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/bubbleteacherry
glass_icon_state = "bubbleteacherryglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/bubbleteacoffee
glass_icon_state = "bubbleteacoffeeglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/bubbleteabanana
glass_icon_state = "bubbleteabananaglass"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=9)
/datum/reagent/drink/tea/matcha_latte
glass_icon_state = "bigteacup"
/datum/reagent/drink/horchata
glass_icon_state = "horchata"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=7)
/datum/reagent/toxin/bluetrain
glass_icon_state = "bluetrain"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
glass_center_of_mass = list("x"=16, "y"=8)
/datum/reagent/drink/lovepotion
glass_icon_state = "lovepotion"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/drink/lowpower
glass_icon_state = "lowpower"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/coffee/jackbrew
glass_icon_state = "jackbrew"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/bookwyrm
glass_icon_state = "bookwyrm"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/drink/highpower
glass_icon_state = "highpower"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/flapper
glass_icon_state = "flapper"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/toxin/oilslide
glass_icon_state = "oilslide"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/sitonmyface
glass_icon_state = "sitonmyface"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/hachi
glass_icon_state = "hachi"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/ethanol/mojito
glass_icon_state = "mojito"
glass_icon_source = 'icons/obj/drinks_ch.dmi'
/datum/reagent/slimedrink
glass_icon_state = "slimedrink"
glass_icon_source = 'icons/obj/drinks_ch.dmi'

View File

@@ -188,6 +188,110 @@
M.adjustBruteLoss(1) M.adjustBruteLoss(1)
M.adjustToxLoss(1) M.adjustToxLoss(1)
///SAP REAGENTS////
//This is all a direct port from aeiou.
/datum/reagent/hannoa
name = "Hannoa"
id = "hannoa"
description = "A powerful clotting agent that treats brute damage very quickly but takes a long time to be metabolised. Overdoses easily, reacts badly with other chemicals."
taste_description = "paint"
reagent_state = LIQUID
color = "#163851"
overdose = 8
scannable = 1
metabolism = 0.03
/datum/reagent/hannoa/overdose(var/mob/living/carbon/M, var/alien, var/removed)
..()
if(ishuman(M))
var/wound_heal = 1.5 * removed
var/mob/living/carbon/human/H = M
for(var/obj/item/organ/external/O in H.bad_external_organs)
for(var/datum/wound/W in O.wounds)
if(W.bleeding())
W.damage = max(W.damage - wound_heal, 0)
if(W.damage <= 0)
O.wounds -= W
M.take_organ_damage(3 * removed, 0)
if(M.losebreath < 15)
M.AdjustLosebreath(1)
H.custom_pain("It feels as if your veins are fusing shut!",60)
/datum/reagent/hannoa/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) //Sleepy if not overdosing.
..()
var/effective_dose = dose
if(effective_dose < 2)
if(effective_dose == metabolism * 2 || prob(5))
M.emote("yawn")
else if(effective_dose < 5)
M.eye_blurry = max(M.eye_blurry, 10)
else if(effective_dose < 20)
if(prob(50))
M.Weaken(2)
M.drowsyness = max(M.drowsyness, 20)
else
M.sleeping = max(M.sleeping, 20)
/datum/reagent/bullvalene //This is for the third sap. It converts Brute Oxy and burn into slightly less toxins.
name = "bullvalene"
id = "bullvalene"
description = "witty pending description. Converts brute and burn into toxin. Or at least is supposed to."
taste_description = "sulfur"
reagent_state = LIQUID
color = "#163851"
overdose = 8 //This many units starts killing you.
scannable = 1 // Mechs can scan this ye
metabolism = 0.03 //Slow metabolism. This value was plucked out of nowhere. Can be changed.
/datum/reagent/bullvalene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
if(alien == IS_SLIME || alien == IS_DIONA)
return
if(M.getBruteLoss() || M.getFireLoss() || M.getOxyLoss())
M.adjustOxyLoss(-1)
M.adjustFireLoss(-1)
M.adjustBruteLoss(-1)
M.adjustToxLoss(0.8)
/////SERAZINE REAGENTS///////
/datum/reagent/serazine
name = "Serazine"
id = "serazine"
description = "A sweet tasting flower extract, it has very mild anti toxic properties, help with hallucinations and drowsyness, and can be used to make potent drugs."
taste_description = "sweet nectar"
reagent_state = LIQUID
color = "#df9898"
scannable = 1
/datum/reagent/serazine/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
var/chem_effective = 1
if(alien != IS_DIONA)
M.drowsyness = max(0, M.drowsyness - 3 * removed * chem_effective)
M.hallucination = max(0, M.hallucination - 6 * removed * chem_effective)
M.adjustToxLoss(-2 * removed * chem_effective)
/datum/reagent/alizene
name = "Alizene"
id = "alizene"
description = "A derivative from bicaridine enhanced by serazine to more effectively mend flesh, but is ineffective against internal hemorrhage."
taste_description = "bittersweet"
taste_mult = 3
reagent_state = LIQUID
color = "#b37979"
overdose = REAGENTS_OVERDOSE
scannable = 1
/datum/reagent/alizene/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
var/chem_effective = 1
if(alien == IS_SLIME)
chem_effective = 0.75
if(alien != IS_DIONA)
M.heal_organ_damage(12 * removed * chem_effective, 0)
///GENDER CHANGE REAGENTS////
/datum/reagent/change_drug //base chemical /datum/reagent/change_drug //base chemical
name = "Elixer of Change" //always the same name name = "Elixer of Change" //always the same name
id = "change_drug" id = "change_drug"
@@ -240,6 +344,112 @@
/////////DRINKS//////////////////////////////// /////////DRINKS////////////////////////////////
////////////////////////////////////////////// //////////////////////////////////////////////
/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/tea/cherrytea
name = "Cherry Tea"
id = "cherrytea"
description = "A tasty mixture of cherries and tea. It's apparently good for you!"
color = "#c15962"
taste_description = "black tea with lots of cherries"
glass_name = "cherry tea"
glass_desc = "A tasty mixture of cherries and tea. It's apparently good for you!"
cup_name = "cup of cherry tea"
cup_desc = "A tasty mixture of cherries and tea. It's apparently good for you!"
/datum/reagent/drink/tea/watermelontea
name = "Watermelon Tea"
id = "watermelontea"
description = "A tasty mixture of watermelon and tea. It's apparently good for you!"
color = "#9f2c2c"
taste_description = "black tea with sweet watermelon for flavouring"
glass_name = "watermelon tea"
glass_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!"
cup_name = "cup of watermelon tea"
cup_desc = "A tasty mixture of watermelon and tea. It's apparently good for you!"
/datum/reagent/drink/tea/matcha_latte //Putting this as tea to inherit tea variables. Should not have the same toxloss as matcha so it can be placed in a dispenser without breaking balance.
name = "Matcha latte"
id = "matcha_latte"
description = "A nice and tasty beverage to enjoy while studying."
taste_description = "creamy, vegetal sweetness"
color = "#b1c48c"
adj_temp = 5
glass_name = "matcha latte"
glass_desc = "A nice and refreshing beverage while you are studying."
cup_icon_state = "cup_latte"
cup_name = "cup of matcha latte"
cup_desc = "A nice and refreshing beverage while you are studying."
/datum/reagent/drink/tea/dyloteane /datum/reagent/drink/tea/dyloteane
name = "The Anti-Irish" name = "The Anti-Irish"
id = "dyloteane" id = "dyloteane"
@@ -337,7 +547,7 @@
M.adjustToxLoss(-0.5 * removed) M.adjustToxLoss(-0.5 * removed)
/datum/reagent/ethanol/coffee/jackbrew /datum/reagent/ethanol/coffee/jackbrew
name = "Jack's brew" name = "\improper Jack's brew"
id = "jackbrew" id = "jackbrew"
description = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job." description = "Irish coffee, and hyperzine. A common mix for panicked drinkers, EMTS, Paramedics, and CMOs alone on the job."
taste_description = "wishing you could give up on the day" taste_description = "wishing you could give up on the day"
@@ -654,4 +864,30 @@
adj_temp = -5 adj_temp = -5
glass_name = "horchata" glass_name = "horchata"
glass_desc = "A sweet and cold rice milk beverage." glass_desc = "A sweet and cold rice milk beverage."
//////SAP IN UNREFINED FORM////
/datum/reagent/toxin/bluesap //This is the first sap. Blue one.
name = "Blue Sap"
id = "bluesap"
description = "Glowing blue liquid."
reagent_state = LIQUID
color = "#91f9ff" // rgb(145, 249, 255)
metabolism = 0.01
strength = 10//Don't drink it
mrate_static = TRUE
/datum/reagent/purplesap
name = "Purple sap"
id = "purplesap"
description = "Purple liquid. It is very sticky and smells of ammonia."
color = "#7a48a0"
taste_description = "Ammonia"
/datum/reagent/orangesap
name = "Orange sap"
id = "orangesap"
description = "Orange liquid. It wobbles around a bit like jelly."
color = "#e0962f"
taste_description = "Ammonia"

View File

@@ -30,13 +30,47 @@
id = "eden_snake" id = "eden_snake"
result = "eden_snake" result = "eden_snake"
required_reagents = list("eden" = 1, "ethanol" = 1) required_reagents = list("eden" = 1, "ethanol" = 1)
///SAP RECIPES//////
/datum/chemical_reaction/myelamine_sap //This is the clotting agent used by clotting packs.
name = "Myelamine"
id = "myelamine"
result = "myelamine"
required_reagents = list("bicaridine" = 1, "iron" = 2, "kelotane" = 1, "bluesap" = 1)
result_amount = 1
/datum/chemical_reaction/tea/matcha_latte /datum/chemical_reaction/hannoa
id = "matcha_latte" name = "Hannoa"
result = "matcha_latte" id = "hannoa"
required_reagents = list ("matchapowder" = 1, "milk" = 5) result = "hannoa"
result_amount = 5 required_reagents = list("purplesap" = 1, "iron" = 2, "kelotane" = 1, "carbon" = 1)
result_amount = 1
/datum/chemical_reaction/bullvalene
name = "Bullvalene"
id = "bullvalene"
result = "bullvalene"
required_reagents = list("dermaline" = 1, "orangesap" = 1, "Copper" = 1)
result_amount = 1
/datum/chemical_reaction/nutrient
name = "Nutriment"
id = "nutriment"
result = "nutriment"
required_reagents = list("purplesap" = 1, "orangesap" = 1, "bluesap" = 1)
result_amount = 3
/////SERAZINE RECIPES//////
/datum/chemical_reaction/alizine
name = "Alizine"
id = "alizine"
result = "alizine"
required_reagents = list("bicaridine" = 1, "serazine" = 1, "tungsten" = 1)
result_amount = 3
/////GENDER CHANGE RECIPES/////
/datum/chemical_reaction/change_drug/male /datum/chemical_reaction/change_drug/male
name = "Elixer of Change" name = "Elixer of Change"
@@ -63,6 +97,61 @@
/////////DRINKS//////////////////////////////// /////////DRINKS////////////////////////////////
////////////////////////////////////////////// //////////////////////////////////////////////
/datum/chemical_reaction/drinks/minttea
name = "Mint Tea"
id = "minttea"
result = "minttea"
required_reagents = list("tea" = 5, "mint" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/lemontea
name = "Lemon Tea"
id = "lemontea"
result = "lemontea"
required_reagents = list("tea" = 5, "lemonjuice" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/limetea
name = "Lime Tea"
id = "limetea"
result = "limetea"
required_reagents = list("tea" = 5, "limejuice" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/orangetea
name = "Orange Tea"
id = "orangetea"
result = "orangetea"
required_reagents = list("tea" = 5, "orangejuice" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/berrytea
name = "Berry Tea"
id = "berrytea"
result = "berrytea"
required_reagents = list("tea" = 5, "berryjuice" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/cherrytea
name = "Cherry Tea"
id = "cherrytea"
result = "cherrytea"
required_reagents = list("tea" = 5, "cherryjelly" = 1)
result_amount = 6
/datum/chemical_reaction/drinks/watermelontea
name = "Watermelon Tea"
id = "watermelontea"
result = "watermelontea"
required_reagents = list("tea" = 5, "watermelonjuice" = 1)
result_amount = 6
/datum/chemical_reaction/tea/matcha_latte
id = "matcha_latte"
result = "matcha_latte"
required_reagents = list ("matchapowder" = 1, "milk" = 5)
result_amount = 5
/datum/chemical_reaction/freshtea/green /datum/chemical_reaction/freshtea/green
id = "freshteagreen" id = "freshteagreen"
result = "freshteagreen" result = "freshteagreen"

View File

@@ -2013,6 +2013,7 @@
#include "code\modules\food\drinkingglass\glass_boxes.dm" #include "code\modules\food\drinkingglass\glass_boxes.dm"
#include "code\modules\food\drinkingglass\glass_types.dm" #include "code\modules\food\drinkingglass\glass_types.dm"
#include "code\modules\food\drinkingglass\metaglass.dm" #include "code\modules\food\drinkingglass\metaglass.dm"
#include "code\modules\food\drinkingglass\metaglass_ch.dm"
#include "code\modules\food\drinkingglass\shaker.dm" #include "code\modules\food\drinkingglass\shaker.dm"
#include "code\modules\food\food\cans.dm" #include "code\modules\food\food\cans.dm"
#include "code\modules\food\food\condiment.dm" #include "code\modules\food\food\condiment.dm"