Merge pull request #4277 from Woodratt/11162017_wr_drwllsprit

Door and Wall sprites

code/game/machinery/doors/airlock.dm

@@ -127,6 +127,36 @@
 	icon = 'icons/obj/doors/Doormaint.dmi'
 	assembly_type = /obj/structure/door_assembly/door_assembly_mai
 
+/obj/machinery/door/airlock/maintenance/cargo
+	icon = 'icons/obj/doors/Doormaint_cargo.dmi'
+	req_one_access = list(access_cargo)
+
+/obj/machinery/door/airlock/maintenance/command
+	icon = 'icons/obj/doors/Doormaint_command.dmi'
+	req_one_access = list(access_heads)
+
+/obj/machinery/door/airlock/maintenance/common
+	icon = 'icons/obj/doors/Doormaint_common.dmi'
+
+/obj/machinery/door/airlock/maintenance/engi
+	icon = 'icons/obj/doors/Doormaint_engi.dmi'
+	req_one_access = list(access_engine)
+
+/obj/machinery/door/airlock/maintenance/int
+	icon = 'icons/obj/doors/Doormaint_int.dmi'
+
+/obj/machinery/door/airlock/maintenance/medical
+	icon = 'icons/obj/doors/Doormaint_med.dmi'
+	req_one_access = list(access_medical)
+
+/obj/machinery/door/airlock/maintenance/rnd
+	icon = 'icons/obj/doors/Doormaint_rnd.dmi'
+	req_one_access = list(access_research)
+
+/obj/machinery/door/airlock/maintenance/sec
+	icon = 'icons/obj/doors/Doormaint_sec.dmi'
+	req_one_access = list(access_security)
+
 /obj/machinery/door/airlock/external
 	name = "External Airlock"
 	icon = 'icons/obj/doors/Doorext.dmi'

code/game/machinery/doors/multi_tile.dm

@@ -2,15 +2,44 @@
 /obj/machinery/door/airlock/multi_tile
 	width = 2
 	appearance_flags = 0
+	var/obj/machinery/filler_object/filler1
+	var/obj/machinery/filler_object/filler2
 
 /obj/machinery/door/airlock/multi_tile/New()
 	..()
 	SetBounds()
+	if(opacity)
+		create_fillers()
+
+/obj/machinery/door/airlock/multi_tile/Destroy()
+	qdel_null(filler1)
+	qdel_null(filler2)
+	return ..()
 
 /obj/machinery/door/airlock/multi_tile/Move()
 	. = ..()
 	SetBounds()
 
+/obj/machinery/door/airlock/multi_tile/open()
+	. = ..()
+
+	if(filler1)
+		filler1.set_opacity(opacity)
+		if(filler2)
+			filler2.set_opacity(opacity)
+
+	return .
+
+/obj/machinery/door/airlock/multi_tile/close()
+	. = ..()
+
+	if(filler1)
+		filler1.set_opacity(opacity)
+		if(filler2)
+			filler2.set_opacity(opacity)
+
+	return .
+
 /obj/machinery/door/airlock/multi_tile/proc/SetBounds()
 	if(dir in list(EAST, WEST))
 		bound_width = width * world.icon_size
@@ -19,9 +48,35 @@
 		bound_width = world.icon_size
 		bound_height = width * world.icon_size
 
+/obj/machinery/door/airlock/multi_tile/proc/create_fillers()
+	if(src.dir > 3)
+		filler1 = new/obj/machinery/filler_object (src.loc)
+		filler2 = new/obj/machinery/filler_object (get_step(src,EAST))
+	else
+		filler1 = new/obj/machinery/filler_object (src.loc)
+		filler2 = new/obj/machinery/filler_object (get_step(src,NORTH))
+	filler1.density = 0
+	filler2.density = 0
+	filler1.set_opacity(opacity)
+	filler2.set_opacity(opacity)
+
 /obj/machinery/door/airlock/multi_tile/glass
 	name = "Glass Airlock"
 	icon = 'icons/obj/doors/Door2x1glass.dmi'
 	opacity = 0
 	glass = 1
 	assembly_type = /obj/structure/door_assembly/multi_tile
+
+/obj/machinery/door/airlock/multi_tile/metal
+	name = "Airlock"
+	icon = 'icons/obj/doors/Door2x1metal.dmi'
+	assembly_type = /obj/structure/door_assembly/multi_tile
+
+/obj/machinery/filler_object
+	name = ""
+	icon = 'icons/obj/doors/rapid_pdoor.dmi'
+	icon_state = ""
+	density = 0
+
+/obj/machinery/door/airlock/multi_tile/metal/mait
+	icon = 'icons/obj/doors/Door2x1_Maint.dmi'