Merge branch 'master' of https://github.com/tgstation/tgstation into bayputers

code/modules/client/asset_cache.dm

@@ -236,7 +236,8 @@ You can set verify to TRUE if you want send() to sleep until the client has the
 		"pda_refresh.png"		= 'icons/pda_icons/pda_refresh.png',
 		"pda_scanner.png"		= 'icons/pda_icons/pda_scanner.png',
 		"pda_signaler.png"		= 'icons/pda_icons/pda_signaler.png',
-		"pda_status.png"		= 'icons/pda_icons/pda_status.png'
+		"pda_status.png"		= 'icons/pda_icons/pda_status.png',
+		"pda_dronephone.png"	= 'icons/pda_icons/pda_dronephone.png'
 	)
 
 /datum/asset/simple/paper

code/modules/client/verbs/suicide.dm

@@ -157,11 +157,6 @@
 
 /mob/living/proc/canSuicide()
 	if(stat == CONSCIOUS)
-		if(mental_dominator)
-			src << "<span class='warning'>This body's force of will is too strong! You can't break it enough to murder them.</span>"
-			if(mind_control_holder)
-				mind_control_holder << "<span class='userdanger'>Through tremendous force of will, you stop a suicide attempt!</span>"
-			return 0
 		return 1
 	else if(stat == DEAD)
 		src << "You're already dead!"