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

Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

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

2013-02-25 14:40:46 +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

-Changed all minerals path from /obj/item/stack/sheet to /obj/item/stack/sheet/mineral. (This change excludes glass, Rglass, metal and plasteel)

2012-11-16 15:00:09 +00:00

sheet_types.dm

made circuits to construct RUST computers researchable, made circuits to construct wall mounted RUST machinery researchable, made other RUST machinery orderable via QM

2013-02-22 20:00:05 +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