Merge branch 'master' into upstream-merge-6923

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

@@ -80,8 +80,9 @@
 		verbs -= /mob/living/carbon/proc/release_control
 
 	callHook("death", list(src, gibbed))
-	
+
 	if(mind)
+		// SSgame_master.adjust_danger(gibbed ? 40 : 20)  // VOREStation Edit - We don't use SSgame_master yet.
 		for(var/mob/observer/dead/O in mob_list)
 			if(O.client && O.client.is_preference_enabled(/datum/client_preference/show_dsay))
 				to_chat(O, "<span class='deadsay'><b>[src]</b> has died in <b>[get_area(src)]</b>. [ghost_follow_link(src, O)] </span>")

code/modules/mob/living/silicon/robot/robot_remote_control.dm

@@ -26,6 +26,8 @@ GLOBAL_LIST_EMPTY(available_ai_shells)
 	shell = TRUE
 	braintype = "AI Shell"
 	SetName("[modtype] AI Shell [num2text(ident)]")
+	rbPDA = new /obj/item/device/pda/ai/shell(src)
+	setup_PDA()
 	GLOB.available_ai_shells |= src
 	if(!QDELETED(camera))
 		camera.c_tag = real_name	//update the camera name too