From 690c714bc5cf6340dd3bd0735da6e35472acfbd6 Mon Sep 17 00:00:00 2001 From: Fuzzy Date: Mon, 10 Jul 2023 17:41:55 -0800 Subject: [PATCH 1/2] slime stuffs! --- code/game/objects/items/stacks/sheets/mineral.dm | 2 +- code/modules/reagents/chemistry/recipes/slime_extracts.dm | 6 +++++- code/modules/research/xenobiology/xenobiology.dm | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index af82d2cec91..595e77cb5bb 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -382,7 +382,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \ * Adamantine */ GLOBAL_LIST_INIT(adamantine_recipes, list( - new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=1, res_amount=1), + //new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=1, res_amount=1), //we don't need golems running around till they rebalanced new/datum/stack_recipe("adamant ingot", /obj/item/ingot/adamantine, 6, time = 100), \ )) diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 217d73204ef..d3da3fcb9fe 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -342,7 +342,7 @@ /datum/chemical_reaction/slime/slimeregen name = "Slime Regen" id = "m_regen" - results = list(/datum/reagent/medicine/regen_jelly = 5) + results = list(/datum/reagent/medicine/regen_jelly = 2) //editted from 5, toned down for more scarcity required_reagents = list(/datum/reagent/blood = 1) required_container = /obj/item/slime_extract/purple required_other = TRUE @@ -389,6 +389,7 @@ slime.visible_message(span_danger("The [slime] is driven into a frenzy!")) ..() +/*slowdown is an important mechanic /datum/chemical_reaction/slime/slimespeed name = "Slime Speed" id = "m_speed" @@ -399,6 +400,7 @@ /datum/chemical_reaction/slime/slimespeed/on_reaction(datum/reagents/holder) new /obj/item/slimepotion/speed(get_turf(holder.my_atom)) ..() +*/ //Pink /datum/chemical_reaction/slime/docility @@ -556,6 +558,7 @@ new /obj/item/slimepotion/enhancer(get_turf(holder.my_atom)) ..() +/*paint the town red, not blue /datum/chemical_reaction/slime/slime_territory name = "Slime Territory" id = "s_territory" @@ -566,6 +569,7 @@ /datum/chemical_reaction/slime/slime_territory/on_reaction(datum/reagents/holder) new /obj/item/areaeditor/blueprints/slime(get_turf(holder.my_atom)) ..() +*/ //Sepia /datum/chemical_reaction/slime/slimestop diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index 45517518bb0..7dec38505c9 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -49,6 +49,7 @@ to_chat(user, span_notice("Nothing happened... This slime extract cannot be activated this way.")) return 0 +/*no crossbreeding till it gets overhauled for wasteland balance //Core-crossing: Feeding adult slimes extracts to obtain a much more powerful, single extract. /obj/item/slime_extract/attack(mob/living/simple_animal/slime/M, mob/user) if(!isslime(M)) @@ -73,6 +74,7 @@ if(M.applied >= SLIME_EXTRACT_CROSSING_REQUIRED) M.spawn_corecross() +*/ /obj/item/slime_extract/grey name = "grey slime extract" From 591590833d0e3910282310e81dd79b854f2ba309 Mon Sep 17 00:00:00 2001 From: Fuzzy Date: Mon, 10 Jul 2023 18:13:20 -0800 Subject: [PATCH 2/2] golems are okay --- code/game/objects/items/stacks/sheets/mineral.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 595e77cb5bb..af82d2cec91 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -382,7 +382,7 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list ( \ * Adamantine */ GLOBAL_LIST_INIT(adamantine_recipes, list( - //new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=1, res_amount=1), //we don't need golems running around till they rebalanced + new /datum/stack_recipe("incomplete servant golem shell", /obj/item/golem_shell/servant, req_amount=1, res_amount=1), new/datum/stack_recipe("adamant ingot", /obj/item/ingot/adamantine, 6, time = 100), \ ))