From b7280508823929f8a8c6c8533afe5963af2803da Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Mon, 21 Oct 2019 09:15:11 -0400 Subject: [PATCH 1/8] alien research disk e --- code/modules/research/research_disk.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/modules/research/research_disk.dm b/code/modules/research/research_disk.dm index 2ec2398d88..1c153a06dd 100644 --- a/code/modules/research/research_disk.dm +++ b/code/modules/research/research_disk.dm @@ -29,3 +29,12 @@ /obj/item/disk/tech_disk/illegal/Initialize() . = ..() stored_research = new /datum/techweb/syndicate + +/obj/item/disk/tech_disk/abductor + name = "Alien technology desk" + desc = "A technology disk that holds the secrets of the Grays." + materials = list() + +/obj/item/disk/tech_disk/abductor/Initialize() + . = ..() + stored_research = new /datum/techweb/abductor From 3077d538ecf2015b7cc07a96233eaff6f198eee0 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Mon, 21 Oct 2019 09:21:48 -0400 Subject: [PATCH 2/8] makes alien tech unlocking more consistent and also makes them cost more and require more relevant research to get, as well as decreasing their export price --- code/modules/research/techweb/all_nodes.dm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 5b3a21dd5c..125c4661cf 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -1027,26 +1027,19 @@ id = "alien_bio" display_name = "Alien Biological Tools" description = "Advanced biological tools." - prereq_ids = list("alientech", "adv_biotech") + prereq_ids = list("alientech", "advance_surgerytools") design_ids = list("alien_scalpel", "alien_hemostat", "alien_retractor", "alien_saw", "alien_drill", "alien_cautery") - boost_item_paths = list(/obj/item/gun/energy/alien, /obj/item/scalpel/alien, /obj/item/hemostat/alien, /obj/item/retractor/alien, /obj/item/circular_saw/alien, - /obj/item/cautery/alien, /obj/item/surgicaldrill/alien, /obj/item/screwdriver/abductor, /obj/item/wrench/abductor, /obj/item/crowbar/abductor, /obj/item/multitool/abductor, /obj/item/stock_parts/cell/infinite/abductor, - /obj/item/weldingtool/abductor, /obj/item/wirecutters/abductor, /obj/item/circuitboard/machine/abductor, /obj/item/abductor_baton, /obj/item/abductor) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - export_price = 20000 - hidden = TRUE + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) + export_price = 10000 /datum/techweb_node/alien_engi id = "alien_engi" display_name = "Alien Engineering" description = "Alien engineering tools" - prereq_ids = list("alientech", "adv_engi") + prereq_ids = list("alientech", "exp_tools") design_ids = list("alien_wrench", "alien_wirecutters", "alien_screwdriver", "alien_crowbar", "alien_welder", "alien_multitool") - boost_item_paths = list(/obj/item/screwdriver/abductor, /obj/item/wrench/abductor, /obj/item/crowbar/abductor, /obj/item/multitool/abductor, /obj/item/stock_parts/cell/infinite/abductor, - /obj/item/weldingtool/abductor, /obj/item/wirecutters/abductor, /obj/item/circuitboard/machine/abductor, /obj/item/abductor_baton, /obj/item/abductor) - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - export_price = 20000 - hidden = TRUE + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) + export_price = 10000 /datum/techweb_node/syndicate_basic id = "syndicate_basic" @@ -1106,4 +1099,4 @@ for(var/i in processing) var/datum/techweb_node/TN = i TW.add_point_list(TN.research_costs) - return TW.printout_points() \ No newline at end of file + return TW.printout_points() From 797d6b4795acfc2e4b95d18bbf9407a7c02a9c07 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Mon, 21 Oct 2019 09:23:33 -0400 Subject: [PATCH 3/8] copy paste spaghetti forgive me --- code/modules/research/techweb/_techweb.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm index cd5a190fd6..38489ce6f6 100644 --- a/code/modules/research/techweb/_techweb.dm +++ b/code/modules/research/techweb/_techweb.dm @@ -49,6 +49,14 @@ var/datum/techweb_node/syndicate_basic/Node = new() research_node(Node, TRUE) +/datum/techweb/abductor + id = "ABDUCTOR" + organization = "Aliens" + +/datum/techweb/abductor/New() + var/datum/techweb_node/alien_tech/Node = new() + research_node(Node, TRUE) + /datum/techweb/science //Global science techweb for RND consoles. id = "SCIENCE" organization = "Nanotrasen" From 211a3f2f939aa3bf21b0c322255c5bcf841b6e2b Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Mon, 21 Oct 2019 09:29:42 -0400 Subject: [PATCH 4/8] bad humor what am i doing --- code/modules/research/research_disk.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/research_disk.dm b/code/modules/research/research_disk.dm index 1c153a06dd..f97f9bd5fc 100644 --- a/code/modules/research/research_disk.dm +++ b/code/modules/research/research_disk.dm @@ -31,8 +31,8 @@ stored_research = new /datum/techweb/syndicate /obj/item/disk/tech_disk/abductor - name = "Alien technology desk" - desc = "A technology disk that holds the secrets of the Grays." + name = "Gray technology desk" + desc = "You feel like it's not Gray because of its color." materials = list() /obj/item/disk/tech_disk/abductor/Initialize() From d7c69507888ba6a60d8fcb75fe5bb4ee622ea28d Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Mon, 21 Oct 2019 09:30:11 -0400 Subject: [PATCH 5/8] scientists can now buy alien tech disk this isn't a bad idea i swear --- code/modules/uplink/uplink_items.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 61af0eaf78..d28ff471be 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1711,6 +1711,14 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled gas masked scientist. restricted_roles = list("Research Director", "Scientist") +/datum/uplink_item/role_restricted/alientech + name = "Alien Research Disk" + desc = "A technology disk holding a terabyte of highly confidential abductor technology. \ + Simply insert into research console of choice and import the files from the disk. You might research some useful gear from this." + item = /obj/item/disk/tech_disk/abductor + cost = 12 + restricted_roles = list("Research Director", "Scientist") + /datum/uplink_item/role_restricted/brainwash_disk name = "Brainwashing Surgery Program" desc = "A disk containing the procedure to perform a brainwashing surgery, allowing you to implant an objective onto a target. \ From 6fe65368f622fef2c9287b10d771fa0f9cd8262d Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Mon, 21 Oct 2019 10:00:52 -0400 Subject: [PATCH 6/8] roboticists can have some love --- code/modules/uplink/uplink_items.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index d28ff471be..cbdf936dfc 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1717,14 +1717,14 @@ datum/uplink_item/stealthy_weapons/taeclowndo_shoes Simply insert into research console of choice and import the files from the disk. You might research some useful gear from this." item = /obj/item/disk/tech_disk/abductor cost = 12 - restricted_roles = list("Research Director", "Scientist") + restricted_roles = list("Research Director", "Scientist", "Roboticist") /datum/uplink_item/role_restricted/brainwash_disk name = "Brainwashing Surgery Program" desc = "A disk containing the procedure to perform a brainwashing surgery, allowing you to implant an objective onto a target. \ Insert into an Operating Console to enable the procedure." item = /obj/item/disk/surgery/brainwashing - restricted_roles = list("Medical Doctor") + restricted_roles = list("Medical Doctor", "Roboticist") cost = 3 /datum/uplink_item/role_restricted/clown_bomb From 4767a91ad2a368ae8cfe6bcfe99366eab0be2885 Mon Sep 17 00:00:00 2001 From: kappa-sama Date: Mon, 21 Oct 2019 17:04:47 -0400 Subject: [PATCH 7/8] Update _techweb.dm --- code/modules/research/techweb/_techweb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm index 38489ce6f6..df58bfd138 100644 --- a/code/modules/research/techweb/_techweb.dm +++ b/code/modules/research/techweb/_techweb.dm @@ -54,7 +54,7 @@ organization = "Aliens" /datum/techweb/abductor/New() - var/datum/techweb_node/alien_tech/Node = new() + var/datum/techweb_node/alientech/Node = new() research_node(Node, TRUE) /datum/techweb/science //Global science techweb for RND consoles. From d204818ddc6f9b478777b534f444ab8bdc71b311 Mon Sep 17 00:00:00 2001 From: kappa-sama <44128284+kappa-sama@users.noreply.github.com> Date: Tue, 22 Oct 2019 14:45:26 -0400 Subject: [PATCH 8/8] disk not desk sleepcoding is a bad idea --- code/modules/research/research_disk.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/research_disk.dm b/code/modules/research/research_disk.dm index f97f9bd5fc..02865dc5bb 100644 --- a/code/modules/research/research_disk.dm +++ b/code/modules/research/research_disk.dm @@ -31,7 +31,7 @@ stored_research = new /datum/techweb/syndicate /obj/item/disk/tech_disk/abductor - name = "Gray technology desk" + name = "Gray technology disk" desc = "You feel like it's not Gray because of its color." materials = list()