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

Conflicts:
	code/modules/clothing/masks/gasmask.dm

2015-06-28 15:22:21 +02:00

..

ai

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

2015-06-15 11:27:11 -05:00

pai

Removed unnecessary spaces in these situations:

2015-06-14 12:13:19 +03:00

robot

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

2015-06-28 15:22:21 +02:00

death.dm

* Refactored gib() and dust()

2013-12-23 17:56:58 +00:00

laws.dm

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

2015-06-15 16:34:56 +10:00

login.dm

Gang Mode

2014-08-30 23:17:14 -06:00

say.dm

Fixes all possible exploits with the AI tracking href link

2015-05-22 11:26:43 -03:00

silicon.dm

Removes my changes to cyborgs.

2015-05-01 16:32:34 +02:00