From d3af78793847a459d27bab5b4d0e07c961a7ea9f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 1 Sep 2018 20:22:19 -0400 Subject: [PATCH 1/4] Fixes core DA and add slime core DA --- code/controllers/subsystem/research.dm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 253975fb34..fe4f2676bd 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -17,10 +17,26 @@ SUBSYSTEM_DEF(research) var/list/techweb_boost_items = list() //associative double-layer path = list(id = list(point_type = point_discount)) var/list/techweb_nodes_hidden = list() //Nodes that should be hidden by default. var/list/techweb_point_items = list( //path = list(point type = value) - /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000), // Cit three more anomalys anomalys - /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 7500), - /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 5000), - /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 2500) // End of Cit changes + /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000), // Adds in slime core deconing + /obj/item/slime_extract/grey = (TECHWEB_POINT_TYPE_GENERIC = 500), + /obj/item/slime_extract/metal = (TECHWEB_POINT_TYPE_GENERIC = 750), + /obj/item/slime_extract/purple = (TECHWEB_POINT_TYPE_GENERIC = 750), + /obj/item/slime_extract/orange = (TECHWEB_POINT_TYPE_GENERIC = 750), + /obj/item/slime_extract/blue = (TECHWEB_POINT_TYPE_GENERIC = 750), + /obj/item/slime_extract/yellow = (TECHWEB_POINT_TYPE_GENERIC = 1000), + /obj/item/slime_extract/silver = (TECHWEB_POINT_TYPE_GENERIC = 1000), + /obj/item/slime_extract/darkblue = (TECHWEB_POINT_TYPE_GENERIC = 1000), + /obj/item/slime_extract/darkpurple = (TECHWEB_POINT_TYPE_GENERIC = 1000), + /obj/item/slime_extract/bluespace = (TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/cerulean = (TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/pyrite = (TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/green = (TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/pink = (TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/gold = (TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/black = (TECHWEB_POINT_TYPE_GENERIC = 1500), + /obj/item/slime_extract/adamantine = (TECHWEB_POINT_TYPE_GENERIC = 1500), + /obj/item/slime_extract/lightpink = (TECHWEB_POINT_TYPE_GENERIC = 1500), + /obj/item/slime_extract/rainbow = (TECHWEB_POINT_TYPE_GENERIC = 2500) // End of Cit changes ) var/list/errored_datums = list() var/list/point_types = list() //typecache style type = TRUE list From 384d76033802242b92baae46731761c5436f7a0d Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 1 Sep 2018 20:27:47 -0400 Subject: [PATCH 2/4] adds oil slime core --- code/controllers/subsystem/research.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index fe4f2676bd..5ae0a6535b 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -35,6 +35,7 @@ SUBSYSTEM_DEF(research) /obj/item/slime_extract/gold = (TECHWEB_POINT_TYPE_GENERIC = 1250), /obj/item/slime_extract/black = (TECHWEB_POINT_TYPE_GENERIC = 1500), /obj/item/slime_extract/adamantine = (TECHWEB_POINT_TYPE_GENERIC = 1500), + /obj/item/slime_extract/oil = (TECHWEB_POINT_TYPE_GENERIC = 1500), /obj/item/slime_extract/lightpink = (TECHWEB_POINT_TYPE_GENERIC = 1500), /obj/item/slime_extract/rainbow = (TECHWEB_POINT_TYPE_GENERIC = 2500) // End of Cit changes ) From c59bac3116a6cd0f4e647b99f4342a01539a9d4b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 1 Sep 2018 20:39:37 -0400 Subject: [PATCH 3/4] list --- code/controllers/subsystem/research.dm | 40 +++++++++++++------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index 5ae0a6535b..b441c3f02e 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -18,26 +18,26 @@ SUBSYSTEM_DEF(research) var/list/techweb_nodes_hidden = list() //Nodes that should be hidden by default. var/list/techweb_point_items = list( //path = list(point type = value) /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000), // Adds in slime core deconing - /obj/item/slime_extract/grey = (TECHWEB_POINT_TYPE_GENERIC = 500), - /obj/item/slime_extract/metal = (TECHWEB_POINT_TYPE_GENERIC = 750), - /obj/item/slime_extract/purple = (TECHWEB_POINT_TYPE_GENERIC = 750), - /obj/item/slime_extract/orange = (TECHWEB_POINT_TYPE_GENERIC = 750), - /obj/item/slime_extract/blue = (TECHWEB_POINT_TYPE_GENERIC = 750), - /obj/item/slime_extract/yellow = (TECHWEB_POINT_TYPE_GENERIC = 1000), - /obj/item/slime_extract/silver = (TECHWEB_POINT_TYPE_GENERIC = 1000), - /obj/item/slime_extract/darkblue = (TECHWEB_POINT_TYPE_GENERIC = 1000), - /obj/item/slime_extract/darkpurple = (TECHWEB_POINT_TYPE_GENERIC = 1000), - /obj/item/slime_extract/bluespace = (TECHWEB_POINT_TYPE_GENERIC = 1250), - /obj/item/slime_extract/cerulean = (TECHWEB_POINT_TYPE_GENERIC = 1250), - /obj/item/slime_extract/pyrite = (TECHWEB_POINT_TYPE_GENERIC = 1250), - /obj/item/slime_extract/green = (TECHWEB_POINT_TYPE_GENERIC = 1250), - /obj/item/slime_extract/pink = (TECHWEB_POINT_TYPE_GENERIC = 1250), - /obj/item/slime_extract/gold = (TECHWEB_POINT_TYPE_GENERIC = 1250), - /obj/item/slime_extract/black = (TECHWEB_POINT_TYPE_GENERIC = 1500), - /obj/item/slime_extract/adamantine = (TECHWEB_POINT_TYPE_GENERIC = 1500), - /obj/item/slime_extract/oil = (TECHWEB_POINT_TYPE_GENERIC = 1500), - /obj/item/slime_extract/lightpink = (TECHWEB_POINT_TYPE_GENERIC = 1500), - /obj/item/slime_extract/rainbow = (TECHWEB_POINT_TYPE_GENERIC = 2500) // End of Cit changes + /obj/item/slime_extract/grey = list(TECHWEB_POINT_TYPE_GENERIC = 500), + /obj/item/slime_extract/metal = list(TECHWEB_POINT_TYPE_GENERIC = 750), + /obj/item/slime_extract/purple = list(TECHWEB_POINT_TYPE_GENERIC = 750), + /obj/item/slime_extract/orange = list(TECHWEB_POINT_TYPE_GENERIC = 750), + /obj/item/slime_extract/blue = list(TECHWEB_POINT_TYPE_GENERIC = 750), + /obj/item/slime_extract/yellow = list(TECHWEB_POINT_TYPE_GENERIC = 1000), + /obj/item/slime_extract/silver = list(TECHWEB_POINT_TYPE_GENERIC = 1000), + /obj/item/slime_extract/darkblue = list(TECHWEB_POINT_TYPE_GENERIC = 1000), + /obj/item/slime_extract/darkpurple = list(TECHWEB_POINT_TYPE_GENERIC = 1000), + /obj/item/slime_extract/bluespace = list(TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/cerulean = list(TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/pyrite = list(TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/green = list(TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/pink = list(TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/gold = list(TECHWEB_POINT_TYPE_GENERIC = 1250), + /obj/item/slime_extract/black = list(TECHWEB_POINT_TYPE_GENERIC = 1500), + /obj/item/slime_extract/adamantine =list (TECHWEB_POINT_TYPE_GENERIC = 1500), + /obj/item/slime_extract/oil = list(TECHWEB_POINT_TYPE_GENERIC = 1500), + /obj/item/slime_extract/lightpink = list(TECHWEB_POINT_TYPE_GENERIC = 1500), + /obj/item/slime_extract/rainbow = list(TECHWEB_POINT_TYPE_GENERIC = 2500) // End of Cit changes ) var/list/errored_datums = list() var/list/point_types = list() //typecache style type = TRUE list From 20eca82aeddc8f298aba4679756e08890cf2ca84 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 2 Sep 2018 19:11:30 -0400 Subject: [PATCH 4/4] Re adds in cores, Poojawa is correct here --- code/controllers/subsystem/research.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index b441c3f02e..d60c8336fa 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -17,8 +17,11 @@ SUBSYSTEM_DEF(research) var/list/techweb_boost_items = list() //associative double-layer path = list(id = list(point_type = point_discount)) var/list/techweb_nodes_hidden = list() //Nodes that should be hidden by default. var/list/techweb_point_items = list( //path = list(point type = value) - /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000), // Adds in slime core deconing - /obj/item/slime_extract/grey = list(TECHWEB_POINT_TYPE_GENERIC = 500), + /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 2500), + /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 5000), // Cit three more anomalys anomalys + /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 7500), + /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000), + /obj/item/slime_extract/grey = list(TECHWEB_POINT_TYPE_GENERIC = 500), // Adds in slime core deconing /obj/item/slime_extract/metal = list(TECHWEB_POINT_TYPE_GENERIC = 750), /obj/item/slime_extract/purple = list(TECHWEB_POINT_TYPE_GENERIC = 750), /obj/item/slime_extract/orange = list(TECHWEB_POINT_TYPE_GENERIC = 750),