Fix merge conflicts

code/datums/datacore.dm

@@ -192,7 +192,7 @@ proc/get_id_photo(var/mob/living/carbon/human/H)
 			clothes_s = new /icon('icons/mob/uniform.dmi', "officer_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "jackboots"), ICON_UNDERLAY)
 			clothes_s.Blend(new /icon('icons/mob/hands.dmi', "swat_gl"), ICON_UNDERLAY)
-			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "deus_blueshield"), ICON_OVERLAY)
+			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "blueshield"), ICON_OVERLAY)
 		if("Magistrate")
 			clothes_s = new /icon('icons/mob/uniform.dmi', "really_black_suit_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "laceups"), ICON_UNDERLAY)

code/datums/datumvars.dm

@@ -253,6 +253,7 @@ client
 			body += "<option value='?_src_=vars;make_skeleton=\ref[D]'>Make 2spooky</option>"
 
 			body += "<option value='?_src_=vars;direct_control=\ref[D]'>Assume Direct Control</option>"
+			body += "<option value='?_src_=vars;offer_control=\ref[D]'>Offer Control to Ghosts</option>"
 			body += "<option value='?_src_=vars;drop_everything=\ref[D]'>Drop Everything</option>"
 
 			body += "<option value='?_src_=vars;regenerateicons=\ref[D]'>Regenerate Icons</option>"
@@ -438,7 +439,7 @@ client
 
 	//~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records).
 	else if(href_list["rename"])
-		if(!check_rights(R_VAREDIT))	return
+		if(!check_rights(R_ADMIN))	return
 
 		var/mob/M = locate(href_list["rename"])
 		if(!istype(M))
@@ -497,7 +498,7 @@ client
 		cmd_mass_modify_object_variables(A, href_list["varnamemass"])
 
 	else if(href_list["mob_player_panel"])
-		if(!check_rights(0))	return
+		if(!check_rights(R_ADMIN|R_MOD))	return
 
 		var/mob/M = locate(href_list["mob_player_panel"])
 		if(!istype(M))
@@ -542,7 +543,7 @@ client
 		href_list["datumrefresh"] = href_list["godmode"]
 
 	else if(href_list["gib"])
-		if(!check_rights(0))	return
+		if(!check_rights(R_ADMIN|R_EVENT))	return
 
 		var/mob/M = locate(href_list["gib"])
 		if(!istype(M))
@@ -574,7 +575,7 @@ client
 			usr.client.cmd_admin_drop_everything(M)
 
 	else if(href_list["direct_control"])
-		if(!check_rights(0))	return
+		if(!check_rights(R_DEBUG|R_ADMIN))	return
 
 		var/mob/M = locate(href_list["direct_control"])
 		if(!istype(M))
@@ -591,9 +592,38 @@ client
 		if(!istype(H))
 			usr << "This can only be used on instances of type /mob/living/carbon/human"
 			return
+			
+		var/confirm = alert("Are you sure you want to turn this mob into a skeleton?","Confirm Skeleton Transformation","Yes","No")
+		if(confirm != "Yes")
+			return
 
 		H.makeSkeleton()
+		message_admins("[key_name(usr)] has turned [key_name(H)] into a skeleton")
+		log_admin("[key_name_admin(usr)] has turned [key_name_admin(H)] into a skeleton")
 		href_list["datumrefresh"] = href_list["make_skeleton"]
+			
+	else if(href_list["offer_control"])
+		if(!check_rights(R_ADMIN))	return
+
+		var/mob/M = locate(href_list["offer_control"])
+		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/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name]?", "Player Control", 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()
+			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)])")
 
 	else if(href_list["delall"])
 		if(!check_rights(R_DEBUG|R_SERVER))	return
@@ -624,8 +654,8 @@ client
 				if(!i)
 					usr << "No objects of this type exist"
 					return
-				log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
-				message_admins("\blue [key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
+				log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted)")
+				message_admins("[key_name_admin(usr)] deleted all objects of type [O_type] ([i] objects deleted)")
 			if("Type and subtypes")
 				var/i = 0
 				for(var/obj/Obj in world)
@@ -635,11 +665,11 @@ client
 				if(!i)
 					usr << "No objects of this type exist"
 					return
-				log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
-				message_admins("\blue [key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
+				log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted)")
+				message_admins("[key_name_admin(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted)")
 
 	else if(href_list["addreagent"]) /* Made on /TG/, credit to them. */
-		if(!check_rights(0))	return
+		if(!check_rights(R_DEBUG|R_ADMIN))	return
 
 		var/atom/A = locate(href_list["addreagent"])
 
@@ -666,7 +696,7 @@ client
 					if(amount)
 						A.reagents.add_reagent(chosen_id, amount)
 						log_admin("[key_name(usr)] has added [amount] units of [chosen] to \the [A]")
-						message_admins("\blue [key_name(usr)] has added [amount] units of [chosen] to \the [A]")
+						message_admins("[key_name_admin(usr)] has added [amount] units of [chosen] to \the [A]")
 
 	else if(href_list["explode"])
 		if(!check_rights(R_DEBUG|R_EVENT))	return
@@ -702,7 +732,7 @@ client
 		href_list["datumrefresh"] = href_list["mark_object"]
 
 	else if(href_list["proc_call"])
-		if(!check_rights(0))
+		if(!check_rights(R_PROCCALL))
 			return
 
 		var/T = locate(href_list["proc_call"])
@@ -711,7 +741,7 @@ client
 			callproc_datum(T)
 
 	else if(href_list["rotatedatum"])
-		if(!check_rights(0))	return
+		if(!check_rights(R_DEBUG|R_ADMIN))	return
 
 		var/atom/A = locate(href_list["rotatedatum"])
 		if(!istype(A))
@@ -721,6 +751,9 @@ client
 		switch(href_list["rotatedir"])
 			if("right")	A.dir = turn(A.dir, -45)
 			if("left")	A.dir = turn(A.dir, 45)
+			
+		message_admins("[key_name_admin(usr)] has rotated \the [A]")
+		log_admin("[key_name(usr)] has rotated \the [A]")
 		href_list["datumrefresh"] = href_list["rotatedatum"]
 
 	else if(href_list["makemonkey"])
@@ -807,7 +840,6 @@ client
 			return
 		holder.Topic(href, list("makeai"=href_list["makeai"]))
 
-
 	else if(href_list["makemask"])
 		if(!check_rights(R_SPAWN)) return
 		var/mob/currentMob = locate(href_list["makemask"])
@@ -835,6 +867,8 @@ client
 		if(H.set_species(new_species))
 			usr << "Set species of [H] to [H.species]."
 			H.regenerate_icons()
+			message_admins("[key_name_admin(usr)] has changed the species of [key_name_admin(H)] to [new_species]")
+			log_admin("[key_name(usr)] has changed the species of [key_name(H)] to [new_species]")
 		else
 			usr << "Failed! Something went wrong."
 
@@ -857,6 +891,8 @@ client
 
 		if(H.add_language(new_language))
 			usr << "Added [new_language] to [H]."
+			message_admins("[key_name_admin(usr)] has given [key_name_admin(H)] the language [new_language]")
+			log_admin("[key_name(usr)] has given [key_name(H)] the language [new_language]")
 		else
 			usr << "Mob already knows that language."
 
@@ -883,6 +919,8 @@ client
 
 		if(H.remove_language(rem_language.name))
 			usr << "Removed [rem_language] from [H]."
+			message_admins("[key_name_admin(usr)] has removed language [rem_language] from [key_name_admin(H)]")
+			log_admin("[key_name(usr)] has removed language [rem_language] from [key_name(H)]")
 		else
 			usr << "Mob doesn't know that language."
 
@@ -915,6 +953,8 @@ client
 			return
 		else
 			H.verbs += verb
+			message_admins("[key_name_admin(usr)] has given [key_name_admin(H)] the verb [verb]")
+			log_admin("[key_name(usr)] has given [key_name(H)] the verb [verb]")
 
 	else if(href_list["remverb"])
 		if(!check_rights(R_DEBUG))      return
@@ -932,6 +972,8 @@ client
 			return
 		else
 			H.verbs -= verb
+			message_admins("[key_name_admin(usr)] has removed verb [verb] from [key_name_admin(H)]")
+			log_admin("[key_name(usr)] has removed verb [verb] from [key_name(H)]")
 
 	else if(href_list["addorgan"])
 		if(!check_rights(R_SPAWN))	return
@@ -953,7 +995,8 @@ client
 			return
 
 		new new_organ(M)
-	
+		message_admins("[key_name_admin(usr)] has given [key_name_admin(M)] the organ [new_organ]")
+		log_admin("[key_name(usr)] has given [key_name(M)] the organ [new_organ]")
 
 	else if(href_list["remorgan"])
 		if(!check_rights(R_SPAWN))	return
@@ -975,6 +1018,8 @@ client
 
 		usr << "Removed [rem_organ] from [M]."
 		rem_organ.removed()
+		message_admins("[key_name_admin(usr)] has removed the organ [rem_organ] from [key_name_admin(M)]")
+		log_admin("[key_name(usr)] has removed the organ [rem_organ] from [key_name(M)]")
 		qdel(rem_organ)
 
 	else if(href_list["fix_nano"])
@@ -991,7 +1036,7 @@ client
 		usr << "Resource files sent"
 		H << "Your NanoUI Resource files have been refreshed"
 
-		log_admin("[key_name(usr)] resent the NanoUI resource files to [key_name(H)] ")
+		log_admin("[key_name(usr)] resent the NanoUI resource files to [key_name(H)]")
 
 	else if(href_list["regenerateicons"])
 		if(!check_rights(0))	return
@@ -1028,8 +1073,8 @@ client
 				return
 
 		if(amount != 0)
-			log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
-			message_admins("\blue [key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
+			log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]")
+			message_admins("[key_name_admin(usr)] dealt [amount] amount of [Text] damage to [L]")
 			href_list["datumrefresh"] = href_list["mobToDamage"]
 
 	if(href_list["datumrefresh"])

code/datums/helper_datums/getrev.dm

@@ -1,96 +0,0 @@
-/*
- * This datum gets revision info from local svn 'entries' file
- * Path to the directory containing it should be in 'config/svndir.txt' file
- *
- */
-
-var/global/datum/getrev/revdata = new("config/svndir.txt")
-
-//Oh yeah, I'm an OOP fag, lalala
-/datum/getrev
-	var/revision
-	var/commiter
-	var/svndirpath
-	var/revhref
-
-	proc/abort()
-		spawn()
-			del src
-
-	New(filename)
-		..()
-		var/list/Lines = file2list(filename)
-		if(!Lines.len)	return abort()
-		for(var/t in Lines)
-			if(!t)	continue
-			t = trim(t)
-			if (length(t) == 0)
-				continue
-			else if (copytext(t, 1, 2) == "#")
-				continue
-			var/pos = findtext(t, " ")
-			var/name = null
-			var/value = null
-			if (pos)
-				name = lowertext(copytext(t, 1, pos))
-				value = copytext(t, pos + 1)
-			else
-				name = lowertext(t)
-			if(!name)
-				continue
-			switch(name)
-				if("svndir")
-					svndirpath = value
-				if("revhref")
-					revhref = value
-
-		if(svndirpath && fexists(svndirpath) && fexists("[svndirpath]/entries") && isfile(file("[svndirpath]/entries")))
-			var/list/filelist = file2list("[svndirpath]/entries")
-			var/s_archive = "" //Stores the previous line so the revision owner can be assigned.
-
-			//This thing doesn't count blank lines, so doing filelist[4] isn't working.
-			for(var/s in filelist)
-				if(!commiter)
-					if(s == "has-props")//The line before this is the committer.
-						commiter = s_archive
-				if(!revision)
-					var/n = text2num(s)
-					if(isnum(n))
-						if(n > 5000 && n < 99999) //Do you think we'll still be up and running at r100000? :) ~Errorage
-							revision = s
-				if(revision && commiter)
-					break
-				s_archive = s
-			if(!revision)
-				abort()
-			diary << "Revision info loaded succesfully"
-			return
-		return abort()
-
-	proc/getRevisionText()
-		var/output
-		if(revhref)
-			output = {"<a href="[revhref][revision]">[revision]</a>"}
-		else
-			output = revision
-		return output
-
-	proc/showInfo()
-		return {"<html>
-					<head>
-					</head>
-					<body>
-					<p><b>Server Revision:</b> [getRevisionText()]<br/>
-					<b>Author:</b> [commiter]</p>
-					</body>
-					<html>"}
-
-client/verb/showrevinfo()
-	set category = "OOC"
-	set name = "Show Server Revision"
-	var/output =  "Sorry, the revision info is unavailable."
-	output = file2text("/home/bay12/live/data/gitcommit")
-	output += "Current Infomational Settings: <br>"
-	output += "Protect Authority Roles From Tratior: [config.protect_roles_from_antagonist]<br>"
-	usr << browse(output,"window=revdata");
-	return

code/datums/helper_datums/teleport.dm

@@ -124,7 +124,7 @@
 	if(isliving(teleatom))
 		var/mob/living/L = teleatom
 		if(L.buckled)
-			L.buckled.unbuckle()
+			L.buckled.unbuckle_mob()
 
 	destarea.Entered(teleatom)
 

code/datums/spells/area_teleport.dm

@@ -46,7 +46,7 @@
 			return
 
 		if(target && target.buckled)
-			target.buckled.unbuckle()
+			target.buckled.unbuckle_mob()
 
 		var/list/tempL = L
 		var/attempt = null

code/datums/spells/ethereal_jaunt.dm

@@ -23,7 +23,7 @@
 
 			if(target.buckled)
 				var/obj/structure/stool/bed/buckled_to = target.buckled.
-				buckled_to.unbuckle()
+				buckled_to.unbuckle_mob()
 
 			var/mobloc = get_turf(target.loc)
 			var/obj/effect/dummy/spell_jaunt/holder = new /obj/effect/dummy/spell_jaunt( mobloc )
@@ -37,7 +37,7 @@
 			animation.master = holder
 			target.ExtinguishMob()
 			if(target.buckled)
-				target.buckled.unbuckle()
+				target.buckled.unbuckle_mob()
 			if(phaseshift == 1)
 				animation.dir = target.dir
 				flick("phase_shift",animation)