Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

code/game/gamemodes/malfunction/Malf_Modules.dm

@@ -85,7 +85,7 @@ rcd light flash thingy on matter drain
 				for(var/mob/V in hearers(M, null))
 					V.show_message("\blue You hear a loud electrical buzzing sound!", 2)
 				spawn(50)
-					explosion(get_turf(M), 0,1,1,0)
+					explosion(get_turf(M), 0,1,2,3)
 					del(M)
 			else usr << "Out of uses."
 	else usr << "That's not a machine."

code/game/machinery/doors/airlock.dm

@@ -1193,7 +1193,8 @@ About the new airlock wires panel:
 				da.anchored = 1
 				if(mineral)
 					da.glass = mineral
-				else if(glass)
+				//else if(glass)
+				else if(glass && !da.glass)
 					da.glass = 1
 				da.state = 1
 				da.created_name = src.name

code/game/machinery/doors/multi_tile.dm

@@ -6,4 +6,5 @@
 	name = "Glass Airlock"
 	icon = 'icons/obj/doors/Door2x1glass.dmi'
 	opacity = 0
-	glass = 1
+	glass = 1
+	assembly_type = "obj/structure/door_assembly/multi_tile"

code/game/objects/items/robot/robot_parts.dm

@@ -215,6 +215,12 @@
 			O.cell.loc = O
 			W.loc = O//Should fix cybros run time erroring when blown up. It got deleted before, along with the frame.
 
+			// Since we "magically" installed a cell, we also have to update the correct component.
+			if(O.cell)
+				var/datum/robot_component/cell_component = O.components["power cell"]
+				cell_component.wrapped = O.cell
+				cell_component.installed = 1
+
 			feedback_inc("cyborg_birth",1)
 			O.Namepick()
 

code/game/objects/structures/door_assembly.dm

@@ -106,10 +106,13 @@ obj/structure/door_assembly
 		dir = EAST
 		var/width = 1
 
-//Temporary until we get sprites.
-//		airlock_type = "/multi_tile/maint"
-		glass = 1
+/*Temporary until we get sprites.
 		glass_type = "/multi_tile/glass"
+		airlock_type = "/multi_tile/maint"
+		glass = 1*/
+		base_icon_state = "g" //Remember to delete this line when reverting "glass" var to 1.
+		airlock_type = "/multi_tile/glass"
+		glass = -1 //To prevent bugs in deconstruction process.
 
 		New()
 			if(dir in list(EAST, WEST))
@@ -118,6 +121,7 @@ obj/structure/door_assembly
 			else
 				bound_width = world.icon_size
 				bound_height = width * world.icon_size
+			update_state()
 
 		Move()
 			. = ..()