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

Updates tools to include mapmerge hooks and merge drivers, plus more (#18034)

Browse Source 
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
This commit is contained in:
S34N
2022-06-21 23:53:19 +01:00
committed by GitHub
parent 727b299d33
commit 4f5c3376e3
53 changed files with 1089 additions and 2465 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/hooks/python.sh Normal file
View File

@@ -0,0 +1,17 @@
#!/bin/sh
set -e
if [ "$*" = "-m precommit" ]; then
echo "Hooks are being updated..."
echo "Details: https://github.com/ParadiseSS13/Paradise/pull/18034 and https://github.com/tgstation/tgstation/pull/55658"
if [ "$(uname -o)" = "Msys" ]; then
tools/hooks/Install.bat
else
tools/hooks/install.sh
fi
echo "---------------"
exec tools/hooks/pre-commit.hook
else
echo "tools/hooks/python.sh is replaced by tools/bootstrap/python"
echo "Details: https://github.com/ParadiseSS13/Paradise/pull/18034 and https://github.com/tgstation/tgstation/pull/55658"
exit 1
fi