Admin Observers have lost two verbs: 'gibself' and 'investigate' by request.

Telebacon has been commented out. Fixes(haha) issue 999.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4851 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/admin/admin_verbs.dm

@@ -68,8 +68,6 @@
 				verbs += /client/proc/cmd_admin_delete
 				verbs += /client/proc/cmd_admin_add_freeform_ai_law
 				verbs += /client/proc/cmd_admin_rejuvenate
-				//verbs += /client/proc/cmd_admin_drop_everything		--Merged with view variables
-				//verbs += /client/proc/cmd_modify_object_variables 	--Merged with view variables
 
 		if ("Admin Candidate")
 			holder.level = 2
@@ -81,7 +79,6 @@
 				verbs += /client/proc/Jump
 				verbs += /client/proc/jumptokey
 				verbs += /client/proc/jumptomob
-				//verbs += /client/proc/cmd_admin_attack_log			--Merged with view variables
 
 		if ("Temporary Admin")
 			holder.level = 1
@@ -106,9 +103,7 @@
 
 		//Admin Observer
 		if (holder.level >= -1)
-			verbs += /client/proc/investigate_show
 			verbs += /client/proc/cmd_admin_say
-			verbs += /client/proc/cmd_admin_gib_self
 			verbs += /client/proc/deadmin_self
 		else	return
 
@@ -123,11 +118,9 @@
 			verbs += /datum/admins/proc/toggleoocdead						//toggle ooc for dead/unc
 			verbs += /datum/admins/proc/show_player_panel
 			verbs += /client/proc/deadchat								//toggles deadchat
-			//verbs += /client/proc/cmd_admin_mute	--was never used (according to stats trackind) - use show player panel --erro
 			verbs += /client/proc/cmd_admin_pm_context
 			verbs += /client/proc/cmd_admin_pm_panel
 			verbs += /client/proc/cmd_admin_subtle_message
-			//verbs += /client/proc/warn	- was never used
 			verbs += /client/proc/dsay
 			verbs += /client/proc/admin_ghost
 			verbs += /client/proc/game_panel
@@ -141,8 +134,9 @@
 			verbs += /client/proc/air_report
 			verbs += /client/proc/deadmin_self
 			verbs += /client/proc/check_ai_laws
-			//verbs += /client/proc/cmd_admin_prison 					--Merged with player panel
+			verbs += /client/proc/investigate_show
-			//verbs += /datum/admins/proc/unprison  						--Merged with player panel
+			verbs += /client/proc/cmd_admin_gib_self
+
 		else	return
 
 		//Temporary Admin
@@ -155,7 +149,6 @@
 			verbs += /client/proc/toggle_hear_deadcast
 			verbs += /client/proc/toggle_hear_radio
 			verbs += /client/proc/deadmin_self
-			//verbs += /client/proc/cmd_admin_attack_log				--Merged with view variables
 		else	return
 
 		//Admin Candidate
@@ -179,7 +172,6 @@
 			verbs += /datum/admins/proc/toggleaban						//abandon mob
 			verbs += /datum/admins/proc/show_traitor_panel
 			verbs += /client/proc/getserverlog							//fetch an old serverlog to look at
-			//verbs += /client/proc/cmd_admin_remove_plasma 			--This proc is outdated, does not do anything
 			verbs += /client/proc/admin_call_shuttle
 			verbs += /client/proc/admin_cancel_shuttle
 			verbs += /client/proc/cmd_admin_dress
@@ -219,10 +211,6 @@
 			verbs += /client/proc/jumptocoord
 			verbs += /client/proc/deadmin_self
 			verbs += /client/proc/giveruntimelog						//used by coders to retrieve runtime logs
-			//verbs += /client/proc/cmd_admin_godmode					--Merged with view variables
-			//verbs += /client/proc/cmd_admin_gib 						--Merged with view variables
-			//verbs += /proc/togglebuildmode 							--Merged with view variables
-			//verbs += /client/proc/cmd_modify_object_variables 		--Merged with view variables
 			verbs += /client/proc/togglebuildmodeself
 		else	return
 
@@ -236,18 +224,14 @@
 			verbs += /client/proc/cmd_admin_world_narrate
 			verbs += /client/proc/cmd_debug_del_all
 			verbs += /client/proc/cmd_debug_tog_aliens
-//			verbs += /client/proc/mapload
 			verbs += /client/proc/check_words
 			verbs += /client/proc/drop_bomb
 			verbs += /client/proc/kill_airgroup
-			//verbs += /client/proc/cmd_admin_drop_everything			--Merged with view variables
 			verbs += /client/proc/make_sound
 			verbs += /client/proc/play_local_sound
 			verbs += /client/proc/send_space_ninja
 			verbs += /client/proc/restart_controller					//Can call via aproccall --I_hate_easy_things.jpg, Mport --Agouri
 			verbs += /client/proc/debug_controller
-//			verbs += /client/proc/Blobize								//I need to remember to move/remove this later
-//			verbs += /client/proc/Blobcount								//I need to remember to move/remove this later
 			verbs += /client/proc/toggle_clickproc 						//TODO ERRORAGE (Temporary proc while the new clickproc is being tested)
 			verbs += /client/proc/toggle_gravity_on
 			verbs += /client/proc/toggle_gravity_off
@@ -256,12 +240,6 @@
 			verbs += /client/proc/Set_Holiday							//Force-set a Holiday
 			verbs += /client/proc/admin_memo
 			verbs += /client/proc/ToRban								//ToRban  frontend to access its features.
-			//verbs += /client/proc/cmd_mass_modify_object_variables 	--Merged with view variables
-			//verbs += /client/proc/cmd_admin_explosion					--Merged with view variables
-			//verbs += /client/proc/cmd_admin_emp						--Merged with view variables
-			//verbs += /client/proc/give_spell 							--Merged with view variables
-			//verbs += /client/proc/cmd_admin_ninjafy					--Merged with view variables
-			//verbs += /client/proc/cmd_switch_radio					--removed as tcommsat is staying
 		else	return
 
 		//Game Master
@@ -416,26 +394,6 @@
 		/client/proc/invisimin,
 		/client/proc/set_ooc
 	)
-	//verbs -= /client/proc/mapload
-	//verbs -= /client/proc/cmd_admin_drop_everything					--merged with view variables
-	//verbs -= /client/proc/give_spell 									--Merged with view variables
-	//verbs -= /client/proc/cmd_admin_ninjafy 							--Merged with view variables
-	//verbs -= /client/proc/cmd_modify_object_variables 				--Merged with view variables
-	//verbs -= /client/proc/cmd_admin_explosion							--Merged with view variables
-	//verbs -= /client/proc/cmd_admin_emp								--Merged with view variables
-	//verbs -= /client/proc/cmd_admin_godmode							--Merged with view variables
-	//verbs -= /client/proc/cmd_admin_gib 								--Merged with view variables
-	//verbs -= /client/proc/cmd_mass_modify_object_variables			--Merged with view variables
-	//verbs -= /client/proc/cmd_admin_attack_log						--Merged with view variables
-	//verbs -= /proc/togglebuildmode									--Merged with view variables
-	//verbs -= /client/proc/cmd_admin_prison 							--Merged with player panel
-	//verbs -= /datum/admins/proc/unprison 								--Merged with player panel
-	//verbs -= /client/proc/cmd_switch_radio							--removed because tcommsat is staying
-	//	verbs -= /client/proc/Blobize
-	//	verbs -= /client/proc/Blobcount
-	//verbs -= /client/proc/warn
-	//verbs -= /client/proc/cmd_admin_mute	--was never used (according to stats trackind) - use show player panel --erro
-	//verbs -= /client/proc/cmd_admin_remove_plasma						--This proc is outdated, does not do anything
 	return
 
 /client/proc/admin_ghost()

code/modules/food/recipes_microwave.dm

@@ -1,6 +1,8 @@
 
 // see code/datums/recipe.dm
 
+
+/* No telebacon. just no...
 /datum/recipe/telebacon
 	items = list(
 		/obj/item/weapon/reagent_containers/food/snacks/meat,
@@ -8,12 +10,14 @@
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
 
+I said no!
 /datum/recipe/syntitelebacon
 	items = list(
 		/obj/item/weapon/syntiflesh,
 		/obj/item/device/assembly/signaler
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
+*/
 
 /datum/recipe/friedegg
 	reagents = list("sodiumchloride" = 1, "blackpepper" = 1)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -1285,6 +1285,7 @@
 		reagents.add_reagent("tomatojuice", 2)
 		bitesize = 5
 
+/* No more of this
 /obj/item/weapon/reagent_containers/food/snacks/telebacon
 	name = "Tele Bacon"
 	desc = "It tastes a little odd but it is still delicious."
@@ -1299,7 +1300,7 @@
 		if(!reagents.total_volume)
 			baconbeacon.loc = usr
 			baconbeacon.digest_delay()
-
+*/
 
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube
 	name = "monkey cube"