Cael_Aislinn f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch ...

Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-03-10 23:01:33 +10:00

..

glass.dm

new icons, added some large artifacts, renamed/restructured a bunch of files

2013-02-10 01:30:40 +10:00

leather.dm

Committed Cael Aislinn's proposed commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11641

2013-01-08 16:30:45 +00:00

light.dm

…

mineral.dm

…

sheet_types.dm

added bees supply pack to cargo bay, made vending machine produce beezeez, make apiaries constructable out of wood

2013-03-09 23:39:24 +10:00

sheets.dm

Committing suomynonAyletamitlU's storage item standardisation commit: http://forums.nanotrasen.com/viewtopic.php?f=16&t=11746

2013-01-08 19:11:56 +00:00