Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 ...

Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme

2015-10-10 23:17:26 -04:00

..

Cleanable

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

posters

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev

2015-08-23 01:30:46 -04:00

cleanable.dm

…

contraband.dm

objects/effects, objects/structures

2015-05-30 14:37:40 +01:00

crayon.dm

…

misc.dm

…

remains.dm

…

warning_stripes.dm

…