July 5th TG sync (#1883)

July 5th TG sync

code/modules/research/designs/machine_designs.dm

@@ -106,14 +106,6 @@
 	build_path = /obj/item/weapon/circuitboard/computer/launchpad_console
 	category = list ("Teleportation Machinery")
 
-/*/datum/design/board/telepad
-	name = "Machine Design (Telepad Board)"
-	desc = "The circuit board for a telescience telepad."
-	id = "telepad"
-	req_tech = list("programming" = 4, "bluespace" = 5, "plasmatech" = 4, "engineering" = 4)
-	build_path = /obj/item/weapon/circuitboard/machine/telesci_pad
-	category = list ("Teleportation Machinery")
-*/
 /datum/design/board/teleconsole
 	name = "Computer Design (Teleporter Console)"
 	desc = "Allows for the construction of circuit boards used to build a teleporter control console."
@@ -122,14 +114,6 @@
 	build_path = /obj/item/weapon/circuitboard/computer/teleporter
 	category = list("Teleportation Machinery")
 
-/* /datum/design/board/telesci_console
-	name = "Computer Design (Telepad Control Console Board)"
-	desc = "Allows for the construction of circuit boards used to build a telescience console."
-	id = "telesci_console"
-	req_tech = list("programming" = 3, "bluespace" = 3, "plasmatech" = 4)
-	build_path = /obj/item/weapon/circuitboard/computer/telesci_console
-	category = list("Teleportation Machinery")
-*/
 /datum/design/board/sleeper
 	name = "Machine Design (Sleeper Board)"
 	desc = "The circuit board for a sleeper."

code/modules/research/designs/mechfabricator_designs.dm

@@ -768,7 +768,7 @@
 	construction_time = 100
 	build_path = /obj/item/device/assembly/flash/handheld
 	category = list("Misc")
-/*
+
 /datum/design/flightsuit		//Multi step build process/redo WIP
 	name = "Flight Suit"
 	desc = "A specialized hardsuit that is able to attach a flightpack and accessories.."
@@ -801,4 +801,3 @@
 	construction_time = 100
 	category = list("Misc")
 	req_tech = list("magnets" = 2, "combat" = 2, "plasmatech" = 3, "materials" = 3, "engineering" = 2, "powerstorage" = 2)
-*/

code/modules/research/designs/medical_designs.dm

@@ -201,7 +201,6 @@
 	build_path = /obj/item/organ/eyes/robotic/glow
 	category = list("Misc", "Medical Designs")
 
-
 /datum/design/cyberimp_breather
 	name = "Breathing Tube Implant"
 	desc = "This simple implant adds an internals connector to your back, allowing you to use internals without a mask and protecting you from being choked."

code/modules/research/designs/power_designs.dm

@@ -78,7 +78,6 @@
 	build_path = /obj/item/weapon/inducer/sci
 	category = list("Power Designs")
 
-
 /datum/design/board/pacman
 	name = "Machine Design (PACMAN-type Generator Board)"
 	desc = "The circuit board that for a PACMAN-type portable generator."

code/modules/research/designs/smelting_designs.dm

@@ -17,6 +17,14 @@
 	build_path = /obj/item/stack/sheet/mineral/plastitanium
 	category = list("initial")
 
+/datum/design/plaglass_alloy
+	name = "Plasma + Glass alloy"
+	id = "plasmaglass"
+	build_type = SMELTER
+	materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
+	build_path = /obj/item/stack/sheet/glass/plasma
+	category = list("initial")
+
 /datum/design/alienalloy
 	name = "Alien Alloy"
 	desc = "A sheet of reverse-engineered alien alloy."
@@ -25,4 +33,4 @@
 	build_type = PROTOLATHE | SMELTER
 	materials = list(MAT_METAL = 4000, MAT_PLASMA = 4000)
 	build_path = /obj/item/stack/sheet/mineral/abductor
-	category = list("Stock Parts")
+	category = list("Stock Parts")

code/modules/research/designs/weapon_designs.dm

@@ -52,14 +52,14 @@
 	build_path = /obj/item/weapon/shield/riot/tele
 	category = list("Weapons")
 
-/datum/design/lasercannon
-	name = "Accelerator Laser Cannon"
-	desc = "A heavy duty laser cannon. It does more damage the farther away the target is."
-	id = "lasercannon"
-	req_tech = list("combat" = 5, "magnets" = 5, "powerstorage" = 3)
+/datum/design/beamrifle
+	name = "Beam Marksman Rifle"
+	desc = "A powerful long ranged anti-material rifle that fires charged particle beams to obliterate targets."
+	id = "beamrifle"
+	req_tech = list("combat" = 7, "magnets" = 5, "powerstorage" = 5, "materials" = 7, "programming" = 5)
 	build_type = PROTOLATHE
-	materials = list(MAT_METAL = 10000, MAT_GLASS = 3000, MAT_DIAMOND = 3000)
-	build_path = /obj/item/weapon/gun/energy/lasercannon
+	materials = list(MAT_METAL = 10000, MAT_GLASS = 5000, MAT_DIAMOND = 5000, MAT_URANIUM = 8000, MAT_SILVER = 4500, MAT_GOLD = 5000)
+	build_path = /obj/item/weapon/gun/energy/beam_rifle
 	category = list("Weapons")
 
 /datum/design/decloner
@@ -258,4 +258,4 @@
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 5000, MAT_GLASS = 1500, MAT_URANIUM = 1500, MAT_SILVER = 1500)
 	build_path = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow/large
-	category = list("Weapons")
+	category = list("Weapons")