diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index e99dcb3fd04..b7213ccc599 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -8,6 +8,7 @@ var/overlays_file = 'icons/obj/doors/airlocks/station/overlays.dmi' var/state = AIRLOCK_ASSEMBLY_NEEDS_WIRES var/mineral + var/mineral_type var/base_name = "airlock" var/obj/item/airlock_electronics/electronics var/airlock_type = /obj/machinery/door/airlock //the type path of the airlock once completed @@ -329,7 +330,6 @@ new /obj/item/stack/sheet/glass(T) else new /obj/item/shard(T) - if(mineral) - var/obj/item/stack/sheet/mineral/mineral_path = text2path("/obj/item/stack/sheet/mineral/[mineral]") - new mineral_path(T, 2) + if(mineral_type) + new mineral_type(T, 2) qdel(src) diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index 13ebcf51a82..0bbd26b8997 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -199,6 +199,7 @@ airlock_type = /obj/machinery/door/airlock/gold mineral = "gold" glass_type = /obj/machinery/door/airlock/gold/glass + mineral_type = /obj/item/stack/sheet/mineral/gold /obj/structure/door_assembly/door_assembly_silver name = "silver airlock assembly" @@ -207,6 +208,7 @@ airlock_type = /obj/machinery/door/airlock/silver mineral = "silver" glass_type = /obj/machinery/door/airlock/silver/glass + mineral_type = /obj/item/stack/sheet/mineral/silver /obj/structure/door_assembly/door_assembly_diamond name = "diamond airlock assembly" @@ -215,6 +217,7 @@ airlock_type = /obj/machinery/door/airlock/diamond mineral = "diamond" glass_type = /obj/machinery/door/airlock/diamond/glass + mineral_type = /obj/item/stack/sheet/mineral/diamond /obj/structure/door_assembly/door_assembly_uranium name = "uranium airlock assembly" @@ -223,6 +226,7 @@ airlock_type = /obj/machinery/door/airlock/uranium mineral = "uranium" glass_type = /obj/machinery/door/airlock/uranium/glass + mineral_type = /obj/item/stack/sheet/mineral/uranium /obj/structure/door_assembly/door_assembly_plasma name = "plasma airlock assembly" @@ -231,6 +235,7 @@ airlock_type = /obj/machinery/door/airlock/plasma mineral = "plasma" glass_type = /obj/machinery/door/airlock/plasma/glass + mineral_type = /obj/item/stack/sheet/mineral/plasma /obj/structure/door_assembly/door_assembly_bananium name = "bananium airlock assembly" @@ -240,6 +245,7 @@ airlock_type = /obj/machinery/door/airlock/bananium mineral = "bananium" glass_type = /obj/machinery/door/airlock/bananium/glass + mineral_type = /obj/item/stack/sheet/mineral/bananium /obj/structure/door_assembly/door_assembly_tranquillite name = "tranquillite airlock assembly" @@ -248,6 +254,7 @@ airlock_type = /obj/machinery/door/airlock/tranquillite mineral = "tranquillite" noglass = TRUE + mineral_type = /obj/item/stack/sheet/mineral/tranquillite /obj/structure/door_assembly/door_assembly_sandstone name = "sandstone airlock assembly" @@ -256,6 +263,7 @@ airlock_type = /obj/machinery/door/airlock/sandstone mineral = "sandstone" glass_type = /obj/machinery/door/airlock/sandstone/glass + mineral_type = /obj/item/stack/sheet/mineral/sandstone /obj/structure/door_assembly/door_assembly_titanium name = "titanium airlock assembly" @@ -265,6 +273,7 @@ glass_type = /obj/machinery/door/airlock/titanium/glass airlock_type = /obj/machinery/door/airlock/titanium mineral = "titanium" + mineral_type = /obj/item/stack/sheet/mineral/titanium /obj/structure/door_assembly/door_assembly_wood name = "wooden airlock assembly" @@ -273,3 +282,4 @@ airlock_type = /obj/machinery/door/airlock/wood mineral = "wood" glass_type = /obj/machinery/door/airlock/wood/glass + mineral_type = /obj/item/stack/sheet/wood