Kelenius 6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic ...

Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm

2015-08-21 16:59:57 +03:00

..

devices

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

robot

Merge branch 'dev' into ofMechfabAndPanic

2015-08-17 09:58:23 +03:00

stacks

Reimplemented floor lights as a machine built at the autolathe.

2015-08-16 19:26:17 -07:00

weapons

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

apc_frame.dm

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

2015-06-08 09:57:33 +02:00

blueprints.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

bodybag.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

contraband.dm

…

crayons.dm

Adds the ability to draw arrows with crayon

2015-07-09 23:35:06 -04: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

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

2015-07-30 10:49:37 +02:00

toys.dm

Removes unused obj flags and fixes overlapping flags

2015-08-18 17:08:41 -04:00

trash.dm

…