From b7034fe3f713ea4a2c0bee291dd3dce3513b83fc Mon Sep 17 00:00:00 2001
From: kevinz000 <kevinz1234567890@gmail.com>
Date: Sat, 4 Jun 2016 02:42:24 -0700
Subject: [PATCH] ...

---
 .travis.yml              | 25 +++++++++----------------
 code/datums/datumvars.dm | 21 +--------------------
 2 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f267102c7b1..0182ca5b97a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,10 @@ env:
     - BYOND_MAJOR="510"
     - BYOND_MINOR="1332"
     - NODE_VERSION="4"
+    - BUILD_TOOLS=false
+    - DM_MAPFILE=""
     matrix:
+    - BUILD_TOOLS=true
     - DM_MAPFILE="tgstation2"
     - DM_MAPFILE="metastation"
     - DM_MAPFILE="ministation"
@@ -30,24 +33,14 @@ addons:
       - python
       - python-pip
 
-
 install:
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $NODE_VERSION
-  - npm install -g gulp-cli
-  - pip install --user PyYaml -q
-  - pip install --user beautifulsoup4 -q
+  - tools/travis/install_build_tools.sh
 
 before_script:
-  - cd tgui && npm install && cd ..
-  - chmod +x ./install-byond.sh
-  - ./install-byond.sh
-  - shopt -s globstar
+  - tools/travis/before_build_tools.sh
+  - tools/travis/before_build_byond.sh
 
 script:
-  - (! grep 'step_[xy]' _maps/**/*.dmm)
-  - md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml"
-  - tools/check_filedirs.sh tgstation.dme
-  - cd tgui && gulp && cd ..
-  - python tools/ss13_genchangelog.py html/changelog.html html/changelogs
-  - source $HOME/BYOND-${BYOND_MAJOR}.${BYOND_MINOR}/byond/bin/byondsetup
-  - bash dm.sh -M${DM_MAPFILE} tgstation.dme
+  - tools/travis/check_filedirs.sh tgstation.dme
+  - tools/travis/build_tools.sh
+  - tools/travis/build_byond.sh
\ No newline at end of file
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 8225802a820..851e5b8864e 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -635,26 +635,7 @@ body
 			if(!istype(M))
 				usr << "This can only be used on instances of type /mob"
 				return
-			M << "Control of your mob has been offered to dead players."
-			log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.")
-			message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts")
-			var/poll_message = "Do you want to play as [M.real_name]?"
-			if(M.mind && M.mind.assigned_role)
-				poll_message = "[poll_message] Job:[M.mind.assigned_role]."
-			if(M.mind && M.mind.special_role)
-				poll_message = "[poll_message] Status:[M.mind.special_role]."
-			var/list/mob/dead/observer/candidates = pollCandidates(poll_message, "pAI", null, FALSE, 100)
-			var/mob/dead/observer/theghost = null
-
-			if(candidates.len)
-				theghost = pick(candidates)
-				M << "Your mob has been taken over by a ghost!"
-				message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)])")
-				M.ghostize(0)
-				M.key = theghost.key
-			else
-				M << "There were no ghosts willing to take control."
-				message_admins("No ghosts were willing to take control of [key_name_admin(M)])")
+			offer_control(M)
 
 		else if(href_list["delall"])
 			if(!check_rights(R_DEBUG|R_SERVER))