Merge branch 'test_branch' into work_in_progress

This commit is contained in:
Cael_Aislinn
2012-12-05 04:48:10 +10:00
13 changed files with 253 additions and 86 deletions

View File

@@ -83,6 +83,10 @@
else if(istype(target, /obj/item/clothing/suit/space/space_ninja))
return
//bunsen burner handles all of this as well
else if(istype(target, /obj/machinery/bunsen_burner))
return
else if(reagents.total_volume)
user << "\blue You splash the solution onto [target]."
src.reagents.reaction(target, TOUCH)