Runtime fixes

Moved delete to trial admins because they can already mass delete and that's not particularly as helpful as regular delete (but a lot more destructive)
Trialmins can now toggle adminhelp sounds without observing

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

code/modules/admin/admin_verbs.dm

@@ -67,7 +67,6 @@
 				verbs += /client/proc/debug_variables
 				//verbs += /client/proc/cmd_modify_object_variables --Merged with view variables
 				verbs += /client/proc/cmd_modify_ticker_variables
-				verbs += /client/proc/toggleadminhelpsound
 
 				// Admin helpers
 				verbs += /client/proc/toggle_view_range
@@ -81,6 +80,7 @@
 				verbs += /client/proc/jumptomob
 				verbs += /client/proc/jumptoturf
 				verbs += /client/proc/jumptocoord
+				verbs += /client/proc/cmd_admin_delete
 
 				verbs += /client/proc/cmd_admin_add_freeform_ai_law
 				verbs += /client/proc/cmd_admin_rejuvenate
@@ -197,9 +197,7 @@
 			//verbs += /client/proc/cmd_admin_godmode		--now in view variables
 			verbs += /client/proc/cmd_admin_rejuvenate
 			//verbs += /client/proc/cmd_admin_gib --View vars menu
-			verbs += /client/proc/cmd_admin_delete
 			//verbs += /proc/togglebuildmode --now in view vars
-			verbs += /client/proc/toggleadminhelpsound
 //			verbs += /client/proc/togglebuildmodeself
 			verbs += /client/proc/hide_most_verbs
 			verbs += /client/proc/jumptocoord
@@ -220,6 +218,7 @@
 			verbs += /client/proc/toggleprayers
 			verbs += /client/proc/deadmin_self
 			verbs += /client/proc/tension_report
+			verbs += /client/proc/toggleadminhelpsound
 
 		if (holder.level >= 2)//Admin Candidate********************************************************************
 			verbs += /client/proc/cmd_admin_add_random_ai_law

code/modules/food/food.dm

@@ -797,12 +797,13 @@
 		if(!reagents.total_volume)
 			var/mob/M = usr
 			var/obj/item/weapon/paper/paper = locate() in src
-			M.visible_message( \
-				"\blue [M] takes a piece of paper from the cookie!", \
-				"\blue You take a piece of paper from the cookie! Read it!" \
-			)
-			M.put_in_hand(paper)
-			paper.add_fingerprint(M)
+			if(paper)
+				M.visible_message( \
+					"\blue [M] takes a piece of paper from the cookie!", \
+					"\blue You take a piece of paper from the cookie! Read it!" \
+				)
+				M.put_in_hand(paper)
+				paper.add_fingerprint(M)
 
 /obj/item/weapon/reagent_containers/food/snacks/badrecipe
 	name = "Burned mess"

code/modules/mob/living/carbon/human/human.dm

@@ -2051,7 +2051,7 @@ It can still be worn/put on as normal.
 	var/obj/item/device/pda/pda = wear_id
 	var/obj/item/weapon/card/id/id = wear_id
 	if (istype(pda))
-		if (pda.id)
+		if (pda.id && istype(pda.id, /obj/item/weapon/card/id))
 			. = pda.id.assignment
 		else
 			. = pda.ownjob

code/modules/mob/living/carbon/human/life.dm

@@ -467,7 +467,7 @@
 					var/transfer_coefficient
 
 					transfer_coefficient = 1
-					if(head && (head.body_parts_covered & HEAD) && (environment.temperature < head.protective_temperature))
+					if(head && (head.body_parts_covered & HEAD) && (environment.temperature < head.protective_temperature) && !istype(head, /obj/item/weapon/paper))
 						transfer_coefficient *= head.heat_transfer_coefficient
 					if(wear_mask && (wear_mask.body_parts_covered & HEAD) && (environment.temperature < wear_mask.protective_temperature))
 						transfer_coefficient *= wear_mask.heat_transfer_coefficient

code/modules/mob/mob_grab.dm

@@ -83,6 +83,8 @@
 
 
 /obj/item/weapon/grab/proc/s_click(obj/screen/S as obj)
+	if (!affecting)
+		return
 	if (assailant.next_move > world.time)
 		return
 	if ((!( assailant.canmove ) || assailant.lying))

code/modules/mob/new_player/preferences.dm

@@ -374,6 +374,8 @@ datum/preferences
 
 
 	proc/process_link(mob/user, list/link_tags)
+		if(!usr)
+			return
 		if(link_tags["occ"])
 			if(link_tags["cancel"])
 				user << browse(null, "window=\ref[user]occupation")

code/modules/power/apc.dm

@@ -845,18 +845,19 @@
 			malfai.malfhack = src
 			malfai.malfhacking = 1
 			sleep(600)
-			if (!src.aidisabled)
-				malfai.malfhack = null
-				malfai.malfhacking = 0
-				if (ticker.mode.config_tag == "malfunction")
-					if (src.z == 1) //if (is_type_in_list(get_area(src), the_station_areas))
-						ticker.mode:apcs++
-				if(usr:parent)
-					src.malfai = usr:parent
-				else
-					src.malfai = usr
-				malfai << "Hack complete. The APC is now under your exclusive control."
-				updateicon()
+			if(src)
+				if (!src.aidisabled)
+					malfai.malfhack = null
+					malfai.malfhacking = 0
+					if (ticker.mode.config_tag == "malfunction")
+						if (src.z == 1) //if (is_type_in_list(get_area(src), the_station_areas))
+							ticker.mode:apcs++
+					if(usr:parent)
+						src.malfai = usr:parent
+					else
+						src.malfai = usr
+					malfai << "Hack complete. The APC is now under your exclusive control."
+					updateicon()
 
 	else if (href_list["occupyapc"])
 		malfoccupy(usr)