Merge remote-tracking branch 'upstream/master' into mechastuff

# Conflicts:
#	code/game/mecha/mecha.dm
This commit is contained in:
tigercat2000
2018-11-01 08:37:46 -07:00
22 changed files with 227 additions and 86 deletions
+8
View File
@@ -923,6 +923,14 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
containername = "machine prototype crate"
access = access_research
/datum/supply_packs/science/oil
name = "Oil Tank Crate"
contains = list(/obj/structure/reagent_dispensers/oil,
/obj/item/reagent_containers/food/drinks/oilcan)
cost = 10
containertype = /obj/structure/largecrate
containername = "oil tank crate"
//////////////////////////////////////////////////////////////////////////////
//////////////////////////// Organic /////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////