diff --git a/src/api/soldat/configs/types.ts b/src/api/soldat/configs/types.ts
index 4560ef3..eedc406 100644
--- a/src/api/soldat/configs/types.ts
+++ b/src/api/soldat/configs/types.ts
@@ -48,6 +48,7 @@ export interface GraphicsConfig extends SoldatConfig {
         ui_style: string;
         r_scaleinterface: string;
         ui_playerindicator: string;
+        ui_sniperline: string;
         ui_killconsole: string;
 
         r_swapeffect: string;
@@ -87,6 +88,7 @@ export interface ServerConfig extends SoldatConfig {
         sv_bullettime: string;
         sv_friendlyfire: string;
         sv_sniperline: string;
+        sv_stationaryguns: string;
 
         sv_survivalmode: string;
         sv_survivalmode_clearweapons: string;
@@ -127,4 +129,4 @@ export interface ServerConfig extends SoldatConfig {
 
         net_port: string;
     };
-}
\ No newline at end of file
+}
diff --git a/src/api/soldat/server.ts b/src/api/soldat/server.ts
index 1ee312e..d0e5769 100644
--- a/src/api/soldat/server.ts
+++ b/src/api/soldat/server.ts
@@ -43,10 +43,15 @@ const start = (
 
     // For now this seems to get the job done, even though a proper
     // communication system might be better...
+    let stdoutOutput = "";
     serverProcess.stdout.setEncoding("utf8");
     serverProcess.stdout.on("data", (output: string) => {
-        if (output.includes("[NET] Game networking initialized.")) {
-            onReady();
+        if (!stdoutOutput.includes("[NET] Game networking initialized.")) {
+            stdoutOutput += output;
+
+            if (stdoutOutput.includes("[NET] Game networking initialized.")) {
+                onReady();
+            }
         }
     });
 
@@ -75,4 +80,4 @@ const stop = (): void => {
     serverProcess = undefined;
 }
 
-export { start, stop };
\ No newline at end of file
+export { start, stop };
diff --git a/src/components/LocalGame/Gameplay/Form.tsx b/src/components/LocalGame/Gameplay/Form.tsx
index b17d69d..028978b 100644
--- a/src/components/LocalGame/Gameplay/Form.tsx
+++ b/src/components/LocalGame/Gameplay/Form.tsx
@@ -40,6 +40,10 @@ const GameplayForm: React.FC<GameplayFormProps> = props => {
                 gameplay.sniperLine = checked;
                 break;
 
+            case "stationary-guns":
+                gameplay.stationaryGuns = checked;
+                break;
+
             case "survival-destroy-weapons":
                 gameplay.styles.survivalDestroyWeaponsAfterRound = checked;
                 break;
@@ -244,7 +248,7 @@ const GameplayForm: React.FC<GameplayFormProps> = props => {
 
             <div className="field">
                 <label className="label" htmlFor="sniper-line">
-                    Sniper line
+                    Allow sniper line
                 </label>
                 <div className="user-input">
                     <Checkbox
@@ -255,8 +259,22 @@ const GameplayForm: React.FC<GameplayFormProps> = props => {
                         onToggle={handleCheckboxToggle} />
                 </div>
             </div>
+
+            <div className="field">
+                <label className="label" htmlFor="stationary-guns">
+                    Stationary guns
+                </label>
+                <div className="user-input">
+                    <Checkbox
+                        colorTheme="dark"
+                        id="stationary-guns"
+                        name="stationary-guns"
+                        checked={gameplay.stationaryGuns}
+                        onToggle={handleCheckboxToggle} />
+                </div>
+            </div>
         </div>
     )
 }
 
-export default observer(GameplayForm);
\ No newline at end of file
+export default observer(GameplayForm);
diff --git a/src/components/Settings/GraphicsPanel.tsx b/src/components/Settings/GraphicsPanel.tsx
index 7db7ed7..02e485e 100644
--- a/src/components/Settings/GraphicsPanel.tsx
+++ b/src/components/Settings/GraphicsPanel.tsx
@@ -84,6 +84,10 @@ const GraphicsPanel: React.FC<GraphicsPanelProps> = props => {
         graphicsSettings.playerIndicator = checked;
     }
 
+    const handleClientSniperlineToggle = (checked: boolean): void => {
+        graphicsSettings.clientSniperline = checked;
+    }
+
     const handleKillsListToggle = (checked: boolean): void => {
         graphicsSettings.killsList = checked;
     }
@@ -333,6 +337,21 @@ const GraphicsPanel: React.FC<GraphicsPanelProps> = props => {
                             </div>
                         </div>
 
+                        <div className="field">
+                            <label
+                                className="label"
+                                htmlFor="client-sniperline">
+                                Display sniperline (if server allows it)
+                            </label>
+                            <div className="user-input">
+                                <Checkbox
+                                    id="client-sniperline"
+                                    colorTheme="dark"
+                                    checked={graphicsSettings.clientSniperline}
+                                    onToggle={handleClientSniperlineToggle} />
+                            </div>
+                        </div>
+
                         <div className="field">
                             <label
                                 className="label"
@@ -406,4 +425,4 @@ const GraphicsPanel: React.FC<GraphicsPanelProps> = props => {
     )
 }
 
-export default observer(GraphicsPanel);
\ No newline at end of file
+export default observer(GraphicsPanel);
diff --git a/src/main.ts b/src/main.ts
index 2a70c30..cc15ee2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -161,4 +161,4 @@ app.on("activate", () => {
 });
 
 // In this file you can include the rest of your app's specific main process
-// code. You can also put them in separate files and import them here.
\ No newline at end of file
+// code. You can also put them in separate files and import them here.
diff --git a/src/settings/client/graphics.ts b/src/settings/client/graphics.ts
index 92a220c..7036814 100644
--- a/src/settings/client/graphics.ts
+++ b/src/settings/client/graphics.ts
@@ -36,6 +36,7 @@ interface GraphicsSettingsData {
     interfaceStyle: string;
     scaleInterface: boolean;
     playerIndicator: boolean;
+    clientSniperline: boolean;
     killsList: boolean;
 
     verticalSync: boolean;
@@ -63,6 +64,7 @@ const defaultGraphicsSettings: GraphicsSettingsData = {
 
     interfaceStyle: "Default",
     playerIndicator: true,
+    clientSniperline: false,
     scaleInterface: true,
     killsList: true,
 
@@ -88,6 +90,7 @@ class GraphicsSettings implements GraphicsSettingsData {
     @observable interfaceStyle: string;
     @observable scaleInterface: boolean;
     @observable playerIndicator: boolean;
+    @observable clientSniperline: boolean;
     @observable killsList: boolean;
 
     @observable verticalSync: boolean;
@@ -120,6 +123,7 @@ class GraphicsSettings implements GraphicsSettingsData {
         this.interfaceStyle = config?.cvars.ui_style;
         this.scaleInterface = toBool(config?.cvars.r_scaleinterface);
         this.playerIndicator = toBool(config?.cvars.ui_playerindicator);
+        this.clientSniperline = toBool(config?.cvars.ui_sniperline);
         this.killsList = toBool(config?.cvars.ui_killconsole);
 
         this.verticalSync = toBool(config?.cvars.r_swapeffect);
@@ -159,6 +163,7 @@ class GraphicsSettings implements GraphicsSettingsData {
                 ui_style: this.interfaceStyle,
                 r_scaleinterface: toString(this.scaleInterface),
                 ui_playerindicator: toString(this.playerIndicator),
+                ui_sniperline: toString(this.clientSniperline),
                 ui_killconsole: toString(this.killsList),
     
                 r_swapeffect: toString(this.verticalSync),
@@ -168,4 +173,4 @@ class GraphicsSettings implements GraphicsSettingsData {
     }
 }
 
-export default GraphicsSettings;
\ No newline at end of file
+export default GraphicsSettings;
diff --git a/src/settings/server/index.ts b/src/settings/server/index.ts
index fc0aca2..94b81e6 100644
--- a/src/settings/server/index.ts
+++ b/src/settings/server/index.ts
@@ -62,6 +62,7 @@ export interface GameplaySettings {
     bulletTime: boolean;
     friendlyFire: boolean;
     sniperLine: boolean;
+    stationaryGuns: boolean;
 }
 
 export enum BonusFrequencies {
@@ -119,7 +120,8 @@ const defaultServerSettings: ServerSettingsData = {
 
         bulletTime: false,
         friendlyFire: false,
-        sniperLine: false
+        sniperLine: true,
+        stationaryGuns: true
     },
     bots: {
         noTeam: 4,
@@ -179,6 +181,7 @@ class ServerSettings implements ServerSettingsData {
             bulletTime: toBool(config?.cvars.sv_bullettime),
             friendlyFire: toBool(config?.cvars.sv_friendlyfire),
             sniperLine: toBool(config?.cvars.sv_sniperline),
+            stationaryGuns: toBool(config?.cvars.sv_stationaryguns),
         };
 
         this.bots = {
@@ -253,6 +256,7 @@ class ServerSettings implements ServerSettingsData {
                 sv_bullettime: toString(this.gameplay.bulletTime),
                 sv_friendlyfire: toString(this.gameplay.friendlyFire),
                 sv_sniperline: toString(this.gameplay.sniperLine),
+                sv_stationaryguns: toString(this.gameplay.stationaryGuns),
     
                 bots_random_alpha: toString(this.bots.alpha),
                 bots_random_bravo: toString(this.bots.bravo),
@@ -313,4 +317,4 @@ class ServerSettings implements ServerSettingsData {
     }
 }
 
-export default ServerSettings;
\ No newline at end of file
+export default ServerSettings;