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

..

1prepare_map.bat

Steals from KP instead of /tg/. Map merge will now clean all maps.

2015-07-21 09:37:48 -04:00

2clean_map.bat

Steals from KP instead of /tg/. Map merge will now clean all maps.

2015-07-21 09:37:48 -04:00

clean_map_git.sh

Two fixes

2015-02-06 16:04:37 +00:00

git_merge_installer.bat

Git Merge Installers

2015-02-03 22:02:50 +01:00

git_merge_installer.sh

Linux versions of PsiOmegaDelta's git_merge_installer scripts

2015-02-04 10:12:11 +00:00

install.txt

Linux versions of PsiOmegaDelta's git_merge_installer scripts

2015-02-04 10:12:11 +00:00

mapmerge.sh

Backports map merge fix.

2015-09-19 09:30:08 +02:00

MapPatcher.jar

updates MapPatcher.jar to use JRE8

2014-06-29 01:09:37 +10:00