cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8061 from Baystation12/master

Browse Source 
master -> wiz
This commit is contained in:
Chinsky
2015-02-06 10:41:12 +03:00
parent 3df6d38d2d d847232692
commit 3ddd0b480f
7 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/mob/living/carbon/human/human_movement.dm
View File

@@ -55,7 +55,7 @@
if (bodytemperature < 283.222)
tally += (283.222 - bodytemperature) / 10 * 1.75
tally += 2*stance_damage //damaged/missing feet or legs is slow
tally += max(2 * stance_damage, 0) //damaged/missing feet or legs is slow
if(mRun in mutations)
tally = 0

6
tools/dmitool/git_merge_installer.bat Normal file
View File

@@ -0,0 +1,6 @@
@echo off
set tab=
echo. >> ../../.git/config
echo [merge "merge-dmi"] >> ../../.git/config
echo %tab%name = iconfile merge driver >> ../../.git/config
echo %tab%driver = ./tools/dmitool/dmimerge.sh %%O %%A %%B >> ../../.git/config

6
tools/dmitool/git_merge_installer.sh Executable file
View File

@@ -0,0 +1,6 @@
F="../../.git/config"
echo '' >> $F
echo '[merge "merge-dmi"]' >> $F
echo ' name = iconfile merge driver' >> $F
echo ' driver = ./tools/dmitool/dmimerge.sh %O %A %B' >> $F

4
tools/dmitool/merging.txt
View File

@@ -8,5 +8,7 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba
name = iconfile merge driver
driver = ./tools/dmitool/dmimerge.sh %O %A %B
You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location.
After this, merging DMI files should happen automagically unless there are conflicts (an icon_state that both you and someone else changed).
If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states.
If there are conflicts, you will unfortunately still be stuck with opening both versions in the editor, and manually resolving the issues with those states.

6
tools/mapmerge/git_merge_installer.bat Normal file
View File

@@ -0,0 +1,6 @@
@echo off
set tab=
echo. >> ../../.git/config
echo [merge "merge-dmm"] >> ../../.git/config
echo %tab%name = mapmerge driver >> ../../.git/config
echo %tab%driver = ./tools/mapmerge/mapmerge.sh %%O %%A %%B >> ../../.git/config

6
tools/mapmerge/git_merge_installer.sh Executable file
View File

@@ -0,0 +1,6 @@
F="../../.git/config"
echo '' >> $F
echo '[merge "merge-dmm"]' >> $F
echo ' name = mapmerge driver' >> $F
echo ' driver = ./tools/mapmerge/mapmerge.sh %O %A %B' >> $F

2
tools/mapmerge/install.txt
View File

@@ -14,4 +14,6 @@ The easiest way to do merging is to install the merge driver. For this, open `Ba
name = mapmerge driver
driver = ./tools/mapmerge/mapmerge.sh %O %A %B
You may optionally instead run git_merge_installer.bat or git_merge_installer.sh which should automatically insert these lines for you at the appropriate location.
After this, merging maps should happen automagically unless there are conflicts(a tile that both you and someone else changed). If there are conflicts, you will unfortunately still be stuck with opening both versions in a map editor, and manually resolving the issues.