PsiOmegaDelta 3fd28dd361 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	html/changelogs/.all_changelog.yml

2015-10-14 08:41:38 +02:00

..

sheets

Reimplemented floor lights as a machine built at the autolathe.

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

tiles

Floor painter, turf, and decal tweaks.

2015-09-21 15:14:13 +02:00

matter_synth.dm

Adds the research module, condensed into one commit so far.

2015-04-04 20:17:59 -04:00

medical.dm

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

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

nanopaste.dm

Mech chargers are now a single machine

2015-08-16 06:07:36 -07:00

rods.dm

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

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

stack.dm

Merge pull request #11294 from Baystation12/master

2015-10-14 08:40:03 +02:00