diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm
index 96ffc936a7b..eb743afad62 100644
--- a/code/game/area/areas.dm
+++ b/code/game/area/areas.dm
@@ -81,9 +81,10 @@
 
 /area/proc/air_doors_close()
 	if(!air_doors_activated)
-		air_doors_activated = 1
+		air_doors_activated = TRUE
 		for(var/obj/machinery/door/firedoor/D in src)
 			if(!D.welded)
+				D.activate_alarm()
 				if(D.operating)
 					D.nextstate = CLOSED
 				else if(!D.density)
@@ -92,9 +93,10 @@
 
 /area/proc/air_doors_open()
 	if(air_doors_activated)
-		air_doors_activated = 0
+		air_doors_activated = FALSE
 		for(var/obj/machinery/door/firedoor/D in src)
 			if(!D.welded)
+				D.deactivate_alarm()
 				if(D.operating)
 					D.nextstate = OPEN
 				else if(D.density)
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index 29270a54c99..25aaa6d810b 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -13,9 +13,9 @@
 	icon = 'icons/obj/doors/Doorfireglass.dmi'
 	icon_state = "door_open"
 	opacity = 0
-	density = 0
-	heat_proof = 1
-	glass = 1
+	density = FALSE
+	heat_proof = TRUE
+	glass = TRUE
 	power_channel = ENVIRON
 	closed_layer = 3.11
 	auto_close_time = 50
@@ -24,9 +24,10 @@
 	var/force_open_time = 300
 	var/assembly_type = /obj/structure/firelock_frame	
 	var/nextstate = null
-	var/welded = 0
-	var/boltslocked = 1
-	var/can_deconstruct = 1
+	var/welded = FALSE
+	var/boltslocked = TRUE
+	var/can_deconstruct = TRUE
+	var/active_alarm = TRUE
 
 /obj/machinery/door/firedoor/Bumped(atom/AM)
 	if(p_open || operating)	
@@ -127,6 +128,8 @@
 
 /obj/machinery/door/firedoor/update_icon()
 	overlays.Cut()
+	if(active_alarm && !(stat & NOPOWER))
+		overlays += image('icons/obj/doors/Doorfire.dmi', "alarmlights")
 	if(density)
 		icon_state = "door_closed"
 		if(welded)
@@ -135,6 +138,14 @@
 		icon_state = "door_open"
 		if(welded)
 			overlays += "welded_open"
+			
+/obj/machinery/door/firedoor/proc/activate_alarm()
+	active_alarm = TRUE
+	update_icon()
+	
+/obj/machinery/door/firedoor/proc/deactivate_alarm()
+	active_alarm = FALSE
+	update_icon()
 
 /obj/machinery/door/firedoor/open()
 	. = ..()
diff --git a/icons/obj/doors/Doorfire.dmi b/icons/obj/doors/Doorfire.dmi
index 1f3999b774e..94ec8b967fb 100644
Binary files a/icons/obj/doors/Doorfire.dmi and b/icons/obj/doors/Doorfire.dmi differ