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

Reagent fix pack 3

Browse Source
This commit is contained in:
Archie
2021-01-01 02:21:45 -03:00
parent aa2280113d
commit cab493231b
7 changed files with 32 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/glass.dm
+4 -4
View File
@@ -23,7 +23,7 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/glass
grind_results = list("silicon" = 20)
grind_results = list(/datum/reagent/silicon = 20)
point_value = 1
tableVariant = /obj/structure/table/glass
@@ -91,7 +91,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/plasmaglass
grind_results = list("silicon" = 20, "plasma" = 10)
grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10)
/obj/item/stack/sheet/plasmaglass/fifty
amount = 50
@@ -142,7 +142,7 @@ GLOBAL_LIST_INIT(reinforced_glass_recipes, list ( \
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/rglass
grind_results = list("silicon" = 20, "iron" = 10)
grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/iron = 10)
point_value = 4
/obj/item/stack/sheet/rglass/attackby(obj/item/W, mob/user, params)
@@ -185,7 +185,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
armor = list("melee" = 20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
resistance_flags = ACID_PROOF
merge_type = /obj/item/stack/sheet/plasmarglass
grind_results = list("silicon" = 20, "plasma" = 10, "iron" = 10)
grind_results = list(/datum/reagent/silicon = 20, /datum/reagent/toxin/plasma = 10, /datum/reagent/iron = 10)
point_value = 23
/obj/item/stack/sheet/plasmarglass/Initialize(mapload, new_amount, merge = TRUE)
code/game/objects/items/stacks/sheets/sheet_types.dm
+1 -1
View File
@@ -270,7 +270,7 @@ GLOBAL_LIST_INIT(bamboo_recipes, list ( \
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/sheet/mineral/bamboo
grind_results = list("carbon" = 5)
grind_results = list(/datum/reagent/carbon = 5)
/obj/item/stack/sheet/mineral/wood/attackby(obj/item/W, mob/user, params) // NOTE: sheet_types.dm is where the WOOD stack lives. Maybe move this over there.
// Taken from /obj/item/stack/rods/attackby in [rods.dm]
code/modules/food_and_drinks/drinks/drinks.dm
+3 -1
View File
@@ -241,11 +241,13 @@
item_state = "coffee"
spillable = TRUE
/* Doesn't exist lol
/datum/chemical_reaction/catnip_tea
name = "Catnip Tea"
id = "catnip_tea"
results = list("catnip_tea" = 3)
required_reagents = list("tea" = 5, "catnip" = 2)
required_reagents = list(/datum/reagent/consumable/tea = 5, /datum/reagent/pax/catnip = 2)
*/
/obj/item/reagent_containers/food/drinks/mug/on_reagent_change(changetype)
if(reagents.total_volume)
code/modules/food_and_drinks/recipes/food_mixtures.dm
-8
View File
@@ -84,14 +84,6 @@
required_temp = 413
mob_react = FALSE
/datum/chemical_reaction/caramel_burned
name = "Caramel burned"
id = "caramel_burned"
results = list("carbon" = 1)
required_reagents = list("caramel" = 1)
required_temp = 483
mob_react = FALSE
/datum/chemical_reaction/cheesewheel
name = "Cheesewheel"
id = "cheesewheel"
code/modules/reagents/chemistry/recipes/others.dm
+2 -2
View File
@@ -712,7 +712,7 @@
/datum/chemical_reaction/synth_blood
name = "Synthetic Blood"
id = "syntheticblood"
results = list("syntheticblood" = 3)
required_reagents = list("salglu_solution" = 1, "iron" = 1, "stable_plasma" = 1)
results = list(/datum/reagent/blood/synthetics = 3)
required_reagents = list(/datum/reagent/medicine/salglu_solution = 1, /datum/reagent/iron = 1, /datum/reagent/stable_plasma = 1)
mix_message = "The mixture congeals and gives off a faint copper scent."
required_temp = 350
code/modules/reagents/chemistry/recipes/slime_extracts.dm
+16 -16
View File
@@ -683,64 +683,64 @@
/datum/chemical_reaction/slime/slimemammal //Mammal species, pet dog.
name = "Mammal Mutation Toxin"
id = "mammalmuttoxin"
results = list("mammalmutationtoxin" = 1)
required_reagents = list("sulfur" = 1) //Sulfur, furry, GET IT?!
results = list(/datum/reagent/mutationtoxin/mammal = 1)
required_reagents = list(/datum/reagent/sulfur = 1) //Sulfur, furry, GET IT?!
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/slimeavian //BIRDUP Species
name = "Avian Mutation Toxin"
id = "avianmuttoxin"
results = list("avianmutationtoxin" = 1)
required_reagents = list("oxygen" = 1) //Oxygen gives you.. wait that's redbull.
results = list(/datum/reagent/mutationtoxin/avian = 1)
required_reagents = list(/datum/reagent/oxygen = 1) //Oxygen gives you.. wait that's redbull.
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/slimeaquatic //Aquatic species, aquaman got now shit on you.
name = "Aquatic Mutation Toxin"
id = "aquaticmuttoxin"
results = list("aquaticmutationtoxin" = 1)
required_reagents = list("water" = 1) //Water, 60% found in a human body, you tipped the scales, you fucked up.
results = list(/datum/reagent/mutationtoxin/aquatic = 1)
required_reagents = list(/datum/reagent/water = 1) //Water, 60% found in a human body, you tipped the scales, you fucked up.
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/slimexeno //HISS(Xeno hybrid) species, the other hiss not cats.
name = "Xeno Mutation Toxin"
id = "xenomuttoxin"
results = list("xenomutationtoxin" = 1)
required_reagents = list("sacid" = 1) //Sulphuric Acid, just like xeno spit, yuck.
results = list(/datum/reagent/mutationtoxin/xeno = 1)
required_reagents = list(/datum/reagent/toxin/acid = 1) //Sulphuric Acid, just like xeno spit, yuck.
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/slimefelinid //Felinid species, like cats, but the degenerate kind.
name = "Felinid Mutation Toxin"
id = "felinidmuttoxin"
results = list("felinidmutationtoxin" = 1)
required_reagents = list("aphro" = 1) //Crocin, *points* HORNY, also the whole /datum/chemical_reaction/cat and /datum/reagent/mutationtoxin/felinid already exists in code, THIS ONE IS OPTIONAL.
results = list(/datum/reagent/mutationtoxin/felinid = 1)
required_reagents = list(/datum/reagent/drug/aphrodisiac = 1) //Crocin, *points* HORNY, also the whole /datum/chemical_reaction/cat and /datum/reagent/mutationtoxin/felinid already exists in code, THIS ONE IS OPTIONAL.
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/slimeinsect //insect species, you have a strange attraction to... lamp..
name = "Insect Mutation Toxin"
id = "insectmuttoxin"
results = list("insectmutationtoxin" = 1)
required_reagents = list("ammonia" = 1) //Ammonia, used for the mothman chemical reaction so it's more of a reference.
results = list(/datum/reagent/mutationtoxin/insect = 1)
required_reagents = list(/datum/reagent/ammonia = 1) //Ammonia, used for the mothman chemical reaction so it's more of a reference.
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/slimeipc //IPC species, BEEP.
name = "IPC Mutation Toxin"
id = "ipcmuttoxin"
results = list("ipcmutationtoxin" = 1)
required_reagents = list("oil" = 1) //Oil, makes sense for it being their blood, so..
results = list(/datum/reagent/mutationtoxin/ipc = 1)
required_reagents = list(/datum/reagent/oil = 1) //Oil, makes sense for it being their blood, so..
required_other = TRUE
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slime/slimesynthliz //They keep coming back for more
name = "Synthlizard Mutation Toxin"
id = "synthlizmuttoxin"
results = list("synthlizmutationtoxin" = 1)
required_reagents = list("silicon" = 1) //It'd be annoying to make it require synthflesh, so this will work
results = list(/datum/reagent/mutationtoxin/synthliz = 1)
required_reagents = list(/datum/reagent/silicon = 1) //It'd be annoying to make it require synthflesh, so this will work
required_other = TRUE
required_container = /obj/item/slime_extract/green
hyperstation/code/modules/resize/sizechems.dm
+6 -6
View File
@@ -15,8 +15,8 @@
name = "Cell-Volume Altering Base"
id = "sizechem"
mix_message = "the reaction rapidly alters in size!"
required_reagents = list("growthserum" = 0.15, "clonexadone" = 0.15, "gold" = 0.15, "acetone" = 0.15)
results = list("sizechem" = 0.3)
required_reagents = list(/datum/reagent/growthserum = 0.15, /datum/reagent/medicine/clonexadone = 0.15, /datum/reagent/gold = 0.15, /datum/reagent/acetone = 0.15)
results = list(/datum/reagent/sizechem = 0.3)
required_temp = 1
//Fermichem vars
OptimalTempMin = 600 // Lower area of bell curve for determining heat based rate reactions
@@ -50,8 +50,8 @@
name = "Prospacillin"
id = "growthchem"
mix_message = "the reaction appears to grow!"
required_reagents = list("sizechem" = 0.15, "condensedcapsaicin" = 0.15, "aphro" = 0.30)
results = list("growthchem" = 0.25)
required_reagents = list(/datum/reagent/sizechem = 0.15, /datum/reagent/consumable/condensedcapsaicin = 0.15, /datum/reagent/drug/aphrodisiac = 0.30)
results = list(/datum/reagent/growthchem = 0.25)
required_temp = 1
OptimalTempMin = 700 // Lower area of bell curve for determining heat based rate reactions
OptimalTempMax = 730 // Upper end for above
@@ -99,8 +99,8 @@
name = "Diminicillin"
id = "shrinkchem"
mix_message = "the reaction appears to shrink!"
required_reagents = list("sizechem" = 0.15, "frostoil" = 0.15, "aphro" = 0.30)
results = list("shrinkchem" = 0.25)
required_reagents = list(/datum/reagent/sizechem = 0.15, /datum/reagent/consumable/frostoil = 0.15, /datum/reagent/drug = 0.30)
results = list(/datum/reagent/shrinkchem = 0.25)
required_temp = 1
OptimalTempMin = 100 // Lower area of bell curve for determining heat based rate reactions
OptimalTempMax = 150 // Upper end for above