Merge remote-tracking branch 'citadel/master' into tgsync

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

@@ -74,12 +74,12 @@
 	build_path = /obj/item/restraints/handcuffs
 	category = list("hacked", "Security")
 
-/datum/design/rifle_receiver
-	name = "Rifle Receiver"
-	id = "rifle_receiver"
+/datum/design/reciever
+	name = "Modular Receiver"
+	id = "modular_receiver"
 	build_type = AUTOLATHE
 	materials = list(/datum/material/iron = 24000)
-	build_path = /obj/item/weaponcrafting/improvised_parts/rifle_receiver
+	build_path = /obj/item/weaponcrafting/receiver
 	category = list("hacked", "Security")
 
 /datum/design/shotgun_slug

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

@@ -282,10 +282,3 @@
 	build_path = /obj/item/vending_refill/custom
 	category = list("initial", "Misc")
 
-/datum/design/trigger_assembly
-	name = "Trigger Assembly"
-	id = "trigger_assembly"
-	build_type = AUTOLATHE
-	materials = list(/datum/material/iron = 6500, /datum/material/glass = 50)
-	build_path = /obj/item/weaponcrafting/improvised_parts/trigger_assembly
-	category = list("initial", "Misc")

code/modules/research/designs/misc_designs.dm

@@ -481,7 +481,7 @@
 	build_path = /obj/item/holosign_creator/atmos
 	category = list("Tool Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
+/*
 /datum/design/holosignfirelock
 	name = "ATMOS Holofirelock Projector"
 	desc = "A holographic projector that creates holographic barriers that prevent changes in temperature conditions."
@@ -491,7 +491,7 @@
 	build_path = /obj/item/holosign_creator/firelock
 	category = list("Tool Designs")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
-
+*/
 /datum/design/holosigncombifan
 	name = "ATMOS Holo-Combifan Projector"
 	desc = "A holographic projector that creates holographic barriers that prevent changes in atmospheric and temperature conditions."