Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts

2014-12-28 11:20:15 +03:00

..

Academy.dm

The singularity/narsie are no longer machines

2014-12-12 19:42:37 -03:00

blackmarketpackers.dm

Initial pass to convert LF to CRLF

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

centcomAway.dm

Initial pass to convert LF to CRLF

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

challenge.dm

Big(gish) map reorganization.

2014-01-13 22:38:11 +00:00

spacebattle.dm

Initial pass to convert LF to CRLF

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

stationCollision.dm

refactors narsie to use the object oriented programming meme

2014-12-18 11:44:20 -08:00

wildwest.dm

Fixed stuff tkdrg pointed out

2014-12-28 10:49:04 +03:00