From be1bbba56a2ec15eca85584bce7eb42ae9d2a8d4 Mon Sep 17 00:00:00 2001
From: Jack Edge <yellowbounder@gmail.com>
Date: Sat, 4 Jun 2016 11:03:21 +0100
Subject: [PATCH] Adorableness

---
 code/game/gamemodes/antag_spawner.dm | 6 ++----
 tools/linux_build.py                 | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm
index d15d66329f0..d4a54fb86b3 100644
--- a/code/game/gamemodes/antag_spawner.dm
+++ b/code/game/gamemodes/antag_spawner.dm
@@ -228,12 +228,12 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "vial"
 
-	var/shatter_msg = "<span class='notice'>You shatter the bottle, no
+	var/shatter_msg = "<span class='notice'>You shatter the bottle, no \
 		turning back now!</span>"
 	var/veil_msg = "<span class='warning'>You sense a dark presence lurking \
 		just beyond the veil...</span>"
 	var/objective_verb = "Kill"
-	var/demon_type = /mob/living/simple_animal/slaughter
+	var/mob/living/demon_type = /mob/living/simple_animal/slaughter
 
 
 /obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user)
@@ -288,8 +288,6 @@
 	icon_state = "vial"
 	color = "#FF69B4" // HOT PINK
 
-	shatter_msg = "<span class='notice'>You shatter the bottle, no
-		turning back now!</span>"
 	veil_msg = "<span class='warning'>You sense an adorable presence \
 		lurking just beyond the veil...</span>"
 	objective_verb = "Hug and Tickle"
diff --git a/tools/linux_build.py b/tools/linux_build.py
index ef83210e217..13fc1a5dd3f 100755
--- a/tools/linux_build.py
+++ b/tools/linux_build.py
@@ -31,7 +31,7 @@ def stage2(map):
         txt = "-M{}".format(map)
     else:
         txt = ''
-    args = "bash dm.sh {} tgstation.dme".format(txt)
+    args = "bash tools/travis/dm.sh {} tgstation.dme".format(txt)
     print(args)
     p = subprocess.Popen(args, shell=True)
     wait(p)