Bleeding edgy refresh (#303)
* not code stuff * other things * global vars, defines, helpers * onclick hud stuff, orphans, world.dm * controllers and datums * game folder * everything not client/mobs in modules * client folder * stage 1 mob stuff * simple animal things * silicons * carbon things * ayylmaos and monkeys * hyoomahn * icons n shit * sprite fixes * compile fixes * some fixes I cherrypicked. * qdel fixes * forgot brain refractors
This commit is contained in:
@@ -12,13 +12,6 @@ if exist updating.lk (
|
||||
echo Please be double sure that an update script is not currently running, if you think one might be, close this window. otherwise:
|
||||
pause
|
||||
)
|
||||
if exist rotating.lk (
|
||||
echo ERROR! A current map rotation operation has been detected running. IT IS STRONGLY RECOMMENDED YOU DO NOT UPDATE RIGHT NOW. if you know this is a mistake, and that the game server is not currently rotating the map:
|
||||
pause
|
||||
echo IT IS STRONGLY RECOMMENDED YOU DO NOT UPDATE RIGHT NOW. If a map rotation script runs at the same time as an update script the server will generally break in ways not trivial to recover from. Are you REALLY sure? Please close this window if you are not, otherwise:
|
||||
pause
|
||||
)
|
||||
@del /F /Q rotating.lk >nul 2>nul
|
||||
echo lock>updating.lk
|
||||
|
||||
rem if the first arg to nudge.py is not a channel, it is treated as the "source"
|
||||
|
||||
@@ -7,13 +7,6 @@ if defined AB set DME_FOLDER=gamecode\%AB%\
|
||||
set DME_LOCATION=%DME_FOLDER%%PROJECTNAME%.dme
|
||||
set MDME_LOCATION=%DME_FOLDER%%PROJECTNAME%.mdme
|
||||
|
||||
@del %MDME_LOCATION% >nul 2>nul
|
||||
if defined MAPROTATE set MAPFILE=%MAPROTATE%
|
||||
if not defined MAPFILE goto BUILD
|
||||
|
||||
echo #define MAP_OVERRIDE >>%MDME_LOCATION%
|
||||
echo #include "_maps\%MAPFILE%.dm" >>%MDME_LOCATION%
|
||||
|
||||
:BUILD
|
||||
echo #define SERVERTOOLS 1 >>%MDME_LOCATION%
|
||||
type %DME_LOCATION% >>%MDME_LOCATION%
|
||||
|
||||
@@ -5,11 +5,18 @@ set -e
|
||||
shopt -s globstar
|
||||
|
||||
if [ "$BUILD_TOOLS" = false ]; then
|
||||
(! grep 'step_[xy]' _maps/**/*.dmm)
|
||||
if grep 'step_[xy]' _maps/**/*.dmm; then
|
||||
echo "step_[xy] variables detected in maps, please remove them."
|
||||
exit 1
|
||||
fi;
|
||||
if grep '/turf\s*[,\){]' _maps/**/*.dmm; then
|
||||
echo "base /turf path use detected in maps, please replace with proper paths."
|
||||
exit 1
|
||||
fi;
|
||||
source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
|
||||
if [ "$BUILD_TESTING" = true ]; then
|
||||
tools/travis/dm.sh -DTRAVISBUILDING -M${DM_MAPFILE} tgstation.dme
|
||||
tools/travis/dm.sh -DTRAVISBUILDING tgstation.dme
|
||||
else
|
||||
tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -Mruntimestation tgstation.dme
|
||||
tools/travis/dm.sh -DTRAVISBUILDING -DTRAVISTESTING -DALL_MAPS tgstation.dme
|
||||
fi;
|
||||
fi;
|
||||
|
||||
@@ -38,12 +38,6 @@ do
|
||||
sed -i '1s/^/#define '$arg'\n/' $dmepath.mdme
|
||||
continue
|
||||
fi
|
||||
if [[ $var == -M* ]]
|
||||
then
|
||||
sed -i '1s/^/#define MAP_OVERRIDE\n/' $dmepath.mdme
|
||||
sed -i 's!// BEGIN_INCLUDE!// BEGIN_INCLUDE\n#include "_maps\\'$arg'.dm"!' $dmepath.mdme
|
||||
continue
|
||||
fi
|
||||
done
|
||||
|
||||
#windows
|
||||
|
||||
Reference in New Issue
Block a user