Merge pull request #11548 from Baystation12/master

Dev-freeze
This commit is contained in:
PsiOmegaDelta
2015-12-01 08:09:15 +01:00
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -406,12 +406,12 @@
set_opacity(0)
sleep(3)
src.density = 0
update_nearby_tiles()
sleep(7)
src.layer = open_layer
explosion_resistance = 0
update_icon()
set_opacity(0)
update_nearby_tiles()
operating = 0
if(autoclose)
@@ -433,12 +433,12 @@
src.density = 1
explosion_resistance = initial(explosion_resistance)
src.layer = closed_layer
update_nearby_tiles()
sleep(7)
update_icon()
if(visible && !glass)
set_opacity(1) //caaaaarn!
operating = 0
update_nearby_tiles()
//I shall not add a check every x ticks if a door has closed over some fire.
var/obj/fire/fire = locate() in loc
+1
View File
@@ -296,3 +296,4 @@
if(pa.Find("right"))
if(holder.throw_atom)
holder.throw_atom.throw_at(object, 10, 1)
log_admin("[key_name(usr)] threw [holder.throw_atom] at [object]")