Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx

code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm

@@ -138,7 +138,7 @@ var/global/list/ts_spiderlist = list()
 	else if(istype(target, /obj/machinery/door/firedoor))
 		var/obj/machinery/door/firedoor/F = target
 		if(F.density)
-			if(F.blocked)
+			if(F.welded)
 				to_chat(src, "The fire door is welded shut.")
 			else
 				visible_message("<span class='danger'>\The [src] pries open the firedoor!</span>")
@@ -293,7 +293,7 @@ var/global/list/ts_spiderlist = list()
 			try_open_airlock(L)
 	if(istype(A, /obj/machinery/door/firedoor))
 		var/obj/machinery/door/firedoor/F = A
-		if(F.density && !F.blocked)
+		if(F.density && !F.welded)
 			F.open()
 	..()
 

code/modules/research/designs/autolathe_designs.dm

@@ -130,6 +130,14 @@
 	materials = list(MAT_METAL = 50, MAT_GLASS = 50)
 	build_path = /obj/item/weapon/airlock_electronics
 	category = list("initial", "Electronics")
+	
+/datum/design/firelock_board
+	name = "Firelock Electronics"
+	id = "firelock_board"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+	build_path = /obj/item/weapon/firelock_electronics
+	category = list("initial", "Electronics")
 
 /datum/design/apc_electronics
 	name="Power Control Module"

code/modules/research/designs/machine_designs.dm

@@ -62,6 +62,16 @@
 	build_path = /obj/item/weapon/circuitboard/power_turbine
 	category = list ("Engineering Machinery")
 
+/datum/design/quantumpad
+	name = "Machine Board (Quantum Pad Board)"
+	desc = "The circuit board for a quantum telepad."
+	id = "quantumpad"
+	req_tech = list("programming" = 4, "bluespace" = 4, "plasmatech" = 3, "engineering" = 4)
+	build_type = IMPRINTER
+	materials = list(MAT_GLASS = 1000, "sacid" = 20)
+	build_path = /obj/item/weapon/circuitboard/quantumpad
+	category = list ("Teleportation Machinery")
+
 /datum/design/telepad
 	name = "Machine Board (Telepad Board)"
 	desc = "Allows for the construction of circuit boards used to build a Telepad."

code/modules/shuttle/supply.dm

@@ -246,7 +246,8 @@
 		/obj/machinery/teleport/station,
 		/obj/machinery/teleport/hub,
 		/obj/machinery/telepad,
-		/obj/machinery/clonepod
+		/obj/machinery/clonepod,
+		/obj/machinery/quantumpad
 	)
 	if(A)
 		if(is_type_in_list(A, blacklist))