mwerezak ab6f0bf30c Merge remote-tracking branch 'upstream/dev' into gun-rewrite ...

Conflicts:
	code/modules/clothing/under/ties.dm
	code/modules/projectiles/projectile.dm

2015-02-10 20:59:22 -05:00

..

xenoarchaeology

Ammo magazine and casing update

2015-02-09 21:32:49 -05:00

circuitprinter.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

designs.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

destructive_analyzer.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

message_server.dm

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

protolathe.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

rd-readme.dm

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 21:44:26 -07:00

rdconsole.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

rdmachines.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00

research.dm

Fixes typo in engineering research description

2015-01-10 04:25:50 +01:00

server.dm

Update for machine upgrades and some science

2015-02-08 15:39:11 +03:00