Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

This commit is contained in:
Ccomp5950
2014-01-23 00:19:01 -06:00
22 changed files with 77 additions and 48 deletions
+2
View File
@@ -100,6 +100,7 @@
return
if( !fire )
fire = 1
master.fire = 1 //used for firedoor checks
updateicon()
mouse_opacity = 0
for(var/obj/machinery/door/firedoor/D in all_doors)
@@ -122,6 +123,7 @@
/area/proc/firereset()
if (fire)
fire = 0
master.fire = 0 //used for firedoor checks
mouse_opacity = 0
updateicon()
for(var/obj/machinery/door/firedoor/D in all_doors)