Cuboos 0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1 ...

Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt

2014-12-15 18:12:14 -08:00

..

designs

Merge pull request #6189 from Menshin/exofab_revamp_end+fixes

2014-12-11 11:52:16 -06:00

circuitprinter.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

designs.dm

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

2014-12-15 18:12:14 -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

message_server.dm

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

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

protolathe.dm

Finished the exofab revamp:

2014-12-02 23:00:22 +01:00

rd-readme.dm

…

rdconsole.dm

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

2014-12-11 13:53:37 -08:00

rdmachines.dm

…

research.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

server.dm

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

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