Minor update

If a mode fails to start up due to the player # it will display the required number of players in the error message.
Holy water typo fixed.
If you emag an emag'd  borg it will no longer display the standard attack message.


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

code/modules/chemical/Chemistry-Tools.dm

@@ -2493,7 +2493,7 @@
 		reagents.add_reagent("rum", 100)
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater
-	name = "Flash of Holy Water"
+	name = "Flask of Holy Water"
 	desc = "A flask of the chaplains holy water."
 	icon_state = "holyflask"
 	New()

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

@@ -436,9 +436,11 @@
 			else
 				user << "\red Access denied."
 
-	else if (istype(W, /obj/item/weapon/card/emag) && !emagged)		// trying to unlock with an emag card
+	else if(istype(W, /obj/item/weapon/card/emag))		// trying to unlock with an emag card
+		if(emagged)//Prevents the X has hit Y with Z message
+			return 0
 		if(opened)
-			user << "You must close the cover to swipe an ID card."
+			user << "You must close the cover to swipe an ID card."//Perhapse we should make them have the door open to emag the bot?
 		else if(wiresexposed)
 			user << "You must close the panel first"
 		else