Merge pull request #10234 from Baystation12/dev-freeze

Dev freeze -> Dev
This commit is contained in:
Chinsky
2015-07-18 23:56:10 +03:00
3 changed files with 28 additions and 22 deletions

View File

@@ -24,6 +24,9 @@
try_heating()
else
user << "\red You can't put the [W] onto the [src]."
/obj/machinery/bunsen_burner/attack_ai()
return
/obj/machinery/bunsen_burner/attack_hand(mob/user as mob)
if(held_container)