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

..

_readme.dm

Initial pass to convert LF to CRLF

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

admin.dm

Initial pass to convert LF to CRLF

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

atmospherics.dm

Adds a new define for temperature protection for more robust firefighting gear

2014-11-08 02:14:37 -08:00

clothing.dm

Initial pass to convert LF to CRLF

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

combat.dm

initial commit for adding jitteriness for electrodes

2014-12-14 21:47:29 -08:00

flags.dm

Fixes helmet flags being broken

2014-12-14 17:21:57 +01:00

genetics.dm

Fixed stuff tkdrg pointed out

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

hud.dm

Includes antag HUDs in the datum hud overhaul

2014-11-20 15:43:51 -03:00

machines.dm

Finished the exofab revamp:

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

math.dm

Initial pass to convert LF to CRLF

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

misc.dm

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

2014-12-12 04:51:16 +03:00

preferences.dm

Resolved conflicts and added my yml changelog file

2014-09-19 09:30:59 -06:00

sight.dm

Includes antag HUDs in the datum hud overhaul

2014-11-20 15:43:51 -03:00

stat.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00