From 9d55964fb4229f3eaa3c4f864e32757a539eaa9a Mon Sep 17 00:00:00 2001 From: Legate-Maxson <88066502+Legate-Maxson@users.noreply.github.com> Date: Sat, 19 Oct 2024 20:56:08 -0400 Subject: [PATCH] Soteria Buff one out of one hundred. It's been a long time coming, This PR was meant to be done months ago. It reduces the research points needed by 37500 because it removes the research tree for the unmaker. The Greyson portable shield was moved to the glass widow branch. Unmakers can still be purchased from cargo, Found at the end of the gauntlet and now are a rare drop from the Greyson Titan robots that can be found at the end of the gauntlet or the boss rooms in the greyson's outpost. --- .../hostile/megafauna/onestarboss.dm | 2 ++ code/modules/research/designs/greyson.dm | 8 +++--- code/modules/research/nodes/greyson.dm | 28 +++++++++---------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/onestarboss.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/onestarboss.dm index 760668e8a19..e016a7bb13e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/onestarboss.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/onestarboss.dm @@ -38,6 +38,8 @@ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread s.set_up(3, 1, src) s.start() + if(prob(10)) + new /obj/item/gun_upgrade/mechanism/greyson_master_catalyst(src.loc) ..() diff --git a/code/modules/research/designs/greyson.dm b/code/modules/research/designs/greyson.dm index 84fe77d306e..78b9f163971 100644 --- a/code/modules/research/designs/greyson.dm +++ b/code/modules/research/designs/greyson.dm @@ -99,10 +99,10 @@ build_path = /obj/item/gun_upgrade/mechanism/glass_widow category = CAT_GUNMODS -/datum/design/research/item/greyson/unmaker - name = "GP \"Master Unmaker\" infuser" - build_path = /obj/item/gun_upgrade/mechanism/greyson_master_catalyst - category = CAT_GUNMODS +//datum/design/research/item/greyson/unmaker +// name = "GP \"Master Unmaker\" infuser" +// build_path = /obj/item/gun_upgrade/mechanism/greyson_master_catalyst +// category = CAT_GUNMODS /datum/design/research/item/powercell/large/grayson name = "GP-SI \"Posi-cell 16000L\"" diff --git a/code/modules/research/nodes/greyson.dm b/code/modules/research/nodes/greyson.dm index ab4ca11b03f..657ca89d0b0 100644 --- a/code/modules/research/nodes/greyson.dm +++ b/code/modules/research/nodes/greyson.dm @@ -68,7 +68,7 @@ /datum/technology/GP_window name = "Greyson Positronic Glass-Widow Infuser" - desc = "The GP Glass Widow Infuser design and manufacturing." + desc = "The GP Glass Widow Infuser design and portable self charging combat shields." tech_type = RESEARCH_GREYSON x = 0.3 //Bottom left @@ -79,23 +79,23 @@ /datum/technology/exotic_gunmods) required_tech_levels = list(RESEARCH_COMBAT = 10) cost = 11250 - unlocks_designs = list(/datum/design/research/item/greyson/glass_widow) + unlocks_designs = list(/datum/design/research/item/greyson/glass_widow, + /datum/design/research/item/greyson/combat_shield) -/datum/technology/GP_unmaker - name = "Greyson Positronic Tyrant Destroyers" - desc = "The rare and highly valueable GP Master Unmaker Infuser gun mod and portable self charging combat shields." - tech_type = RESEARCH_GREYSON +//datum/technology/GP_unmaker +// name = "Greyson Positronic Tyrant Destroyers" +// desc = "The rare and highly valueable GP Master Unmaker Infuser gun mod." +// tech_type = RESEARCH_GREYSON - x = 0.5 //Bottom middle - y = 0.3 - icon = "mastermind" +// x = 0.5 //Bottom middle +// y = 0.3 +// icon = "mastermind" - required_technologies = list(/datum/technology/GP_window) - required_tech_levels = list(RESEARCH_COMBAT = 13) - cost = 37500 +// required_technologies = list(/datum/technology/GP_window) +// required_tech_levels = list(RESEARCH_COMBAT = 13) +// cost = 37500 - unlocks_designs = list(/datum/design/research/item/greyson/unmaker, - /datum/design/research/item/greyson/combat_shield) +// unlocks_designs = list(/datum/design/research/item/greyson/unmaker) /datum/technology/GP_cells name = "Greyson Positronic Cells"