Merge branch 'incremental_tg' r5067 into bs12_with_tgport

removed extraneous admin attack messages, temporarily disabled much moderator stuff (will be re-enabled in future updates)

Conflicts:
	baystation12.dme
	code/__HELPERS/type2type.dm
	code/controllers/configuration.dm
	code/datums/datumvars.dm
	code/datums/helper_datums/getrev.dm
	code/defines/obj.dm
	code/game/gamemodes/events/black_hole.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/turrets.dm
	code/game/machinery/wishgranter.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/turfs/turf.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/holder2.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/assembly/igniter.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/setup.dm
	code/stylesheet.dm
	code/world.dm
	config/admins.txt
	config/config.txt
	html/changelog.html
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
	icons/turf/areas.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/datums/helper_datums/getrev.dm

@@ -46,10 +46,23 @@ var/global/datum/getrev/revdata = new("config/svndir.txt")
 
 		if(svndirpath && fexists(svndirpath) && fexists("[svndirpath]/entries") && isfile(file("[svndirpath]/entries")))
 			var/list/filelist = file2list("[svndirpath]/entries")
-			if(filelist.len < 4)
-				return abort()
-			revision = filelist[4]
-			commiter = filelist[12]
+			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()

code/datums/helper_datums/teleport.dm

@@ -161,6 +161,7 @@
 		if(istype(teleatom, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks get teleported --NeoFite
 			teleatom.visible_message("\red <B>The [teleatom] bounces off of the portal!</B>")
 			return 0
+
 		if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/disk/nuclear)))
 			if(istype(teleatom, /mob/living))
 				var/mob/living/MM = teleatom
@@ -168,6 +169,17 @@
 			else
 				teleatom.visible_message("\red <B>The [teleatom] bounces off of the portal!</B>")
 			return 0
-		if(destination.z > 7)
+
+		if(destination.z == 2) //centcomm z-level
+			if(istype(teleatom, /obj/mecha))
+				var/obj/mecha/MM = teleatom
+				MM.occupant << "\red <B>The mech would not survive the jump to a location so far away!</B>"
+				return 0
+			if(!isemptylist(teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding)))
+				teleatom.visible_message("\red <B>The Bag of Holding bounces off of the portal!</B>")
+				return 0
+
+
+		if(destination.z > 7) //Away mission z-levels
 			return 0
 		return 1