fixing merge conflicts

code/modules/research/designs/autolathe_desings/autolathe_designs_construction.dm

@@ -1,11 +1,11 @@
 ///////////////////////////////////
-//////////Autolathe Designs ///////
+//////////Autolathe Designs////////
 ///////////////////////////////////
 
 
-////////////////
-///Construction//
-////////////////
+//////////////////
+///Construction///
+//////////////////
 
 /datum/design/rods
 	name = "Metal Rod"

code/modules/research/designs/autolathe_desings/autolathe_designs_tools.dm

@@ -1,8 +1,8 @@
 ///////////////////////////////////
-//////////Autolathe Designs ///////
+/////////Autolathe Designs/////////
 ///////////////////////////////////
 ///////////
-///Tools //
+///Tools///
 ///////////
 /datum/design/bucket
 	name = "Bucket"
@@ -52,7 +52,8 @@
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 50, MAT_GLASS = 20)
 	build_path = /obj/item/multitool
-	category = list("initial","Tools")
+	category = list("initial","Tools","Tool Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE
 
 /datum/design/analyzer
 	name = "Analyzer"

code/modules/research/designs/mining_designs.dm

@@ -62,6 +62,26 @@
 	category = list("Mining Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_CARGO
 
+/datum/design/plasteel_pick
+	name = "plasteel-tipped pickaxe"
+	desc = "A pickaxe with a plasteel pick head. Less robust at cracking rock walls and digging up dirt than the titanium pickaxe, but better at cracking open skulls."
+	id = "plasteel_pick"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL=2000, MAT_PLASMA=2000)
+	build_path = /obj/item/pickaxe/plasteel
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
+/datum/design/titanium_pick
+	name = "titanium-tipped pickaxe"
+	desc = "A pickaxe with a titanium pick head. Extremely robust at cracking rock walls and digging up dirt, but less than the plasteel pickaxe at cracking open skulls."
+	id = "titanium_pick"
+	build_type = PROTOLATHE
+	materials = list(MAT_TITANIUM = 4000)
+	build_path = /obj/item/pickaxe/titanium
+	category = list("Mining Designs")
+	departmental_flags = DEPARTMENTAL_FLAG_CARGO
+
 /datum/design/jackhammer
 	name = "Sonic Jackhammer"
 	desc = "Essentially a handheld planet-cracker. Can drill through walls with ease as well."

code/modules/research/designs/misc_designs.dm

@@ -250,10 +250,10 @@
 	name = "Plant Data Disk"
 	desc = "A disk for storing plant genetic data."
 	id = "diskplantgene"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(MAT_METAL=200, MAT_GLASS=100)
 	build_path = /obj/item/disk/plantgene
-	category = list("Electronics")
+	category = list("Electronics","Imported")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
 /datum/design/roastingstick
@@ -289,6 +289,16 @@
 ////////////Janitor Designs//////////////
 /////////////////////////////////////////
 
+/datum/design/mop
+	name = "Mop"
+	desc = "Just your everyday standard mop."
+	id = "mop"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1200, MAT_GLASS = 100)
+	build_path = /obj/item/mop
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
 /datum/design/advmop
 	name = "Advanced Mop"
 	desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
@@ -405,7 +415,7 @@
 
 /datum/design/holosigncombifan
 	name = "ATMOS Holo-Combifan Projector"
-	desc = "A holographic projector that creates holographic barriesr that prevent changes in atmospheric and temperature conditions."
+	desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric and temperature conditions."
 	id = "holosigncombifan"
 	build_type = PROTOLATHE
 	materials = list(MAT_METAL = 7500, MAT_GLASS = 2500, MAT_SILVER = 2500, MAT_GOLD = 2500, MAT_TITANIUM = 1750)

code/modules/research/designs/tool_designs.dm

@@ -27,7 +27,7 @@
 	desc = "A tool that can construct and deconstruct walls, airlocks and floors on the fly."
 	id = "rcd_loaded"
 	build_type = PROTOLATHE
-	materials = list(MAT_METAL = MINERAL_MATERIAL_AMOUNT, MAT_GLASS = MINERAL_MATERIAL_AMOUNT)  // costs more than what it did in the autolathe, this one comes loaded.
+	materials = list(MAT_METAL = 36000)  // costs more than what it did in the autolathe, this one comes loaded.
 	build_path = /obj/item/construction/rcd/loaded
 	category = list("Tool Designs")
 	departmental_flags =  DEPARTMENTAL_FLAG_ENGINEERING

code/modules/research/designs/weapon_designs.dm

@@ -225,6 +225,16 @@
 	category = list("Firing Pins")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
+/datum/design/pin_away
+	name = "Station Locked Pin"
+	desc = "This is a security firing pin which only authorizes users who are off station."
+	id = "pin_away"
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1500, MAT_GLASS = 2000)
+	build_path = /obj/item/firing_pin/away
+	category = list("Firing Pins")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
 //////////////
 //Guns////////
 //////////////