Merge branch 'master' of github.com:Baystation12/Baystation12

Conflicts:
	baystation12.dme
This commit is contained in:
Apple_Master
2012-02-25 18:02:57 +00:00
37 changed files with 3363 additions and 2357 deletions
@@ -7,7 +7,7 @@
var/max_fuel = 350
/obj/item/weapon/weldpack/New()
var/datum/reagents/R = new/datum/reagents(max_fuel) //5 refills
var/datum/reagents/R = new/datum/reagents(max_fuel) //Lotsa refills
reagents = R
R.my_atom = src
R.add_reagent("fuel", max_fuel)