diff --git a/ARK/game.params.ori b/ARK/game.params.ori
index 44c9427..5d00880 100644
--- a/ARK/game.params.ori
+++ b/ARK/game.params.ori
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 GAME_STEAMID=376030
 GAME_PATH=~/jeux/server_${GAME_NAME}
 LOG_PATH=~/logs/${GAME_NAME}
@@ -8,3 +9,15 @@ GAME_PORT=7779
 #QUERY_PORT is the port used by steam to connect players to your server
 QUERY_PORT=27015
 GAME_PARAMS="TheIsland?listen?Port=${GAME_PORT}?QueryPort=${QUERY_PORT}?SessionName=${SERVER_NAME}?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log -noBattlEye"
+=======
+export GAME_STEAMID=376030
+export GAME_PATH=~/jeux/server_${GAME_NAME}
+export LOG_PATH=~/logs/${GAME_NAME}
+export GAME_BIN=${GAME_PATH}/ShooterGame/Binaries/Linux/ShooterGameServer
+export SERVER_NAME=PATATE_Onimaro
+export #GAME_PORT will be the specified port and the following (here 7779 and 7780)
+export GAME_PORT=7779
+export #QUERY_PORT is the port used by steam to connect players to your server
+export QUERY_PORT=27015
+export GAME_PARAMS="TheIsland?listen?Port=${GAME_PORT}?QueryPort=${QUERY_PORT}?SessionName=${SERVER_NAME}?PerPlatformMaxStructuresMultiplier=100?AllowPlatformeSaddleMultiFloors=true -server -log"
+>>>>>>> 4f0f0b6cb15091e3cb2eeba5038af48f1798b31b
diff --git a/DST/DST.params b/DST/DST.params
index aadc49c..ca7fa1c 100644
--- a/DST/DST.params
+++ b/DST/DST.params
@@ -1,5 +1,5 @@
-GAME_NAME=DST
-GAME_STEAMID=343050
-GAME_PATH=/jeux/server_dst/
-LOG_PATH=~/logs/${GAME_NAME}/
-STEAMCMD=/home/steamcmd/steamcmd.sh
+export GAME_NAME='DST'
+export GAME_STEAMID=343050
+export GAME_PATH="~/jeux/server_dst/"
+export LOG_PATH="~/logs/${GAME_NAME}/"
+export STEAMCMD="~/steamcmd/steamcmd.sh"
diff --git a/DST/DST_maj.sh b/DST/DST_maj.sh
index 4ce7fbe..12b8eff 100755
--- a/DST/DST_maj.sh
+++ b/DST/DST_maj.sh
@@ -2,14 +2,14 @@
 source $(dirname $0)/game_globals
 #[ ! -r "$(dirname $0)/game.params.ori" ] && echo "Fichier de parameteres manquant : $(dirname $0)/game.params.ori" && exit 2
 if [ ! -r "$(dirname $0)/../../params/${GAME_NAME}.params" ]; then
-       echo "Mise en place du fichier de parametres dans $( cd $(dirname $0)/../../ && pwd)/params/)"
-       mkdir -p $(dirname $0)/../../params || echo "Echec de creation ou de verification du repertoire $(dirname $0)/../../params" && exit 3
-       cp $(dirname $0)/game.params.ori $(dirname $0)/../../params/${GAME_NAME}.params || echo "Echec de generation du fichier de parametres standard $(dirname $0)/../../params/${GAME_NAME}.params" && exit 4
+       echo "Mise en place du fichier de parametres dans $(dirname $0)/../../params/"
+       mkdir -p $(dirname $0)/../../params || (echo "Echec de creation ou de verification du repertoire $(dirname $0)/../../params" && exit 3)
+       cp $(dirname $0)/game.params.ori $(dirname $0)/../../params/${GAME_NAME}.params || (echo "Echec de generation du fichier de parametres standard $(dirname $0)/../../params/${GAME_NAME}.params" && exit 4)
        echo "Veuillez configurer le jeu si besoin via le fichier $( ls $(dirname $0)/../../params/${GAME_NAME}.params) puis relancer le script de MAJ"
        exit 0
 fi
-source $(dirname $0)/../../params/${GAME_NAME}.params || echo "Impossible de charger les parametres du jeu via $(dirname $0)/../../params/${GAME_NAME}.params" && exit 5
-[ ! -d "${GAME_PATH}" ] && echo "creation du repertoire de jeu ${GAME_PATH}"
+source $(dirname $0)/../../params/${GAME_NAME}.params || (echo "Impossible de charger les parametres du jeu via $(dirname $0)/../../params/${GAME_NAME}.params" && exit 5)
+[ ! -d "${GAME_PATH}" ] && echo "creation du repertoire de jeu ${GAME_PATH}" && mkdir -p ${GAME_PATH}
 [ -z ${GAME_STEAMID} ] && "Missing App SteamID" && exit 7
 echo "Mise a jour du jeu ..."
 echo "${STEAMCMD} +login anonymous +force_install_dir ${GAME_PATH} +app_update ${GAME_STEAMID} +quit"
diff --git a/DST/DST_server_start.sh b/DST/DST_server_start.sh
index afe2bf3..6fe50d7 100755
--- a/DST/DST_server_start.sh
+++ b/DST/DST_server_start.sh
@@ -1,9 +1,13 @@
 #!/bin/bash
-
 serveur=$1
 reset=$2
-[ ${serveur} == "-h" ] && echo "Liste des serveurs :" && echo "$(ls ~steamcmd/.klei/DoNotStarveTogether/)" && exit 0
+
+source $(dirname $0)/game_globals
+[ ! -r "$(dirname $0)/../../params/${GAME_NAME}.params" ] && echo "Fichier de parameteres manquant : $(dirname $0)/../../params/${GAME_NAME}.params" && exit 2
+source $(dirname $0)/../../params/${GAME_NAME}.params
+
 [ -z ${serveur} ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 1
+[ ${serveur} == "-h" ] && echo "Liste des serveurs :" && echo "$(ls ~steamcmd/.klei/DoNotStarveTogether/)" && exit 0
 [ ${serveur} == "-reset" ] && echo "XXX Parametre manquant : nom du serveur XXX" && exit 2
 [ ! -z ${reset} ] && [ ${reset} != "-reset" ] && echo "Le deuxieme parametre doit etre -reset ou rien" && exit 3
 echo
@@ -18,6 +22,8 @@ echo "  Serveur ${serveur}"
 echo
 [ ! -z ${reset} ] && [ ${reset} == "-reset" ] && echo "Remise a zero du serveur." && rm -rf ~steamcmd/.klei/DoNotStarveTogether/${serveur}Cluster/Master/save/session/* && rm -rf ~steamcmd/.klei/DoNotStarveTogether/${serveur}Cluster/Caves/save/session/*
 echo
+echo "GAME_PATH : ${GAME_PATH}"
+echo
 cd ${GAME_PATH}/bin
 echo
 echo "  --- Don't Starve Together, exterieur "
diff --git a/DST/game.params.ori b/DST/game.params.ori
index 5d4787d..345ccfa 100644
--- a/DST/game.params.ori
+++ b/DST/game.params.ori
@@ -1,5 +1,4 @@
-GAME_PATH="~/jeux/server_${GAME_NAME}"
-LOG_PATH="~/logs/${GAME_NAME}"
-GAME_BIN="${GAME_PATH}/bin/dontstarve_dedicated_server_nullrenderer"
-GAME_PARAMS="-console -cluster ${serveur}Cluster -shard ${shard}"
-GAME_STEAMID=343050
+export GAME_PATH=~/jeux/server_${GAME_NAME}
+export LOG_PATH=~/logs/${GAME_NAME}
+export GAME_BIN=${GAME_PATH}/bin/dontstarve_dedicated_server_nullrenderer
+export GAME_PARAMS=-console -cluster ${serveur}Cluster -shard ${shard}
diff --git a/DST/game_globals b/DST/game_globals
index 16b48f0..1b8934e 100644
--- a/DST/game_globals
+++ b/DST/game_globals
@@ -1,2 +1,3 @@
-GAME_NAME='DST'
-STEAMCMD=~/steamcmd/steamcmd.sh
+export GAME_NAME='DST'
+export STEAMCMD=~/steamcmd/steamcmd.sh
+export GAME_STEAMID='343050'