Merge pull request #634 from MrMacint0sh/master

Egg

code/defines/obj/weapon.dm

@@ -414,7 +414,7 @@
 	src.pixel_y = rand(-5.0, 5)
 	..()
 
-//Rank 1
+//Rating 1
 
 /obj/item/weapon/stock_parts/console_screen
 	name = "console screen"
@@ -476,7 +476,7 @@
 	origin_tech = list(TECH_MATERIAL = 1)
 	matter = list(DEFAULT_WALL_MATERIAL = 80)
 
-//Rank 2
+//Rating 2
 
 /obj/item/weapon/stock_parts/capacitor/adv
 	name = "advanced capacitor"
@@ -560,6 +560,48 @@
 	rating = 3
 	matter = list(DEFAULT_WALL_MATERIAL = 80)
 
+//Rating 4
+
+/obj/item/weapon/stock_parts/capacitor/quadratic
+	name = "quadratic capacitor"
+	desc = "A quadratic capacitor used in the construction of a variety of devices."
+	icon_state = "quadratic_capacitor"
+	origin_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6)
+	rating = 4
+	matter = list(DEFAULT_WALL_MATERIAL = 100,"glass" = 100)
+
+/obj/item/weapon/stock_parts/scanning_module/triphasic
+	name = "triphasic scanning module"
+	desc = "A compact, high resolution phasic scanning module used in the construction of certain devices."
+	icon_state = "triphasic_scan_module"
+	origin_tech = list(TECH_MAGNET = 8)
+	rating = 4
+	matter = list(DEFAULT_WALL_MATERIAL = 100,"glass" = 50)
+
+/obj/item/weapon/stock_parts/manipulator/femto
+	name = "femto-manipulator"
+	desc = "A very little manipulator used in the construction of certain devices."
+	icon_state = "femto_mani"
+	origin_tech = list(TECH_MATERIAL = 7, TECH_DATA = 4)
+	rating = 4
+	matter = list(DEFAULT_WALL_MATERIAL = 60,"diamond" = 50)
+
+/obj/item/weapon/stock_parts/micro_laser/quad
+	name = "quad-ultra micro-laser"
+	icon_state = "quadultra_micro_laser"
+	desc = "A small, very high-power laser used in certain devices."
+	origin_tech = list(TECH_MAGNET = 8)
+	rating = 4
+	matter = list(DEFAULT_WALL_MATERIAL = 20,"glass" = 40,"uranium" = 30)
+
+/obj/item/weapon/stock_parts/matter_bin/bluespace
+	name = "bluespace matter bin"
+	desc = "A seemingly bottomless container for holding matter."
+	icon_state = "bluespace_matter_bin"
+	origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 5)
+	rating = 4
+	matter = list(DEFAULT_WALL_MATERIAL = 80,"phoron" = 30)
+
 // Subspace stock parts
 
 /obj/item/weapon/stock_parts/subspace/ansible

code/modules/projectiles/guns/modular_guns.dm

@@ -18,12 +18,15 @@
 		/obj/item/weapon/stock_parts/capacitor/,
 		/obj/item/weapon/stock_parts/capacitor/adv,
 		/obj/item/weapon/stock_parts/capacitor/super,
+		/obj/item/weapon/stock_parts/capacitor/quadratic,
 		/obj/item/weapon/stock_parts/micro_laser/,
 		/obj/item/weapon/stock_parts/micro_laser/high,
 		/obj/item/weapon/stock_parts/micro_laser/ultra,
+		/obj/item/weapon/stock_parts/micro_laser/quad,
 		/obj/item/weapon/stock_parts/manipulator/,
 		/obj/item/weapon/stock_parts/manipulator/nano,
 		/obj/item/weapon/stock_parts/manipulator/pico,
+		/obj/item/weapon/stock_parts/manipulator/femto,
 		)
 	//Excessively long because it won't accept subtypes for some reason!
 
@@ -171,4 +174,4 @@
 	one_handed_penalty = 4 //dual wielding = no.
 	cell_type = /obj/item/weapon/cell //We're bigger. We can use much larger power cells.
 	origin_tech = list(TECH_COMBAT = 6, TECH_MAGNET = 6, TECH_MATERIAL = 5, TECH_BLUESPACE = 4) //its a damn cannon capable of holding a huge amount of parts.
-	burst_delay = 4 //preventing extreme silliness.
+	burst_delay = 4 //preventing extreme silliness.

code/modules/research/designs.dm

@@ -113,6 +113,13 @@ other types of metals and chemistry for reagents).
 	build_path = /obj/item/weapon/stock_parts/capacitor/super
 	sort_string = "CAAAC"
 
+/datum/design/item/stock_part/quadratic_capacitor
+	id = "quadratic_capacitor"
+	req_tech = list(TECH_POWER = 7, TECH_MATERIAL = 6)
+	materials = list(DEFAULT_WALL_MATERIAL = 100, "glass" = 100, "gold" = 20)
+	build_path = /obj/item/weapon/stock_parts/capacitor/quadratic
+	sort_string = "CAAAD"
+	
 /datum/design/item/stock_part/micro_mani
 	id = "micro_mani"
 	req_tech = list(TECH_MATERIAL = 1, TECH_DATA = 1)
@@ -134,6 +141,13 @@ other types of metals and chemistry for reagents).
 	build_path = /obj/item/weapon/stock_parts/manipulator/pico
 	sort_string = "CAABC"
 
+/datum/design/item/stock_part/femto_mani
+	id = "femto_mani"
+	req_tech = list(TECH_MATERIAL = 7, TECH_DATA = 4)
+	materials = list(DEFAULT_WALL_MATERIAL = 30, "diamond" = 50)
+	build_path = /obj/item/weapon/stock_parts/manipulator/femto
+	sort_string = "CAABD"
+
 /datum/design/item/stock_part/basic_matter_bin
 	id = "basic_matter_bin"
 	req_tech = list(TECH_MATERIAL = 1)
@@ -154,6 +168,13 @@ other types of metals and chemistry for reagents).
 	materials = list(DEFAULT_WALL_MATERIAL = 80)
 	build_path = /obj/item/weapon/stock_parts/matter_bin/super
 	sort_string = "CAACC"
+	
+/datum/design/item/stock_part/bluespace_matter_bin
+	id = "bluespace_matter_bin"
+	req_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 5)
+	materials = list(DEFAULT_WALL_MATERIAL = 80,"phoron" = 30)
+	build_path = /obj/item/weapon/stock_parts/matter_bin/bluespace
+	sort_string = "CAACD"
 
 /datum/design/item/stock_part/basic_micro_laser
 	id = "basic_micro_laser"
@@ -176,6 +197,13 @@ other types of metals and chemistry for reagents).
 	build_path = /obj/item/weapon/stock_parts/micro_laser/ultra
 	sort_string = "CAADC"
 
+/datum/design/item/stock_part/quad_ultra_micro_laser
+	id = "quadultra_micro_laser"
+	req_tech = list(TECH_MAGNET = 8, TECH_MATERIAL = 7)
+	materials = list(DEFAULT_WALL_MATERIAL = 20, "glass" = 40, "uranium" = 30)
+	build_path = /obj/item/weapon/stock_parts/micro_laser/quad
+	sort_string = "CAADD"
+
 /datum/design/item/stock_part/basic_sensor
 	id = "basic_sensor"
 	req_tech = list(TECH_MAGNET = 1)
@@ -196,6 +224,13 @@ other types of metals and chemistry for reagents).
 	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 20, "silver" = 10)
 	build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
 	sort_string = "CAAEC"
+	
+/datum/design/item/stock_part/triphasic_sensor
+	id = "triphasic_sensor"
+	req_tech = list(TECH_MAGNET = 8, TECH_MATERIAL = 7)
+	materials = list(DEFAULT_WALL_MATERIAL = 100, "glass" = 50, "silver" = 10)
+	build_path = /obj/item/weapon/stock_parts/scanning_module/triphasic
+	sort_string = "CAAED"
 
 /datum/design/item/stock_part/RPED
 	name = "Rapid Part Exchange Device"