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
PsiOmegaDelta
924359d858
Backports map merge fix.
2015-09-19 09:30:08 +02:00
Neerti
a9dda6cf3f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
...
Conflicts:
.travis.yml
code/game/gamemodes/cult/cult.dm
code/game/gamemodes/heist/heist.dm
code/game/gamemodes/ninja/ninja.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/gamemodes/wizard/wizard.dm
code/game/jobs/job/civilian.dm
code/game/jobs/job/medical.dm
code/game/jobs/job/security.dm
code/game/objects/structures/lattice.dm
code/global.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/reagents/Chemistry-Recipes.dm
config/example/config.txt
polaris.dme
2015-09-06 18:26:06 -04:00
Atlantis
c246dece15
Fixes Mapmerge
...
- Changes mapmerge in a way GinjaNinja32 recommended in PR #10899
2015-09-01 03:00:58 +02:00
Neerti
1401608553
Steals from KP instead of /tg/. Map merge will now clean all maps.
2015-07-21 09:37:48 -04:00
Neerti
85cb9c92a0
Makes map merger clean colony maps. Band-aid fix for now.
2015-07-21 09:27:45 -04:00
GinjaNinja32
ef197fb995
Two fixes
...
Fixes airless turf in Fore Starboard Solar Control causing minor atmos alert at roundstart
Fixes clean_map_git.sh being set non-executable and using non-sh-compatible features with #!/bin/sh
2015-02-06 16:04:37 +00:00
Chinsky
3ddd0b480f
Merge pull request #8061 from Baystation12/master
...
master -> wiz
2015-02-06 10:41:12 +03:00
GinjaNinja32
f4435503cc
Linux versions of PsiOmegaDelta's git_merge_installer scripts
2015-02-04 10:12:11 +00:00
PsiOmega
0673c9179b
Git Merge Installers
...
There are now two basic bat scripts in dmitool and mapmerge which painlessly inserts the necessary lines for the commit tools to work into .git/config.
2015-02-03 22:02:50 +01:00
=
cb11a95aa7
Fix clean_map_git.sh
2015-01-07 20:22:55 +00:00
PsiOmega
e4127843a6
Z-level split.
...
Splits each individual Z-level into its own map file.
2014-11-24 12:40:12 +01:00
Mloc-Hibernia
281a26b979
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-18 13:08:12 +00:00
Cael Aislinn
d992c1ee27
updates MapPatcher.jar to use JRE8
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-29 01:09:37 +10:00
Boop
7a4d0f873d
Fixes #5149
...
also fixes clean_map_git.sh (mloooc)
2014-06-16 10:35:54 +01:00
Mloc-Argent
6db1484a80
tools: update MapPatcher.jar, add mapclean helper
...
MapPatcher.jar can now take a user-defined tile line when conflicted.
Added a clean_map_git.sh file that will automatically clean maps
without needing a prepare_map.bat call beforehand. Needs to be run in
git bash, or have .sh associated with something that has git.
Fixed line endings in install.txt to show up right in notepad.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-15 22:00:24 +01:00
Mloc-Argent
073059e0dc
tools: adding the patched/fixed MapPatcher.jar
...
Allows for easier map conflict resolution.
Prompts the user for confirmation on a tile conflict instead of dying.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-07 17:33:05 +01:00
Asanadas
db5e155511
GAH WHICH ONE GOES FIRST
2014-04-22 17:42:27 -04:00
Erthilo
d0c71c8dc2
Moved maptools to tool/mapmerge. Added midi2piano and AddToChangelog.
2013-08-31 19:10:02 +01:00
