Merge branch 'master' of git://github.com/Baystation12/Baystation12

code/game/gamemodes/newobjective.dm

@@ -239,7 +239,7 @@ datum
 
 			check_completion()
 				if(target && target.current)
-					if(target.current.stat == 2)
+					if(target.current.stat == 2 || istype(get_area(target.current), /area/tdome) || issilicon(target.current) || isbrain(target.current))
 						return 1
 					else
 						return 0

code/game/jobs/jobs.dm

@@ -128,7 +128,7 @@ var/list/nonhuman_positions = list(
 			return 2
 		if("Research Director","Chief Medical Officer","Head of Security","Chief Engineer","Warden")
 			return 3
-		if("Captain","Head of Personnel","Wizard")
+		if("Captain","Head of Personnel","Wizard","MODE")
 			return 4
 		else
-			world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO <del>SKYMARSHAL</del> A CODER"
+			world << "\"[job]\" NOT GIVEN RANK, REPORT JOBS.DM ERROR TO A CODER"

code/game/mecha/equipment/tools/tools.dm

@@ -418,6 +418,8 @@
 		if(href_list["mode"])
 			mode = text2num(href_list["mode"])
 			send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
+		if(href_list["detach"])
+			src.detach()
 		return
 
 

code/game/objects/items/weapons/implants/implant.dm

@@ -225,7 +225,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 /obj/item/weapon/implant/explosive
 	name = "explosive"
 	desc = "And boom goes the weasel."
-	var/phrase = "die"
+	var/phrase = "supercalifragilisticexpialidocious"
 
 
 	get_data()