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

..

maploader

fixes horrible runtimes

2016-04-25 10:20:27 -06:00

mission_code

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

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

bluespaceartillery.dm

Makes explosion of BS artillery configurable

2016-02-07 22:32:38 -05:00

capture_the_flag.dm

Some HoG tweaks

2016-04-30 00:42:09 -03:00

corpse.dm

Lavaland Ruin update (#17348)

2016-05-03 20:38:44 -05:00

exile.dm

…

gateway.dm

All of the bottom gateway parts are passable

2016-03-10 16:03:43 -05:00

pamphlet.dm

missing space

2015-12-25 17:33:33 -06:00

signpost.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

zlevel.dm

Names of loaded ruins maps are saved in world log

2016-04-23 06:56:58 +03:00