phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment ...

Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm

2016-05-05 21:57:10 +02:00

..

Academy.dm

Changes to Stocks UI, Cargo fixes

2016-04-17 04:40:06 +03:00

blackmarketpackers.dm

CHERIBUCKS

2016-01-01 23:45:19 -06:00

Cabin.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

centcomAway.dm

…

challenge.dm

Fixes the other away missions

2016-01-01 23:49:42 -06:00

researchbase.dm

spellingishard

2016-01-02 00:59:53 -05:00

snowdin.dm

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

2016-05-05 21:57:10 +02:00

spacebattle.dm

Fixes the other away missions

2016-01-01 23:49:42 -06:00

stationCollision.dm

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

wildwest.dm

Created two new procs to handle reviving mobs more easily:

2016-02-16 23:27:08 +01:00