Giacomand 44895bf36f Merge branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff ...

Resolved Conflicts:
	code/modules/projectiles/projectile.dm

2013-12-18 18:27:22 +00:00

..

jobs

Removed ONESIZEFITSALL.

2013-12-15 15:58:55 +00:00

chameleon.dm

Refactors the code to work with BYOND 500. Big commit.

2013-10-06 19:47:30 +01:00

color.dm

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

2013-12-18 18:27:22 +00:00

miscellaneous.dm

Removed ONESIZEFITSALL.

2013-12-15 15:58:55 +00:00

shorts.dm

Refactors the code to work with BYOND 500. Big commit.

2013-10-06 19:47:30 +01:00

syndicate.dm

Refactors the code to work with BYOND 500. Big commit.

2013-10-06 19:47:30 +01:00

ties.dm

Refactors the code to work with BYOND 500. Big commit.

2013-10-06 19:47:30 +01:00