Merge branch 'master' into more_implants

code/modules/research/designs/machine_desings/machine_designs_all_misc.dm

@@ -26,6 +26,14 @@
 	category = list ("Misc. Machinery")
 	departmental_flags = DEPARTMENTAL_FLAG_ALL
 
+/datum/design/board/autolathe_secure
+	name = "Machine Design (Secure Autolathe Board)"
+	desc = "The circuit board for an autolathe. This one is programmed to not allow hacking."
+	id = "autolathe_secure"
+	build_path = /obj/item/circuitboard/machine/autolathe/secure
+	category = list ("Misc. Machinery")
+	departmental_flags = DEPARTMENTAL_FLAG_ALL
+
 /datum/design/board/recharger
 	name = "Machine Design (Weapon Recharger Board)"
 	desc = "The circuit board for a Weapon Recharger."

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

@@ -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."

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////////
 //////////////