Add a new P-Ray Scanner, grant to CE, T-Ray is now a Protolathe item (#10452)

* Add a new P-Ray Scanner, grant to CE, T-Ray is now a Protolathe item

* Improper stuff

* t. BYOND

* Remove whitespace

* Fixes, move P-Ray to CE locker'

code/game/machinery/autolathe.dm

@@ -44,7 +44,6 @@
 		new /obj/item/weapon/wrench(), \
 		new /obj/item/weapon/solder(),\
 		new /obj/item/device/analyzer(), \
-		new /obj/item/device/t_scanner(), \
 		new /obj/item/weapon/pickaxe/shovel/spade(), \
 		new /obj/item/device/silicate_sprayer/empty(), \
 		),

code/game/objects/items/devices/scanners.dm

@@ -8,14 +8,14 @@ REAGENT SCANNER
 */
 
 /obj/item/device/t_scanner
-	name = "T-ray scanner"
+	name = "\improper T-ray scanner"
 	desc = "A terahertz-ray emitter and scanner that can pick up the faintest traces of energy, used to detect the invisible."
 	icon_state = "t-ray0"
 	flags = FPRINT
 	slot_flags = SLOT_BELT
 	w_class = W_CLASS_SMALL
 	item_state = "electronic"
-	starting_materials = list(MAT_IRON = 150, MAT_GLASS = 50)
+	starting_materials = list(MAT_IRON = 500, MAT_GLASS = 100)
 	w_type = RECYK_ELECTRONIC
 	melt_temperature = MELTPOINT_PLASTIC
 	origin_tech = "magnets=1;engineering=1"
@@ -75,6 +75,15 @@ REAGENT SCANNER
 				if(M)
 					M.invisibility = INVISIBILITY_LEVEL_TWO
 
+/obj/item/device/t_scanner/advanced
+	name = "\improper P-ray scanner"
+	desc = "A petahertz-ray emitter and scanner that can pick up the faintest traces of energy, used to detect the invisible. Has a significantly better range than t-ray scanners."
+	icon_state = "p-ray0"
+	origin_tech = "magnets=3;engineering=3"
+
+	base_state = "p-ray"
+	ray_range = 3
+
 /obj/item/device/healthanalyzer
 	name = "health analyzer"
 	icon_state = "health"

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -25,6 +25,7 @@
 		new /obj/item/weapon/cartridge/ce(src)
 		new /obj/item/device/radio/headset/heads/ce(src)
 		new /obj/item/weapon/storage/toolbox/mechanical(src)
+		new /obj/item/device/t_scanner/advanced(src)
 		new /obj/item/device/device_analyser/advanced(src)
 		new /obj/item/clothing/suit/storage/hazardvest(src)
 		new /obj/item/clothing/mask/gas(src)

code/modules/research/designs/engineering.dm

@@ -142,3 +142,23 @@
 	materials = list(MAT_IRON = 1500, MAT_GLASS = 200)
 	build_path = /obj/item/device/assembly/light_tile_control
 	category = "Engineering"
+
+/datum/design/t_ray_scanner
+	name = "T-Ray Scanner"
+	desc = "A terahertz ray device used to pick up the faintest traces of energy, used to detect the invisible."
+	id = "tray_scanner"
+	req_tech = list("engineering" = 1, "magnets" = 1)
+	build_type = PROTOLATHE
+	materials = list(MAT_IRON = 500, MAT_GLASS = 100)
+	build_path = /obj/item/device/t_scanner
+	category = "Engineering"
+
+/datum/design/p_ray_scanner
+	name = "P-Ray Scanner"
+	desc = "A petahertz ray device used to pick up the faintest traces of energy, used to detect the invisible."
+	id = "pray_scanner"
+	req_tech = list("engineering" = 3, "magnets" = 3)
+	build_type = PROTOLATHE
+	materials = list(MAT_IRON = 500, MAT_GLASS = 100)
+	build_path = /obj/item/device/t_scanner/advanced
+	category = "Engineering"