Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/objects/items/devices/radio/radio.dm
	code/modules/admin/admin_verbs.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client procs.dm
	code/modules/mob/living/say.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/paperwork/paperbin.dm
	html/changelog.html
	icons/turf/areas.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt

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

code/modules/admin/admin_verbs.dm

@@ -16,6 +16,12 @@
 //			verbs += /client/proc/air_status //Air things
 //			verbs += /client/proc/Cell //More air things
 
+/client/proc/admin_rank_check(var/rank, var/requested)
+	if(rank < requested)
+		alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+		return(0)
+	return(1)
+
 /client/proc/update_admins(var/rank)
 	if(!holder)
 		holder = new /datum/admins(rank)
@@ -110,8 +116,12 @@
 
 		//Admin Observer
 		if (holder.level == -1)
+			seeprayers = 1
+
 			verbs += /client/proc/cmd_admin_say
-			return
+			verbs += /client/proc/deadmin_self
+			verbs += /client/proc/toggleadminhelpsound
+		else	return
 
 		//Moderator
 		if (holder.level >= 0)
@@ -164,7 +174,7 @@
 			verbs += /client/proc/unban_panel
 			verbs += /client/proc/jobbans
 			verbs += /client/proc/unjobban_panel
-			verbs += /client/proc/check_ai_laws
+			verbs += /client/proc/hide_verbs			verbs += /client/proc/general_report			verbs += /client/proc/air_report			verbs += /client/proc/check_ai_laws
 			verbs += /client/proc/investigate_show
 			verbs += /client/proc/cmd_admin_gib_self
 			verbs += /client/proc/player_panel_new
@@ -178,20 +188,19 @@
 		else
 			return
 
-		//Admin Candidate
+
+		else	return		//Temporary Admin		if (holder.level >= 1)			verbs += /datum/admins/proc/delay								//game start delay			verbs += /datum/admins/proc/immreboot							//immediate reboot			verbs += /datum/admins/proc/restart							//restart			verbs += /client/proc/cmd_admin_check_contents			verbs += /client/proc/cmd_admin_create_centcom_report			verbs += /client/proc/toggle_hear_deadcast			verbs += /client/proc/toggle_hear_radio		else	return		//Admin Candidate
 		if (holder.level >= 2)
 			verbs += /client/proc/cmd_admin_add_random_ai_law
 			verbs += /client/proc/secrets
 			verbs += /client/proc/check_antagonists
 			verbs += /client/proc/play_sound
 			verbs += /client/proc/stealth
-			verbs += /client/proc/deadmin_self
 		else	return
 
 		//Trial Admin
 		if (holder.level >= 3)
 			deadchat = 1
-			seeprayers = 1
 
 			verbs += /client/proc/invisimin
 			verbs += /datum/admins/proc/view_txt_log
@@ -205,8 +214,6 @@
 			verbs += /client/proc/respawn_character
 			verbs += /client/proc/spawn_xeno
 			verbs += /client/proc/toggleprayers
-			verbs += /client/proc/deadmin_self
-			verbs += /client/proc/toggleadminhelpsound
 			verbs += /proc/possess
 			verbs += /proc/release
 			verbs += /client/proc/one_click_antag
@@ -290,7 +297,6 @@
 			verbs += /client/proc/enable_debug_verbs
 			verbs += /client/proc/everyone_random
 			verbs += /client/proc/only_one
-			verbs += /client/proc/deadmin_self
 			verbs += /client/proc/cinematic									//show a cinematic sequence
 			verbs += /client/proc/startSinglo								//Used to prevent the station from losing power while testing stuff out.
 			verbs += /client/proc/toggle_log_hrefs

code/modules/admin/holder2.dm

@@ -43,6 +43,10 @@ var/list/admin_datums = list()
 		log_admin("[key_name(usr)] tried to use the admin panel without authorization.")
 		return
 
+	if (!(usr.client.holder.rank in list("Moderator", "Temporary Admin", "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master")))
+		usr << "\red You cannot perform this action. You must be of a higher administrative rank!"
+		return
+
 	if(href_list["makeAntag"])
 		switch(href_list["makeAntag"])
 			if("1")
@@ -181,6 +185,10 @@ var/list/admin_datums = list()
 
 	if(href_list["simplemake"])
 
+		if (!(src.rank in list("Trial Admin", "Badmin", "Game Admin", "Game Master")))
+			alert("You cannot perform this action. You must be of a higher administrative rank!")
+			return
+
 		if(!href_list["mob"])
 			usr << "Invalid mob"
 			return

code/modules/admin/verbs/debug.dm

@@ -859,7 +859,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(M), slot_ears)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/eyepatch(M), slot_glasses)
 			M.equip_to_slot_or_del(new /obj/item/clothing/suit/hgpirate(M), slot_wear_suit)
-			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/bandolier(M), slot_back)
+			M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
 			M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/mateba(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/clothing/under/soviet(M), slot_w_uniform)
 			var/obj/item/weapon/card/id/W = new(M)

code/modules/admin/verbs/massmodvar.dm

@@ -5,6 +5,8 @@
 
 	var/method = 0	//0 means strict type detection while 1 means this type and all subtypes (IE: /obj/item with this set to 1 will set it to ALL itms)
 
+	if(!admin_rank_check(src.holder.level, 3)) return
+
 	if(A && A.type)
 		if(typesof(A.type))
 			switch(input("Strict object type detection?") as null|anything in list("Strictly this type","This type and subtypes", "Cancel"))

code/modules/admin/verbs/modifyvariables.dm

@@ -269,6 +269,7 @@ var/list/forbidden_varedit_object_types = list(
 	if(!src.holder)
 		src << "Only administrators may use this command."
 		return
+	if(!admin_rank_check(src.holder.level, 3)) return
 
 	for(var/p in forbidden_varedit_object_types)
 		if( istype(O,p) )