Added portable_atmospherics to hydroponics machine path, couple of other tweaks.

Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
This commit is contained in:
Zuhayr
2014-07-26 14:03:46 -04:00
committed by ZomgPonies
parent 5a773dba35
commit c0ba021bcd
15 changed files with 13037 additions and 13028 deletions
+1 -1
View File
@@ -39,7 +39,7 @@
return
if(9)
for(var/i = 0, i < 3, i++)
new/obj/machinery/hydroponics(src)
new/obj/machinery/portable_atmospherics/hydroponics(src)
if(10)
for(var/i = 0, i < 3, i++)
new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src)
+1 -1
View File
@@ -173,7 +173,7 @@
fluffitems = list(
// /obj/structure/flora/kirbyplants=1,
/obj/structure/table/reinforced=2,
/obj/machinery/hydroponics=1,
/obj/machinery/portable_atmospherics/hydroponics=1,
/obj/effect/glowshroom/single=2,
/obj/item/weapon/reagent_containers/syringe/antitoxin=2,
/obj/item/weapon/reagent_containers/glass/bottle/diethylamine=3,