paprka 279c2709d4 Merge branch 'master' of https://github.com/tgstation/-tg-station into readdjanikart ...

Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm

2015-01-24 01:40:51 -08:00

..

designs

Did what HG said to do with Protosmg firing pin

2015-01-22 08:08:14 +02:00

circuitprinter.dm

* Updated the autolathe to use the datum/designs system (new file

2014-12-13 22:56:43 +01:00

designs.dm

adds key spawning and stuff

2015-01-21 18:39:17 -08:00

destructive_analyzer.dm

Moves m_amt, g_amt, reliability and origin_tech to /obj/item (previously in /obj)

2014-11-02 14:10:03 -03:00

experimentor.dm

Fixes a missed span

2015-01-24 05:32:51 +11:00

message_server.dm

Merge remote-tracking branch 'upstream/master' into hiasl

2014-11-01 20:04:26 -03:00

protolathe.dm

Adds "Firing pins" category to protolathe

2015-01-17 01:23:04 +09:00

rd-readme.dm

Removed the icon color blend operations from human's update_icons().

2014-01-16 14:33:50 +00:00

rdconsole.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into expexpanded

2015-01-17 09:55:12 +11:00

rdmachines.dm

Adds deconstruction for DNA scanner and cloning pod.

2013-12-07 08:55:07 +02:00

research.dm

* Updated the autolathe to use the datum/designs system (new file

2014-12-13 22:56:43 +01:00

server.dm

Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor

2014-12-09 16:03:45 -08:00