Merge pull request #17576 from LatD/Research

[Ready for test/merge] R&D level remake

code/modules/telesci/bscrystal.dm

@@ -6,17 +6,15 @@
 	icon = 'icons/obj/telescience.dmi'
 	icon_state = "bluespace_crystal"
 	w_class = 1
-	origin_tech = "bluespace=4;materials=3"
+	origin_tech = "bluespace=6;materials=3"
 	points = 50
 	var/blink_range = 8 // The teleport range when crushed/thrown at someone.
 
-
 /obj/item/weapon/ore/bluespace_crystal/New()
 	..()
 	pixel_x = rand(-5, 5)
 	pixel_y = rand(-5, 5)
 
-
 /obj/item/weapon/ore/bluespace_crystal/attack_self(mob/user)
 	user.visible_message("<span class='warning'>[user] crushes [src]!</span>", "<span class='danger'>You crush [src]!</span>")
 	PoolOrNew(/obj/effect/particle_effect/sparks, loc)
@@ -43,6 +41,6 @@
 /obj/item/weapon/ore/bluespace_crystal/artificial
 	name = "artificial bluespace crystal"
 	desc = "An artificially made bluespace crystal, it looks delicate."
-	origin_tech = "bluespace=2"
+	origin_tech = "bluespace=3;plasmatech=4"
 	blink_range = 4 // Not as good as the organic stuff!
-	points = 0 // nice try
+	points = 0 // nice try

code/modules/telesci/gps.dm

@@ -6,7 +6,7 @@ var/list/GPS_list = list()
 	icon_state = "gps-c"
 	w_class = 2
 	slot_flags = SLOT_BELT
-	origin_tech = "programming=2;engineering=2"
+	origin_tech = "materials=2;magnets=3;bluespace=3"
 	var/gpstag = "COM0"
 	var/emped = 0
 	var/turf/locked_location
@@ -109,4 +109,4 @@ var/list/GPS_list = list()
 /obj/item/device/gps/mining/internal
 	icon_state = "gps-m"
 	gpstag = "MINER"
-	desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
+	desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."