Merge branch 'master' of git://github.com/Baystation12/Baystation12 into TGUpdates

code/game/machinery/computer/prisoner.dm

@@ -98,7 +98,7 @@
 				var/obj/item/weapon/implant/I = locate(href_list["warn"])
 				if((I)&&(I.imp_in))
 					var/mob/living/carbon/R = I.imp_in
-					R << "\green You hear a voice in your head saying: '[warning]'"
+					R << "\green You think: '[warning]'"
 
 			src.add_fingerprint(usr)
 		src.updateUsrDialog()

code/game/objects/storage/backpack.dm

@@ -49,6 +49,7 @@
 		if(crit_fail)
 			user << "\red The Bluespace generator isn't working."
 			return
+			/* Remove these comments to re-enable BoH BoH Singuloths.-Hawk.
 		if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail)
 			user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!"
 			del(W)
@@ -58,6 +59,7 @@
 			log_game("[key_name(user)] detonated a bag of holding")
 			del(src)
 			return
+			*/
 		..()
 
 	proc/failcheck(mob/user as mob)