GinjaNinja32 76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables ...

Conflicts:
	code/setup.dm

2015-05-16 08:53:33 +01:00

..

devices

better nanoui caching + fixes

2015-05-14 22:35:50 +01:00

robot

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

stacks

Merge remote-tracking branch 'upstream/dev' into new_tables

2015-05-16 08:53:33 +01:00

weapons

Merge remote-tracking branch 'upstream/dev' into new_tables

2015-05-16 08:53:33 +01:00

apc_frame.dm

…

ashtray.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

blueprints.dm

Dev merge.

2015-05-11 18:45:14 +09:30

bodybag.dm

…

contraband.dm

…

crayons.dm

Crayons are now children of pens.

2015-05-05 08:41:24 +02:00

glassjar.dm

…

latexballoon.dm

…

paintkit.dm

Minor amendments to mech kits and icons.

2015-05-13 17:04:52 +09:30

shooting_range.dm

…

toys.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

trash.dm

…