Merge pull request #10442 from Baystation12/dev-freeze

Dev freeze
This commit is contained in:
PsiOmegaDelta
2015-08-07 10:37:47 +02:00
2 changed files with 25 additions and 19 deletions

View File

@@ -46,7 +46,7 @@
eject()
if(trunk)
trunk.linked = null
..()
return ..()
// attack by item places it in to disposal
/obj/machinery/disposal/attackby(var/obj/item/I, var/mob/user)
@@ -636,7 +636,7 @@
/obj/structure/disposalholder/Destroy()
qdel(gas)
active = 0
..()
return ..()
// Disposal pipes