cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-29 23:46:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scori Alchemy update (#7601)

Browse Source
This commit is contained in:
GySgtMurphy
2026-06-11 20:49:20 +02:00
committed by GitHub
parent 992ca131a0
commit b5b31f4691
24 changed files with 578 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery.dm
+13
View File
@@ -30,8 +30,21 @@
/obj/item/stack/material/snow = list("water"),
/obj/item/stack/material/sandstone = list("silicon", "oxygen"),
/obj/item/stack/material/glass = list("silicon"),
/obj/item/stack/material/lead = list("lead"),
/obj/item/stack/material/copper = list("copper"),
/obj/item/stack/material/glass/phoronglass = list("platinum", "silicon", "silicon", "silicon"), //5 platinum, 15 silicon,
/obj/item/stack/material/silencium = list("nothing"),
/obj/item/stack/material/bone = list("bonemeal"),
/obj/item/stack/material/shell = list("calciumcarbonate"),
/obj/item/stack/ore/gold = list ("gold"), // Native gold means it's pure crystalline gold
/obj/item/stack/ore/silver = list ("silver"), // ditto for native silver
/obj/item/stack/ore/copper = list ("copper"),
/obj/item/stack/ore/lead = list ("galena"),
/obj/item/stack/ore/iron = list ("hematite"),
/obj/item/stack/ore/coal = list ("carbon", "carbon", "carbon", "carbon", "sulfur"),
/obj/item/stack/ore/phoron = list ("phoronite"),
/obj/item/stack/ore/hydrogen = list ("hydronite"),
/obj/item/stack/ore/uranium = list ("uraninite")
)
var/static/radial_examine = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine")
var/static/radial_eject = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_eject")
code/modules/reagents/chemistry/reactions/Drink-Recipes.dm
+8
View File
@@ -134,6 +134,14 @@
catalysts = list("enzyme" = 5)
result_amount = 10
/datum/chemical_reaction/drinks/bentarwine
name = "Sirim-Bentar"
id = "bentarwine"
result = "bentarwine"
required_reagents = list("bentarjuice" = 10)
catalysts = list("enzyme" = 5)
result_amount = 10
/datum/chemical_reaction/drinks/pwine
name = "Poison Wine"
id = "pwine"
code/modules/reagents/chemistry/reactions/Misc-Recipes.dm
+127 -1
View File
@@ -249,7 +249,10 @@
required_reagents = list("triglyceride" = 1, "protein" = 1, "alchemybase" = 1)
result_amount = 3
/datum/chemical_reaction/soap
// Replacing (most) reactions that produce items with a crafting recipe. Less janky
/*
/datum/chemical_reaction/soap
name = "Soap"
id = "soap"
required_reagents = list("tallow" = 1, "water" = 1, "ash" = 1)
@@ -258,8 +261,12 @@
. = ..()
new /obj/item/soap/primitive(get_turf(holder.my_atom))
*/
// todo: why is this a chemical reaction? make a chalkcrafting system or something...
// chalk crafting system is in now kinda
// you know what fuck you; this trips up unit tests. i'm just commenting it out.
// /datum/chemical_reaction/charcoal_stick
// name = "Charcoal Stick"
@@ -306,6 +313,7 @@
required_reagents = list("gunpowder" = 2, "alchemybase" = 1)
result_amount = 3
/*
/datum/chemical_reaction/condensedphlogiston
name = "Condensed Phlogiston"
id = "condensedphlogiston"
@@ -325,6 +333,124 @@
. = ..()
for(var/i in 1 to multiplier)
new /obj/item/bitterash(get_turf(holder.my_atom))
*/
/datum/chemical_reaction/alchemizebentar
name = "Alchemize Bentar"
id = "alchemizebentar"
result = "anti_toxin"
required_reagents = list("bentarjuice" = 1, "catalyst" = 0.1)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/alchemizeshimash
name = "Alchemize Shimash"
id = "alchemizeshimash"
result = "tramadol"
required_reagents = list("shimashpulp" = 1, "catalyst" = 0.1)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/alchemizepokalea
name = "Alchemize Pokalea"
id = "alchemizepokalea"
result = "leporazine"
required_reagents = list("pokaleapaste" = 1, "catalyst" = 0.1)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/alchemizejuhtak
name = "Alchemize Juhtak"
id = "alchemizejuhtak"
result = "bicaridine"
required_reagents = list("juhtakpulp" = 1, "catalyst" = 0.1)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/alchemizepyrrhlea
name = "Alchemize Pyrrhlea"
id = "alchemizepyrrhlea"
result = "kelotane"
required_reagents = list("pyrrhleanectar" = 1, "catalyst" = 0.1)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/alchemizebanana
name = "Alchemize Banana Juice"
id = "alchemizebanana"
result = "potassium"
required_reagents = list("banana" = 1, "catalyst" = 0.1)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/alchemizebonemeal
name = "Alchemize Bonemeal"
id = "alchemizebonemeal"
result = "phosphorus"
required_reagents = list("bonemeal" = 1, "catalyst" = 0.1)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/dilutecersut
name = "Dilute Cersut"
id = "dilutecersut"
result = "sacid"
required_reagents = list("cersutpaste" = 1, "water" = 1)
result_amount = 2
/datum/chemical_reaction/purifyiron
name = "Purify Hematite"
id = "purifyiron"
result = "iron"
required_reagents = list("hematite" = 1, "catalyst" = 0.5)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/purifyuranium
name = "Purify Uraninite"
id = "purifyuranium"
result = "uranium"
required_reagents = list("uraninite" = 1, "catalyst" = 0.5)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/purifylead
name = "Purify Galena"
id = "purifylead"
result = "lead"
required_reagents = list("galena" = 1, "catalyst" = 0.1)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/purifyphoron
name = "Purify Phoronite"
id = "purifyphoron"
result = "phoron"
required_reagents = list("phoronite" = 1, "catalyst" = 0.5)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/releasehydrogen
name = "Release Hydrogen"
id = "releasehydrogen"
result = "hydrogen"
required_reagents = list("hydronite" = 1, "sacid" = 2, "catalyst" = 0.5)
catalysts = list("catalyst" = 5)
result_amount = 1
/datum/chemical_reaction/cersutsauce
name = "Siishma-Cersut"
id = "cersutsauce"
result = "cersutsauce"
required_reagents = list("cersutpaste" = 1, "sugar" = 1, "pyrrhleanectar" = 1)
result_amount = 3
/datum/chemical_reaction/gunpowder
name = "Gunpowder"
id = "gunpowder"
result = "gunpowder"
required_reagents = list("phosphorus" = 1, "carbon" = 1, "sulfur" = 1)
result_amount = 3
//Slime related
/datum/chemical_reaction/slimeify
code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Food-Drinks.dm
+37
View File
@@ -5460,3 +5460,40 @@
glass_name = "Halloween Punch"
glass_desc = "It's staring at you!"
/datum/reagent/ethanol/bentarwine
name = "Sirim-Bentar"
id = "bentarwine"
description = "A type of wine made of fermented bentar juice."
reagent_state = REAGENT_LIQUID
proof = WINE
color = "#9d23aa"
taste_description = "slightly medicinal wine"
/datum/reagent/ethanol/bentarwine/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
var/chem_effective = 1
if(alien == IS_SLIME)
chem_effective = 0.75
if(alien != IS_DIONA)
M.adjustToxLoss(-1 * removed * chem_effective)//Keeps some of the medicinal properties, but reduced.
/datum/reagent/cersutsauce
name = "Siishma-Cersut"
id = "cersutsauce"
description = "Acidic cersut paste tempered by some other medium to create a sauce."
reagent_state = REAGENT_LIQUID
color = "#e0f569"
taste_description = "your tongue tingling"
/datum/reagent/cersutsauce/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
var/potency = 2
if(alien == IS_XENOHYBRID)
return
if(alien != IS_SCORI)
potency = 4
if(metabolism.total_processed_dose < 5 && (metabolism.cycles_so_far == 1 || prob(5)))
to_chat(M,"<span class='danger'>You feel like your insides are going numb!</span>")
if(metabolism.total_processed_dose >= 5)
M.apply_effect(potency, AGONY, 0)
if(prob(5))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>")
code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Other.dm
+157
View File
@@ -189,6 +189,52 @@
color = "#464650"
taste_description = "salt"
/datum/reagent/galena
name = "Galena"
id = "galena"
description = "Powdered unprocessed lead."
reagent_state = REAGENT_SOLID
color = "#273956"
taste_description = "metal"
/datum/reagent/hematite
name = "Hematite"
id = "hematite"
description = "Powdered unprocessed iron. It's mostly iron oxide."
reagent_state = REAGENT_SOLID
color = "#353535"
taste_description = "rust"
/datum/reagent/uraninite
name = "Uraninite"
id = "uraninite"
description = "Powdered unprocessed uranium."
reagent_state = REAGENT_SOLID
color = "#B8B8C0"
taste_description = "metal"
/datum/reagent/uraninite/legacy_affect_touch(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
legacy_affect_ingest(M, alien, removed, metabolism)
/datum/reagent/uraninite/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
M.apply_effect(5 * removed, IRRADIATE, 0)
/datum/reagent/phoronite
name = "Phoronite"
id = "phoronite"
description = "Powdered unprocessed phoron. The crystals haven't been forced into their reactive form."
reagent_state = REAGENT_SOLID
color = "#9D14DB"
taste_description = "tingly sand"
/datum/reagent/hydronite
name = "Hydronite"
id = "hydronite"
description = "Powdered unprocessed metallic hydrogen."
reagent_state = REAGENT_SOLID
color = "#808080"
taste_mult = 0
//Ashlander Alchemy!
/datum/reagent/alchemybase
name = "Alchemical Base"
@@ -213,3 +259,114 @@
reagent_state = REAGENT_SOLID
color = "#302f2f"
taste_description = "sour wax and sulphur"
/datum/reagent/bentarjuice
name = "Bentar Juice"
id = "bentarjuice"
description = "The sickly sweet juice of the bentar plant."
reagent_state = REAGENT_LIQUID
color = "#9d23aa"
taste_description = "sweetness with a medicinal aftertaste"
/datum/reagent/bentarjuice/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
var/chem_effective = 1
if(alien == IS_SLIME)
chem_effective = 0.75
if(alien != IS_DIONA)
M.adjustToxLoss(-2 * removed * chem_effective)// Herbal Dylovene. Heals less toxin and loses other benefits.
/datum/reagent/cersutpaste
name = "Cersut Paste"
id = "cersutpaste"
description = "Ground up paste of a cersut leaf. It's highly acidic."
reagent_state = REAGENT_LIQUID
color = "#e0f569"
taste_description = "your tongue melting and teeth falling out"
/datum/reagent/cersutpaste/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
if(alien == IS_XENOHYBRID)
return
if(alien != IS_SCORI)
M.take_random_targeted_damage(burn = 0, burn = removed * 4)
if(prob(50))
M.apply_effect(4, AGONY, 0)
if(prob(20))
to_chat(M,"<span class='danger'>You feel like your insides are melting!</span>")
else if(prob(20))
M.visible_message("<span class='warning'>[M] [pick("dry heaves!","coughs!","splutters!")]</span>")
/datum/reagent/juhtakpulp
name = "Juhtak Pulp"
id = "juhtakpulp"
description = "Pulp extracted from a juhtak plant."
reagent_state = REAGENT_LIQUID
color = "#684f32"
taste_description = "bitter plant grit"
/datum/reagent/juhtakpulp/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
var/chem_effective = 1
if(alien == IS_SLIME)
chem_effective = 0.75
if(alien != IS_DIONA)
M.heal_organ_damage(2 * removed * chem_effective, 0) // Herbal Bicaridine, less effective. Use alchemy to make it better.
/datum/reagent/pokaleapaste
name = "Pokalea Paste"
id = "pokaleapaste"
description = "Ground up pokalea leaves."
reagent_state = REAGENT_LIQUID
color = "#684c34"
taste_description = "bitterness"
/datum/reagent/pokaleapaste/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
if(alien == IS_DIONA)
return
if(M.bodytemperature > 310)
M.bodytemperature = max(310, M.bodytemperature - (10 * TEMPERATURE_DAMAGE_COEFFICIENT)) // Herbal Leporazine, less effective.
else if(M.bodytemperature < 311)
M.bodytemperature = min(310, M.bodytemperature + (10 * TEMPERATURE_DAMAGE_COEFFICIENT))
/datum/reagent/pyrrhleanectar
name = "Pyrrhlea Nectar"
id = "pyrrhleanectar"
description = "The nectar of a pyrrhlea flower."
reagent_state = REAGENT_LIQUID
color = "#f0d74c"
taste_description = "bitter nectar"
/datum/reagent/pyrrhleanectar/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
if(alien != IS_DIONA)
M.add_chemical_effect(CE_STABLE, 7) // Herbal kelotane. Less effective
M.heal_organ_damage(0, 2 * removed)
/datum/reagent/shimashpulp
name = "Shimash Pulp"
id = "shimashpulp"
description = "Pulp extracted from a shimash plant."
reagent_state = REAGENT_LIQUID
color = "#f2f0ef"
taste_description = "sour plant grit"
/datum/reagent/shimashpulp/legacy_affect_blood(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
var/chem_effective = 1
if(alien == IS_SLIME)
chem_effective = 0.75
M.ceiling_chemical_effect(CE_PAINKILLER, 20 * chem_effective) //Herbal tramadol, much less effective.
/datum/reagent/bonemeal
name = "Bonemeal"
id = "bonemeal"
description = "Ground up bones."
reagent_state = REAGENT_SOLID
color = "#f2f0ef"
taste_description = "gritty sand"
/datum/reagent/catalyst
name = "Catalyst"
id = "catalyst"
description = "Semi-anomalous powder. Properties unknown." // Powdered Elder Stone, for use in more advanced alchemy.
reagent_state = REAGENT_SOLID
color = "#9D14DB"
taste_description = "forever"
code/modules/reagents/chemistry/reagents/Chemistry-Reagents-Toxins.dm
+3
View File
@@ -1067,6 +1067,9 @@
* Now scannable! Removed with shockchems!
*/
/datum/reagent/nanite
abstract_type = /datum/reagent/nanite
/datum/reagent/nanite/shredding
name = "Shredding Nanites"
id = "shredding_nanites"
code/modules/reagents/chemistry/reagents/core/elements.dm
+13 -1
View File
@@ -69,6 +69,10 @@
taste_description = "pennies"
color = "#6E3B08"
/datum/reagent/copper/legacy_affect_ingest(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
if(alien == IS_SCORI)
M.add_chemical_effect(CE_BLOODRESTORE, 8 * removed)
/datum/reagent/fluorine
name = "Fluorine"
id = "fluorine"
@@ -108,9 +112,17 @@
color = "#353535"
/datum/reagent/iron/legacy_affect_ingest(mob/living/carbon/M, alien, removed, datum/reagent_metabolism/metabolism)
if(alien != IS_DIONA)
if(alien != IS_DIONA && alien != IS_SCORI)
M.add_chemical_effect(CE_BLOODRESTORE, 8 * removed)
/datum/reagent/lead
name = "Lead"
id = "lead"
description = "A particularly heavy metal."
taste_description = "metal"
reagent_state = REAGENT_SOLID
color = "#273956"
/datum/reagent/lithium
name = "Lithium"
id = "lithium"